diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-02-26 23:05:52 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-26 23:05:52 +1300 |
| commit | 55160d10bee21f58e82339675bd869f408ff7a2d (patch) | |
| tree | 55a5f0481e0da4f73f0fab0a82ece1f655b89403 /src/org/traccar/geocoder/GeocodeFarmGeocoder.java | |
| parent | d6d7b9b95df252c611b1106fa84d325f34ae72da (diff) | |
| parent | 7e973874a9c15a3c84cd948ad29c1416afc3dd2a (diff) | |
| download | trackermap-server-55160d10bee21f58e82339675bd869f408ff7a2d.tar.gz trackermap-server-55160d10bee21f58e82339675bd869f408ff7a2d.tar.bz2 trackermap-server-55160d10bee21f58e82339675bd869f408ff7a2d.zip | |
Merge pull request #3786 from AnshulJain1985/Formatted-Address
To use formatted address directly instead of creating address
Diffstat (limited to 'src/org/traccar/geocoder/GeocodeFarmGeocoder.java')
| -rw-r--r-- | src/org/traccar/geocoder/GeocodeFarmGeocoder.java | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/org/traccar/geocoder/GeocodeFarmGeocoder.java b/src/org/traccar/geocoder/GeocodeFarmGeocoder.java index 4fb956af9..39a3300a0 100644 --- a/src/org/traccar/geocoder/GeocodeFarmGeocoder.java +++ b/src/org/traccar/geocoder/GeocodeFarmGeocoder.java @@ -41,23 +41,27 @@ public class GeocodeFarmGeocoder extends JsonGeocoder { JsonObject result = json .getJsonObject("geocoding_results") .getJsonArray("RESULTS") - .getJsonObject(0) - .getJsonObject("ADDRESS"); + .getJsonObject(0); - if (result.containsKey("street_number")) { - address.setStreet(result.getString("street_number")); + JsonObject resultAddress = result.getJsonObject("ADDRESS"); + + if (result.containsKey("formatted_address")) { + address.setFormattedAddress(result.getString("formatted_address")); + } + if (resultAddress.containsKey("street_number")) { + address.setStreet(resultAddress.getString("street_number")); } - if (result.containsKey("street_name")) { - address.setStreet(result.getString("street_name")); + if (resultAddress.containsKey("street_name")) { + address.setStreet(resultAddress.getString("street_name")); } - if (result.containsKey("locality")) { - address.setSettlement(result.getString("locality")); + if (resultAddress.containsKey("locality")) { + address.setSettlement(resultAddress.getString("locality")); } - if (result.containsKey("admin_1")) { - address.setState(result.getString("admin_1")); + if (resultAddress.containsKey("admin_1")) { + address.setState(resultAddress.getString("admin_1")); } - if (result.containsKey("country")) { - address.setCountry(result.getString("country")); + if (resultAddress.containsKey("country")) { + address.setCountry(resultAddress.getString("country")); } return address; |