From 6e2387149e8758a6ea0c0788c0f70287ac8a36f1 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 23 Sep 2015 21:46:25 +1200 Subject: Fix minor formatting issues --- src/org/traccar/Context.java | 7 ++- .../traccar/geocode/MapQuestReverseGeocoder.java | 58 ++++++++++------------ .../traccar/geocode/OpenCageReverseGeocoder.java | 55 ++++++++------------ src/org/traccar/protocol/H02ProtocolDecoder.java | 6 +-- 4 files changed, 54 insertions(+), 72 deletions(-) (limited to 'src/org') diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index 4629dc39b..46cb89fe0 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -24,9 +24,8 @@ import org.traccar.geocode.GisgraphyReverseGeocoder; import org.traccar.geocode.GoogleReverseGeocoder; import org.traccar.geocode.MapQuestReverseGeocoder; import org.traccar.geocode.NominatimReverseGeocoder; -import org.traccar.geocode.ReverseGeocoder; -import org.traccar.geocode.MapQuestReverseGeocoder; import org.traccar.geocode.OpenCageReverseGeocoder; +import org.traccar.geocode.ReverseGeocoder; import org.traccar.helper.Log; import org.traccar.web.WebServer; @@ -112,7 +111,7 @@ public class Context { if (config.getBoolean("geocoder.enable")) { String type = config.getString("geocoder.type", "google"); String url = config.getString("geocoder.url"); - String key = config.getString("geocoder.key"); + String key = config.getString("geocoder.key"); int cacheSize = config.getInteger("geocoder.cacheSize"); switch (type) { @@ -127,7 +126,7 @@ public class Context { break; case "mapquest": reverseGeocoder = new MapQuestReverseGeocoder(url, key, cacheSize); - break; + break; case "opencage": reverseGeocoder = new OpenCageReverseGeocoder(url, key, cacheSize); break; diff --git a/src/org/traccar/geocode/MapQuestReverseGeocoder.java b/src/org/traccar/geocode/MapQuestReverseGeocoder.java index e1ed18918..a815ca40f 100644 --- a/src/org/traccar/geocode/MapQuestReverseGeocoder.java +++ b/src/org/traccar/geocode/MapQuestReverseGeocoder.java @@ -30,39 +30,35 @@ public class MapQuestReverseGeocoder extends JsonReverseGeocoder { @Override protected Address parseAddress(JsonObject json) { - JsonArray result = json.getJsonArray("results"); + JsonArray result = json.getJsonArray("results"); if (result != null) { - JsonObject result1 = result.getJsonObject(0); - JsonArray location = result1.getJsonArray("locations"); - if (location != null) { - JsonObject location1 = location.getJsonObject(0); - - Address address = new Address(); + JsonArray locations = result.getJsonObject(0).getJsonArray("locations"); + if (locations != null) { + JsonObject location = locations.getJsonObject(0); + + Address address = new Address(); - if (location1.containsKey("street")) { - address.setStreet(location1.getString("street")); - } - - if (location1.containsKey("adminArea5")) { - address.setSettlement(location1.getString("adminArea5")); - } - - if (location1.containsKey("adminArea4")) { - address.setDistrict(location1.getString("adminArea4")); - } - - if (location1.containsKey("adminArea3")) { - address.setState(location1.getString("adminArea3")); - } - - if (location1.containsKey("adminArea1")) { - address.setCountry(location1.getString("adminArea1").toUpperCase()); - } - - if (location1.containsKey("postalCode")) { - address.setPostcode(location1.getString("postalCode")); - } return address; - } + if (location.containsKey("street")) { + address.setStreet(location.getString("street")); + } + if (location.containsKey("adminArea5")) { + address.setSettlement(location.getString("adminArea5")); + } + if (location.containsKey("adminArea4")) { + address.setDistrict(location.getString("adminArea4")); + } + if (location.containsKey("adminArea3")) { + address.setState(location.getString("adminArea3")); + } + if (location.containsKey("adminArea1")) { + address.setCountry(location.getString("adminArea1").toUpperCase()); + } + if (location.containsKey("postalCode")) { + address.setPostcode(location.getString("postalCode")); + } + + return address; + } } return null; } 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; } diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java index ea7a6ad9e..9aee1f918 100644 --- a/src/org/traccar/protocol/H02ProtocolDecoder.java +++ b/src/org/traccar/protocol/H02ProtocolDecoder.java @@ -15,16 +15,14 @@ */ package org.traccar.protocol; -import java.nio.charset.Charset; import java.net.SocketAddress; +import java.nio.charset.Charset; import java.util.Calendar; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.channel.Channel; - import org.traccar.BaseProtocolDecoder; import org.traccar.helper.BitUtil; import org.traccar.helper.ChannelBufferTools; @@ -109,7 +107,7 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder { } private static final Pattern pattern = Pattern.compile( - "\\*..," + // Manufacturer + "\\*..," + // Manufacturer "(\\d+)," + // IMEI "V\\d," + // Version? ".*" + -- cgit v1.2.3