aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/Context.java4
-rw-r--r--src/org/traccar/geocoder/HereGeocoder.java84
-rw-r--r--test/org/traccar/geocoder/GeocoderTest.java158
3 files changed, 129 insertions, 117 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 6e255b6d3..07fab2bd1 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -56,6 +56,7 @@ import org.traccar.geocoder.GeocodeXyzGeocoder;
import org.traccar.geocoder.GisgraphyGeocoder;
import org.traccar.geocoder.BanGeocoder;
import org.traccar.geocoder.GoogleGeocoder;
+import org.traccar.geocoder.HereGeocoder;
import org.traccar.geocoder.MapQuestGeocoder;
import org.traccar.geocoder.NominatimGeocoder;
import org.traccar.geocoder.OpenCageGeocoder;
@@ -316,6 +317,7 @@ public final class Context {
public static Geocoder initGeocoder() {
String type = config.getString("geocoder.type", "google");
String url = config.getString("geocoder.url");
+ String id = config.getString("geocoder.id");
String key = config.getString("geocoder.key");
String language = config.getString("geocoder.language");
@@ -347,6 +349,8 @@ public final class Context {
return new GeocodeXyzGeocoder(key, cacheSize, addressFormat);
case "ban":
return new BanGeocoder(cacheSize, addressFormat);
+ case "here":
+ return new HereGeocoder(id, key, language, cacheSize, addressFormat);
default:
return new GoogleGeocoder(key, language, cacheSize, addressFormat);
}
diff --git a/src/org/traccar/geocoder/HereGeocoder.java b/src/org/traccar/geocoder/HereGeocoder.java
new file mode 100644
index 000000000..756260b52
--- /dev/null
+++ b/src/org/traccar/geocoder/HereGeocoder.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2018 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.JsonObject;
+
+public class HereGeocoder extends JsonGeocoder {
+
+ private static String formatUrl(String id, String key, String language) {
+ String url = "https://reverse.geocoder.api.here.com/6.2/reversegeocode.json";
+ url += "?mode=retrieveAddresses&maxresults=1";
+ url += "&prox=%f,%f,0";
+ url += "&app_id=" + id;
+ url += "&app_code=" + key;
+ if (language != null) {
+ url += "&language=" + language;
+ }
+ return url;
+ }
+
+ public HereGeocoder(String id, String key, String language, int cacheSize, AddressFormat addressFormat) {
+ super(formatUrl(id, key, language), cacheSize, addressFormat);
+ }
+
+ @Override
+ public Address parseAddress(JsonObject json) {
+ JsonObject result = json
+ .getJsonObject("Response")
+ .getJsonArray("View")
+ .getJsonObject(0)
+ .getJsonArray("Result")
+ .getJsonObject(0)
+ .getJsonObject("Location")
+ .getJsonObject("Address");
+
+ if (result != null) {
+ Address address = new Address();
+
+ if (json.containsKey("Label")) {
+ address.setFormattedAddress(json.getString("Label"));
+ }
+
+ if (result.containsKey("HouseNumber")) {
+ address.setHouse(result.getString("HouseNumber"));
+ }
+ if (result.containsKey("Street")) {
+ address.setStreet(result.getString("Street"));
+ }
+ if (result.containsKey("City")) {
+ address.setSettlement(result.getString("City"));
+ }
+ if (result.containsKey("District")) {
+ address.setDistrict(result.getString("District"));
+ }
+ if (result.containsKey("State")) {
+ address.setState(result.getString("State"));
+ }
+ if (result.containsKey("Country")) {
+ address.setCountry(result.getString("Country").toUpperCase());
+ }
+ if (result.containsKey("PostalCode")) {
+ address.setPostcode(result.getString("PostalCode"));
+ }
+
+ return address;
+ }
+
+ return null;
+ }
+
+}
diff --git a/test/org/traccar/geocoder/GeocoderTest.java b/test/org/traccar/geocoder/GeocoderTest.java
index 167b71bc2..42220cde1 100644
--- a/test/org/traccar/geocoder/GeocoderTest.java
+++ b/test/org/traccar/geocoder/GeocoderTest.java
@@ -9,149 +9,73 @@ import static org.junit.Assert.assertEquals;
public class GeocoderTest {
- @Ignore
- @Test
- public void test() throws InterruptedException {
+ static {
Locale.setDefault(Locale.US);
- testBan();
- }
-
- private String address;
-
- private synchronized String waitAddress() {
- try {
- wait(5000);
- return address;
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
}
- private synchronized void setAddress(String address) {
- this.address = address;
- notifyAll();
- }
-
- public void testGoogle() throws InterruptedException {
+ @Ignore
+ @Test
+ public void testGoogle() {
Geocoder geocoder = new GoogleGeocoder(null, null, 0, new AddressFormat());
-
- geocoder.getAddress(31.776797, 35.211489, new Geocoder.ReverseGeocoderCallback() {
- @Override
- public void onSuccess(String address) {
- setAddress(address);
- }
-
- @Override
- public void onFailure(final Throwable e) {
- }
- });
-
- assertEquals("1 Ibn Shaprut St, Jerusalem, Jerusalem District, IL", waitAddress());
+ String address = geocoder.getAddress(31.776797, 35.211489, null);
+ assertEquals("1 Ibn Shaprut St, Jerusalem, Jerusalem District, IL", address);
}
- public void testNominatim() throws InterruptedException {
+ @Ignore
+ @Test
+ public void testNominatim() {
Geocoder geocoder = new NominatimGeocoder(null, null, null, 0, new AddressFormat());
-
- geocoder.getAddress(40.7337807, -73.9974401, new Geocoder.ReverseGeocoderCallback() {
- @Override
- public void onSuccess(String address) {
- setAddress(address);
- }
-
- @Override
- public void onFailure(Throwable e) {
- }
- });
-
- assertEquals("35 West 9th Street, NYC, New York, US", waitAddress());
+ String address = geocoder.getAddress(40.7337807, -73.9974401, null);
+ assertEquals("35 West 9th Street, NYC, New York, US", address);
}
- public void testGisgraphy() throws InterruptedException {
+ @Ignore
+ @Test
+ public void testGisgraphy() {
Geocoder geocoder = new GisgraphyGeocoder(new AddressFormat());
-
- geocoder.getAddress(48.8530000, 2.3400000, new Geocoder.ReverseGeocoderCallback() {
- @Override
- public void onSuccess(String address) {
- setAddress(address);
- }
-
- @Override
- public void onFailure(Throwable e) {
- }
- });
-
- assertEquals("Rue du Jardinet, Paris, Île-de-France, FR", waitAddress());
+ String address = geocoder.getAddress(48.8530000, 2.3400000, null);
+ assertEquals("Rue du Jardinet, Paris, Île-de-France, FR", address);
}
- public void testOpenCage() throws InterruptedException {
+ @Ignore
+ @Test
+ public void testOpenCage() {
Geocoder geocoder = new OpenCageGeocoder(
"http://api.opencagedata.com/geocode/v1", "SECRET", 0, new AddressFormat());
-
- geocoder.getAddress(34.116302, -118.051519, new Geocoder.ReverseGeocoderCallback() {
- @Override
- public void onSuccess(String address) {
- setAddress(address);
- }
-
- @Override
- public void onFailure(Throwable e) {
- }
- });
-
- assertEquals("Charleston Road, California, US", waitAddress());
+ String address = geocoder.getAddress(34.116302, -118.051519, null);
+ assertEquals("Charleston Road, California, US", address);
}
- public void testGeocodeFarm() throws InterruptedException {
+ @Ignore
+ @Test
+ public void testGeocodeFarm() {
Geocoder geocoder = new GeocodeFarmGeocoder(null, null, 0, new AddressFormat());
-
- geocoder.getAddress(34.116302, -118.051519, new Geocoder.ReverseGeocoderCallback() {
- @Override
- public void onSuccess(String address) {
- setAddress(address);
- }
-
- @Override
- public void onFailure(Throwable e) {
- }
- });
-
- assertEquals("Estrella Avenue, Arcadia, California, United States", waitAddress());
+ String address = geocoder.getAddress(34.116302, -118.051519, null);
+ assertEquals("Estrella Avenue, Arcadia, California, United States", address);
}
- public void testGeocodeXyz() throws InterruptedException {
+ @Ignore
+ @Test
+ public void testGeocodeXyz() {
Geocoder geocoder = new GeocodeXyzGeocoder(null, 0, new AddressFormat());
-
- geocoder.getAddress(34.116302, -118.051519, new Geocoder.ReverseGeocoderCallback() {
- @Override
- public void onSuccess(String address) {
- setAddress(address);
- }
-
- @Override
- public void onFailure(Throwable e) {
- }
- });
-
- assertEquals("605 ESTRELLA AVE, ARCADIA, California United States of America, US", waitAddress());
+ String address = geocoder.getAddress(34.116302, -118.051519, null);
+ assertEquals("605 ESTRELLA AVE, ARCADIA, California United States of America, US", address);
}
@Ignore
@Test
- public void testBan() throws InterruptedException {
+ public void testBan() {
Geocoder geocoder = new BanGeocoder(0, new AddressFormat("%f [%d], %c"));
+ String address = geocoder.getAddress(48.8575, 2.2944, null);
+ assertEquals("8 Avenue Gustave Eiffel 75007 Paris [75, Paris, Île-de-France], FR", address);
+ }
- geocoder.getAddress(48.8575, 2.2944, new Geocoder.ReverseGeocoderCallback() {
- @Override
- public void onSuccess(String address) {
- setAddress(address);
- }
-
- @Override
- public void onFailure(Throwable e) {
- }
- });
-
- assertEquals("8 Avenue Gustave Eiffel 75007 Paris [75, Paris, Île-de-France], FR", waitAddress());
+ @Ignore
+ @Test
+ public void testHere() {
+ Geocoder geocoder = new HereGeocoder("", "", null, 0, new AddressFormat());
+ String address = geocoder.getAddress(48.8575, 2.2944, null);
+ assertEquals("6 Avenue Gustave Eiffel, Paris, Île-de-France, FRA", address);
}
}