diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-09-23 21:46:25 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-09-23 21:46:25 +1200 |
commit | 6e2387149e8758a6ea0c0788c0f70287ac8a36f1 (patch) | |
tree | c5341792e41595b3b0416dfd2df59f06b2bb6b5d /src/org/traccar/geocode/OpenCageReverseGeocoder.java | |
parent | a307569274f315c786fa4b342f97dd9e1ac0a213 (diff) | |
download | trackermap-server-6e2387149e8758a6ea0c0788c0f70287ac8a36f1.tar.gz trackermap-server-6e2387149e8758a6ea0c0788c0f70287ac8a36f1.tar.bz2 trackermap-server-6e2387149e8758a6ea0c0788c0f70287ac8a36f1.zip |
Fix minor formatting issues
Diffstat (limited to 'src/org/traccar/geocode/OpenCageReverseGeocoder.java')
-rw-r--r-- | src/org/traccar/geocode/OpenCageReverseGeocoder.java | 55 |
1 files changed, 22 insertions, 33 deletions
diff --git a/src/org/traccar/geocode/OpenCageReverseGeocoder.java b/src/org/traccar/geocode/OpenCageReverseGeocoder.java index 7dd23f2e0..72f9a0dc9 100644 --- a/src/org/traccar/geocode/OpenCageReverseGeocoder.java +++ b/src/org/traccar/geocode/OpenCageReverseGeocoder.java @@ -15,62 +15,51 @@ */ package org.traccar.geocode; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonObject; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import org.traccar.helper.Log; -import org.w3c.dom.Document; public class OpenCageReverseGeocoder extends JsonReverseGeocoder { + public OpenCageReverseGeocoder() { this("https://api.opencagedata.com/geocode/v1", "ABCDE", 0); } + public OpenCageReverseGeocoder(String url, String key, int cacheSize) { - super(url + "/json?q=%f,%f&key=" + key, cacheSize); + super(url + "/json?q=%f,%f&key=" + key, cacheSize); } @Override protected Address parseAddress(JsonObject json) { - JsonArray result = json.getJsonArray("results"); + JsonArray result = json.getJsonArray("results"); if (result != null) { - JsonObject result1 = result.getJsonObject(0); - JsonObject location = result1.getJsonObject("components"); - if (location != null) { - Address address = new Address(); + JsonObject location = result.getJsonObject(0).getJsonObject("components"); + if (location != null) { + Address address = new Address(); + if (location.containsKey("house_number")) { address.setHouse(location.getString("house_number")); } - - if (location.containsKey("road")) { + if (location.containsKey("road")) { address.setStreet(location.getString("road")); - } - + } if (location.containsKey("city_district")) { address.setSettlement(location.getString("city_district")); - } - - if (location.containsKey("county")) { + } + if (location.containsKey("county")) { address.setDistrict(location.getString("county")); - } - - if (location.containsKey("state")) { + } + if (location.containsKey("state")) { address.setState(location.getString("state")); - } - - if (location.containsKey("country_code")) { + } + if (location.containsKey("country_code")) { address.setCountry(location.getString("country_code").toUpperCase()); - } - - if (location.containsKey("postcode")) { + } + if (location.containsKey("postcode")) { address.setPostcode(location.getString("postcode")); - } return address; - } + } + + return address; + } } return null; } |