diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-02-21 05:46:02 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-02-21 05:46:02 +1300 |
| commit | 26eda5d6a7e9ee580bfc5b8c24d95197c3d65e41 (patch) | |
| tree | b6f145d961195c8922e90c7267b17e11371f0e09 | |
| parent | 94ca35f242acc39d528918eccda5f3f08c2f0c2d (diff) | |
| download | trackermap-server-26eda5d6a7e9ee580bfc5b8c24d95197c3d65e41.tar.gz trackermap-server-26eda5d6a7e9ee580bfc5b8c24d95197c3d65e41.tar.bz2 trackermap-server-26eda5d6a7e9ee580bfc5b8c24d95197c3d65e41.zip | |
Fix URL problem in geocoders
| -rw-r--r-- | src/org/traccar/geocoder/GeocodeFarmGeocoder.java | 10 | ||||
| -rw-r--r-- | src/org/traccar/geocoder/NominatimGeocoder.java | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/org/traccar/geocoder/GeocodeFarmGeocoder.java b/src/org/traccar/geocoder/GeocodeFarmGeocoder.java index db23aab79..73ff85aa4 100644 --- a/src/org/traccar/geocoder/GeocodeFarmGeocoder.java +++ b/src/org/traccar/geocoder/GeocodeFarmGeocoder.java @@ -19,15 +19,19 @@ import javax.json.JsonObject; public class GeocodeFarmGeocoder extends JsonGeocoder { - private static String formatUrl(String key) { + private static String formatUrl(String key, String language) { String url = "https://www.geocode.farm/v3/json/reverse/"; + url += "?lat=%f&lon=%f&country=us&count=1"; if (key != null) { url += "&key=" + key; } + if (language != null) { + url += "&lang=" + language; + } return url; } - public GeocodeFarmGeocoder(String key, int cacheSize) { - super(formatUrl(key), cacheSize); + public GeocodeFarmGeocoder(String key, String language, int cacheSize) { + super(formatUrl(key, language), cacheSize); } @Override diff --git a/src/org/traccar/geocoder/NominatimGeocoder.java b/src/org/traccar/geocoder/NominatimGeocoder.java index c10a1414e..4f33468fd 100644 --- a/src/org/traccar/geocoder/NominatimGeocoder.java +++ b/src/org/traccar/geocoder/NominatimGeocoder.java @@ -23,6 +23,7 @@ public class NominatimGeocoder extends JsonGeocoder { if (url == null) { url = "http://nominatim.openstreetmap.org/reverse"; } + url += "?format=json&lat=%f&lon=%f&zoom=18&addressdetails=1"; if (key != null) { url += "&key=" + key; } |