diff options
Diffstat (limited to 'src')
4 files changed, 73 insertions, 0 deletions
diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java index bf578054d..5e5ab2327 100644 --- a/src/main/java/org/traccar/MainModule.java +++ b/src/main/java/org/traccar/MainModule.java @@ -43,6 +43,7 @@ import org.traccar.geocoder.MapQuestGeocoder; 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.geolocation.GeolocationProvider; import org.traccar.geolocation.GoogleGeolocationProvider; @@ -177,6 +178,8 @@ public class MainModule extends AbstractModule { return new MapmyIndiaGeocoder(url, key, cacheSize, addressFormat); case "tomtom": return new TomTomGeocoder(url, key, cacheSize, addressFormat); + case "positionstack": + return new PositionStackGeocoder(key, cacheSize, addressFormat); default: return new GoogleGeocoder(key, language, cacheSize, addressFormat); } diff --git a/src/main/java/org/traccar/geocoder/JsonGeocoder.java b/src/main/java/org/traccar/geocoder/JsonGeocoder.java index ed59a1d8d..8c442def3 100644 --- a/src/main/java/org/traccar/geocoder/JsonGeocoder.java +++ b/src/main/java/org/traccar/geocoder/JsonGeocoder.java @@ -50,6 +50,13 @@ public abstract class JsonGeocoder implements Geocoder { } } + protected String readValue(JsonObject object, String key) { + if (object.containsKey(key) && !object.isNull(key)) { + return object.getString(key); + } + return null; + } + private String handleResponse( double latitude, double longitude, JsonObject json, ReverseGeocoderCallback callback) { diff --git a/src/main/java/org/traccar/geocoder/PositionStackGeocoder.java b/src/main/java/org/traccar/geocoder/PositionStackGeocoder.java new file mode 100644 index 000000000..2674a68ca --- /dev/null +++ b/src/main/java/org/traccar/geocoder/PositionStackGeocoder.java @@ -0,0 +1,55 @@ +/* + * Copyright 2020 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 PositionStackGeocoder extends JsonGeocoder { + + private static String formatUrl(String key) { + return "http://api.positionstack.com/v1/reverse?access_key=" + key + "&query=%f,%f"; + } + + public PositionStackGeocoder(String key, int cacheSize, AddressFormat addressFormat) { + super(formatUrl(key), cacheSize, addressFormat); + } + + @Override + public Address parseAddress(JsonObject json) { + JsonArray result = json.getJsonArray("data"); + + if (result != null && !result.isEmpty()) { + JsonObject record = result.getJsonObject(0); + + Address address = new Address(); + + address.setFormattedAddress(readValue(record, "label")); + address.setHouse(readValue(record, "number")); + address.setStreet(readValue(record, "street")); + address.setSuburb(readValue(record, "neighbourhood")); + address.setSettlement(readValue(record, "locality")); + address.setState(readValue(record, "region")); + address.setCountry(readValue(record, "country_code")); + address.setPostcode(readValue(record, "postal_code")); + + return address; + } + + return null; + } + +} diff --git a/src/test/java/org/traccar/geocoder/GeocoderTest.java b/src/test/java/org/traccar/geocoder/GeocoderTest.java index e70719b89..d93a72a87 100644 --- a/src/test/java/org/traccar/geocoder/GeocoderTest.java +++ b/src/test/java/org/traccar/geocoder/GeocoderTest.java @@ -85,4 +85,12 @@ public class GeocoderTest { String address = geocoder.getAddress(28.6129602407977, 77.2294557094574, null); assertEquals("New Delhi, Delhi. 1 m from India Gate pin-110001 (India)", address); } + + @Ignore + @Test + public void testPositionStack() { + Geocoder geocoder = new PositionStackGeocoder("", 0, new AddressFormat("%f")); + String address = geocoder.getAddress(28.6129602407977, 77.2294557094574, null); + assertEquals("India Gate, New Delhi, India", address); + } } |