diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-12-17 20:39:57 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-12-17 20:40:12 +1300 |
| commit | f8280619a39cd05106b58b7198a99fd724d9b482 (patch) | |
| tree | 1363007da62e51354327be3faa52fa42aca908b5 | |
| parent | 98133819e0ea1b3126f142026aac1f624d2b1497 (diff) | |
| download | trackermap-server-f8280619a39cd05106b58b7198a99fd724d9b482.tar.gz trackermap-server-f8280619a39cd05106b58b7198a99fd724d9b482.tar.bz2 trackermap-server-f8280619a39cd05106b58b7198a99fd724d9b482.zip | |
Add support for Mozilla API key
| -rw-r--r-- | src/org/traccar/Context.java | 6 | ||||
| -rw-r--r-- | src/org/traccar/location/MozillaLocationProvider.java | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index 03e4635b6..d859e91bb 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -242,7 +242,11 @@ public final class Context { switch (type) { case "mozilla": - locationProvider = new MozillaLocationProvider(); + if (key != null) { + locationProvider = new MozillaLocationProvider(key); + } else { + locationProvider = new MozillaLocationProvider(); + } break; default: locationProvider = new OpenCellIdLocationProvider(key); diff --git a/src/org/traccar/location/MozillaLocationProvider.java b/src/org/traccar/location/MozillaLocationProvider.java index 37040a95e..cbfc19550 100644 --- a/src/org/traccar/location/MozillaLocationProvider.java +++ b/src/org/traccar/location/MozillaLocationProvider.java @@ -25,15 +25,17 @@ import javax.json.JsonReader; public class MozillaLocationProvider extends BaseLocationProvider { + private static final String URL = "https://location.services.mozilla.com/v1/geolocate"; + private String url; private String template; public MozillaLocationProvider() { - this("https://location.services.mozilla.com/v1/geolocate", "test"); + this("test"); } - public MozillaLocationProvider(String url, String key) { - this.url = url + "?key=" + key; + public MozillaLocationProvider(String key) { + this.url = URL + "?key=" + key; template = new StringBuilder() .append("{\"cellTowers\":[{") |