diff options
author | Iván Ávalos <avalos@disroot.org> | 2024-03-28 23:02:18 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2024-03-28 23:02:18 -0600 |
commit | 4dec2ef603f078ff3bd18d63d1fbd992537cbb88 (patch) | |
tree | 9c1f2886390447183a64a405fb885a9923412701 /src/main/java/org/traccar/MainModule.java | |
parent | dec9993b2e1a7801bd69f1a9d92013f83e17f253 (diff) | |
parent | 13f6415ba0a8ca76d1a2cbb3d0ea199361295f1b (diff) | |
download | trackermap-server-4dec2ef603f078ff3bd18d63d1fbd992537cbb88.tar.gz trackermap-server-4dec2ef603f078ff3bd18d63d1fbd992537cbb88.tar.bz2 trackermap-server-4dec2ef603f078ff3bd18d63d1fbd992537cbb88.zip |
Merge branch 'upstream'trackermap-v0.1.4
Diffstat (limited to 'src/main/java/org/traccar/MainModule.java')
-rw-r--r-- | src/main/java/org/traccar/MainModule.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java index 3fec4d1e6..26654947e 100644 --- a/src/main/java/org/traccar/MainModule.java +++ b/src/main/java/org/traccar/MainModule.java @@ -46,6 +46,7 @@ import org.traccar.forward.PositionForwarderAmqp; import org.traccar.forward.PositionForwarderKafka; import org.traccar.forward.PositionForwarderRedis; import org.traccar.forward.PositionForwarderUrl; +import org.traccar.forward.PositionForwarderMqtt; import org.traccar.geocoder.AddressFormat; import org.traccar.geocoder.BanGeocoder; import org.traccar.geocoder.BingMapsGeocoder; @@ -69,7 +70,6 @@ import org.traccar.geocoder.TestGeocoder; import org.traccar.geocoder.TomTomGeocoder; import org.traccar.geolocation.GeolocationProvider; import org.traccar.geolocation.GoogleGeolocationProvider; -import org.traccar.geolocation.MozillaGeolocationProvider; import org.traccar.geolocation.OpenCellIdGeolocationProvider; import org.traccar.geolocation.UnwiredGeolocationProvider; import org.traccar.handler.GeocoderHandler; @@ -276,18 +276,16 @@ public class MainModule extends AbstractModule { @Provides public static GeolocationProvider provideGeolocationProvider(Config config, Client client) { if (config.getBoolean(Keys.GEOLOCATION_ENABLE)) { - String type = config.getString(Keys.GEOLOCATION_TYPE, "mozilla"); + String type = config.getString(Keys.GEOLOCATION_TYPE, "google"); String url = config.getString(Keys.GEOLOCATION_URL); String key = config.getString(Keys.GEOLOCATION_KEY); switch (type) { - case "google": - return new GoogleGeolocationProvider(client, key); case "opencellid": return new OpenCellIdGeolocationProvider(client, url, key); case "unwired": return new UnwiredGeolocationProvider(client, url, key); default: - return new MozillaGeolocationProvider(client, key); + return new GoogleGeolocationProvider(client, key); } } return null; @@ -386,6 +384,8 @@ public class MainModule extends AbstractModule { return new PositionForwarderAmqp(config, objectMapper); case "kafka": return new PositionForwarderKafka(config, objectMapper); + case "mqtt": + return new PositionForwarderMqtt(config, objectMapper); case "redis": return new PositionForwarderRedis(config, objectMapper); case "url": |