aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-03-15 10:56:23 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-03-15 10:56:23 +1300
commite8f5028cab5d95792c9df34824b7c76bfa9c6222 (patch)
treebf36c7dea39d26663a144362cb7cd8212b8fad9b /src/org/traccar
parent0a1019b59481b6bf8ee8989feb23cef084b6caf5 (diff)
downloadtraccar-server-e8f5028cab5d95792c9df34824b7c76bfa9c6222.tar.gz
traccar-server-e8f5028cab5d95792c9df34824b7c76bfa9c6222.tar.bz2
traccar-server-e8f5028cab5d95792c9df34824b7c76bfa9c6222.zip
Support key for Google geocoder (fix #1781)
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/Context.java6
-rw-r--r--src/org/traccar/geocode/GoogleReverseGeocoder.java4
2 files changed, 9 insertions, 1 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 55561b921..e87f78d20 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -148,7 +148,11 @@ public final class Context {
reverseGeocoder = new FactualReverseGeocoder(url, key, cacheSize);
break;
default:
- reverseGeocoder = new GoogleReverseGeocoder(cacheSize);
+ if (key != null) {
+ reverseGeocoder = new GoogleReverseGeocoder(key, cacheSize);
+ } else {
+ reverseGeocoder = new GoogleReverseGeocoder(cacheSize);
+ }
break;
}
}
diff --git a/src/org/traccar/geocode/GoogleReverseGeocoder.java b/src/org/traccar/geocode/GoogleReverseGeocoder.java
index f1c27c5d3..be863718b 100644
--- a/src/org/traccar/geocode/GoogleReverseGeocoder.java
+++ b/src/org/traccar/geocode/GoogleReverseGeocoder.java
@@ -29,6 +29,10 @@ public class GoogleReverseGeocoder extends JsonReverseGeocoder {
super("http://maps.googleapis.com/maps/api/geocode/json?latlng=%f,%f", cacheSize);
}
+ public GoogleReverseGeocoder(String key, int cacheSize) {
+ super("http://maps.googleapis.com/maps/api/geocode/json?latlng=%f,%f&key=" + key, cacheSize);
+ }
+
@Override
public Address parseAddress(JsonObject json) {
JsonArray results = json.getJsonArray("results");