From 2744b305b48d1d1215e326b3858a18f32d485eef Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 21 Aug 2021 22:41:47 -0700
Subject: Implement MapTiler geocoder

---
 .../java/org/traccar/geocoder/JsonGeocoder.java    |  4 +-
 .../org/traccar/geocoder/MapTilerGeocoder.java     | 73 ++++++++++++++++++++++
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/traccar/geocoder/MapTilerGeocoder.java

(limited to 'src/main/java/org/traccar/geocoder')

diff --git a/src/main/java/org/traccar/geocoder/JsonGeocoder.java b/src/main/java/org/traccar/geocoder/JsonGeocoder.java
index 3cd5b596e..f20aa79d6 100644
--- a/src/main/java/org/traccar/geocoder/JsonGeocoder.java
+++ b/src/main/java/org/traccar/geocoder/JsonGeocoder.java
@@ -97,7 +97,9 @@ public abstract class JsonGeocoder implements Geocoder {
             }
         }
 
-        Main.getInjector().getInstance(StatisticsManager.class).registerGeocoderRequest();
+        if (Main.getInjector() != null) {
+            Main.getInjector().getInstance(StatisticsManager.class).registerGeocoderRequest();
+        }
 
         Invocation.Builder request = Context.getClient().target(String.format(url, latitude, longitude)).request();
 
diff --git a/src/main/java/org/traccar/geocoder/MapTilerGeocoder.java b/src/main/java/org/traccar/geocoder/MapTilerGeocoder.java
new file mode 100644
index 000000000..6b688a6e8
--- /dev/null
+++ b/src/main/java/org/traccar/geocoder/MapTilerGeocoder.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2021 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.json.JsonArray;
+import javax.json.JsonObject;
+
+public class MapTilerGeocoder extends JsonGeocoder {
+
+    public MapTilerGeocoder(String key, int cacheSize, AddressFormat addressFormat) {
+        super("https://api.maptiler.com/geocoding/%2$f,%1$f.json?key=" + key, cacheSize, addressFormat);
+    }
+
+    @Override
+    public Address parseAddress(JsonObject json) {
+        JsonArray features = json.getJsonArray("features");
+
+        if (!features.isEmpty()) {
+            Address address = new Address();
+
+            for (int i = 0; i < features.size(); i++) {
+                JsonObject feature = features.getJsonObject(i);
+                String type = feature.getJsonArray("place_type").getString(0);
+                String value = feature.getString("text");
+                switch (type) {
+                    case "street":
+                        address.setStreet(value);
+                        break;
+                    case "city":
+                        address.setSettlement(value);
+                        break;
+                    case "county":
+                        address.setDistrict(value);
+                        break;
+                    case "state":
+                        address.setState(value);
+                        break;
+                    case "country":
+                        address.setCountry(value);
+                        break;
+                    default:
+                        break;
+                }
+                if (address.getFormattedAddress() == null) {
+                    address.setFormattedAddress(feature.getString("place_name"));
+                }
+            }
+
+            return address;
+        }
+
+        return null;
+    }
+
+    @Override
+    protected String parseError(JsonObject json) {
+        return null;
+    }
+
+}
-- 
cgit v1.2.3


From d7ed8ea799e9c0006e154f26969a6905b81eae0f Mon Sep 17 00:00:00 2001
From: jcardus <asklocation.net@gmail.com>
Date: Wed, 29 Sep 2021 16:08:01 -0300
Subject: fix bug in here geocoder formatted address

fix bug in here geocoder formatted address
---
 src/main/java/org/traccar/geocoder/HereGeocoder.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org/traccar/geocoder')

diff --git a/src/main/java/org/traccar/geocoder/HereGeocoder.java b/src/main/java/org/traccar/geocoder/HereGeocoder.java
index aaf11d74d..40390e65b 100644
--- a/src/main/java/org/traccar/geocoder/HereGeocoder.java
+++ b/src/main/java/org/traccar/geocoder/HereGeocoder.java
@@ -53,8 +53,8 @@ public class HereGeocoder extends JsonGeocoder {
         if (result != null) {
             Address address = new Address();
 
-            if (json.containsKey("Label")) {
-                address.setFormattedAddress(json.getString("Label"));
+            if (result.containsKey("Label")) {
+                address.setFormattedAddress(result.getString("Label"));
             }
 
             if (result.containsKey("HouseNumber")) {
-- 
cgit v1.2.3