Dedicated LocationIQ geocoder

3 files changed, 34 insertions, 21 deletions

diff --git a/setup/default.xml b/setup/default.xml
index 77561109c..c00d29384 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -16,8 +16,7 @@
     <entry key='web.persistSession'>false</entry>
 
     <entry key='geocoder.enable'>true</entry>
-    <entry key='geocoder.type'>nominatim</entry>
-    <entry key='geocoder.url'>https://us1.locationiq.com/v1/reverse.php</entry>
+    <entry key='geocoder.type'>locationiq</entry>
     <entry key='geocoder.key'>pk.689d849289c8c63708068b2ff1f63b2d</entry>
     <entry key='geocoder.onRequest'>true</entry>
     <entry key='geocoder.ignorePositions'>true</entry>
diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java
index 6e59527bc..f3d04f634 100644
--- a/src/main/java/org/traccar/MainModule.java
+++ b/src/main/java/org/traccar/MainModule.java
@@ -42,25 +42,7 @@ import org.traccar.forward.PositionForwarder;
 import org.traccar.forward.PositionForwarderJson;
 import org.traccar.forward.PositionForwarderKafka;
 import org.traccar.forward.PositionForwarderUrl;
-import org.traccar.geocoder.AddressFormat;
-import org.traccar.geocoder.BanGeocoder;
-import org.traccar.geocoder.BingMapsGeocoder;
-import org.traccar.geocoder.FactualGeocoder;
-import org.traccar.geocoder.GeoapifyGeocoder;
-import org.traccar.geocoder.GeocodeFarmGeocoder;
-import org.traccar.geocoder.GeocodeXyzGeocoder;
-import org.traccar.geocoder.Geocoder;
-import org.traccar.geocoder.GisgraphyGeocoder;
-import org.traccar.geocoder.GoogleGeocoder;
-import org.traccar.geocoder.HereGeocoder;
-import org.traccar.geocoder.MapQuestGeocoder;
-import org.traccar.geocoder.MapTilerGeocoder;
-import org.traccar.geocoder.MapboxGeocoder;
-import org.traccar.geocoder.MapmyIndiaGeocoder;
-import org.traccar.geocoder.NominatimGeocoder;
-import org.traccar.geocoder.OpenCageGeocoder;
-import org.traccar.geocoder.PositionStackGeocoder;
-import org.traccar.geocoder.TomTomGeocoder;
+import org.traccar.geocoder.*;
 import org.traccar.geolocation.GeolocationProvider;
 import org.traccar.geolocation.GoogleGeolocationProvider;
 import org.traccar.geolocation.MozillaGeolocationProvider;
@@ -183,6 +165,9 @@ public class MainModule extends AbstractModule {
                 case "nominatim":
                     geocoder = new NominatimGeocoder(client, url, key, language, cacheSize, addressFormat);
                     break;
+                case "locationiq":
+                    geocoder = new LocationIqGeocoder(client, url, key, language, cacheSize, addressFormat);
+                    break;
                 case "gisgraphy":
                     geocoder = new GisgraphyGeocoder(client, url, cacheSize, addressFormat);
                     break;
diff --git a/src/main/java/org/traccar/geocoder/LocationIqGeocoder.java b/src/main/java/org/traccar/geocoder/LocationIqGeocoder.java
new file mode 100644
index 000000000..f2ffe02d6
--- /dev/null
+++ b/src/main/java/org/traccar/geocoder/LocationIqGeocoder.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.geocoder;
+
+import javax.ws.rs.client.Client;
+
+public class LocationIqGeocoder extends NominatimGeocoder {
+
+    private static final String DEFAULT_URL = "https://us1.locationiq.com/v1/reverse.php";
+
+    public LocationIqGeocoder(
+            Client client, String url, String key, String language, int cacheSize, AddressFormat addressFormat) {
+        super(client, url != null ? url : DEFAULT_URL, key, language, cacheSize, addressFormat);
+    }
+
+}