aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-09-24 09:57:46 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-09-24 09:57:46 +1200
commit8f9ecb8683ea6f12308c302541afcd49a58c3dbc (patch)
treec2021f1b37027595141505cab53e09aeccf58169
parent09ad10e13fdf5a343c4450025635a498bdea7ea3 (diff)
downloadtrackermap-server-8f9ecb8683ea6f12308c302541afcd49a58c3dbc.tar.gz
trackermap-server-8f9ecb8683ea6f12308c302541afcd49a58c3dbc.tar.bz2
trackermap-server-8f9ecb8683ea6f12308c302541afcd49a58c3dbc.zip
Fix minor formatting issues
-rw-r--r--src/org/traccar/Context.java12
-rw-r--r--src/org/traccar/geocode/FactualReverseGeocoder.java4
2 files changed, 7 insertions, 9 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 340167286..b3880eaf8 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -117,12 +117,6 @@ public class Context {
int cacheSize = config.getInteger("geocoder.cacheSize");
switch (type) {
- case "bingmaps":
- reverseGeocoder = new BingMapsReverseGeocoder(url, key, cacheSize);
- break;
- case "factual":
- reverseGeocoder = new FactualReverseGeocoder(url, key, cacheSize);
- break;
case "google":
reverseGeocoder = new GoogleReverseGeocoder(cacheSize);
break;
@@ -138,6 +132,12 @@ public class Context {
case "opencage":
reverseGeocoder = new OpenCageReverseGeocoder(url, key, cacheSize);
break;
+ case "bingmaps":
+ reverseGeocoder = new BingMapsReverseGeocoder(url, key, cacheSize);
+ break;
+ case "factual":
+ reverseGeocoder = new FactualReverseGeocoder(url, key, cacheSize);
+ break;
}
}
diff --git a/src/org/traccar/geocode/FactualReverseGeocoder.java b/src/org/traccar/geocode/FactualReverseGeocoder.java
index ce4523c69..9100301bb 100644
--- a/src/org/traccar/geocode/FactualReverseGeocoder.java
+++ b/src/org/traccar/geocode/FactualReverseGeocoder.java
@@ -15,9 +15,7 @@
*/
package org.traccar.geocode;
-import javax.json.JsonArray;
import javax.json.JsonObject;
-import org.traccar.helper.Log;
public class FactualReverseGeocoder extends JsonReverseGeocoder {
@@ -32,7 +30,6 @@ public class FactualReverseGeocoder extends JsonReverseGeocoder {
@Override
protected Address parseAddress(JsonObject json) {
JsonObject result = json.getJsonObject("response").getJsonObject("data");
- JsonObject dummy;
if (result != null) {
Address address = new Address();
if (result.getJsonObject("street_number") != null) {
@@ -60,4 +57,5 @@ public class FactualReverseGeocoder extends JsonReverseGeocoder {
}
return null;
}
+
}