aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-11-20 18:11:06 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-11-20 18:11:06 +1300
commit192800b5261d3128386bd83d6b8b684ea417fa9b (patch)
tree6044a01d9cb8cbb17bedd854e75d36e65a3990df /src/org/traccar
parentffd0d7f5a60b33ba45c22210d4ba5f07f2a6d789 (diff)
downloadtrackermap-server-192800b5261d3128386bd83d6b8b684ea417fa9b.tar.gz
trackermap-server-192800b5261d3128386bd83d6b8b684ea417fa9b.tar.bz2
trackermap-server-192800b5261d3128386bd83d6b8b684ea417fa9b.zip
Add support for Mozilla Location Service
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/Context.java12
-rw-r--r--src/org/traccar/location/MozillaLocationProvider.java75
-rw-r--r--src/org/traccar/location/OpenCellIdLocationProvider.java36
3 files changed, 104 insertions, 19 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index aff72cd01..c833d0c2e 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -30,6 +30,7 @@ import org.traccar.geocode.OpenCageReverseGeocoder;
import org.traccar.geocode.ReverseGeocoder;
import org.traccar.helper.Log;
import org.traccar.location.LocationProvider;
+import org.traccar.location.MozillaLocationProvider;
import org.traccar.location.OpenCellIdLocationProvider;
import org.traccar.web.WebServer;
@@ -153,8 +154,17 @@ public final class Context {
}
if (config.getBoolean("location.enable")) {
+ String type = config.getString("location.type", "opencellid");
String key = config.getString("location.key");
- locationProvider = new OpenCellIdLocationProvider(key);
+
+ switch (type) {
+ case "mozilla":
+ locationProvider = new MozillaLocationProvider();
+ break;
+ default:
+ locationProvider = new OpenCellIdLocationProvider(key);
+ break;
+ }
}
if (config.getBoolean("web.enable")) {
diff --git a/src/org/traccar/location/MozillaLocationProvider.java b/src/org/traccar/location/MozillaLocationProvider.java
new file mode 100644
index 000000000..eb01fff62
--- /dev/null
+++ b/src/org/traccar/location/MozillaLocationProvider.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.location;
+
+import com.ning.http.client.AsyncCompletionHandler;
+import com.ning.http.client.Response;
+import org.traccar.Context;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+
+public class MozillaLocationProvider extends BaseLocationProvider {
+
+ private String url;
+ private String template;
+
+ public MozillaLocationProvider() {
+ this("https://location.services.mozilla.com/v1/geolocate", "test");
+ }
+
+ public MozillaLocationProvider(String url, String key) {
+ this.url = url + "?key=" + key;
+
+ template = new StringBuilder()
+ .append("{\"cellTowers\":[{")
+ .append("\"radioType\":\"gsm\",")
+ .append("\"mobileCountryCode\":%d,")
+ .append("\"mobileNetworkCode\":%d,")
+ .append("\"locationAreaCode\":%d,")
+ .append("\"cellId\":%d")
+ .append("}]}")
+ .toString();
+ }
+
+ protected void getLocation(int mcc, int mnc, long lac, long cid, final LocationProviderCallback callback) {
+ String body = String.format(template,mcc, mnc, lac, cid);
+ Context.getAsyncHttpClient().preparePost(url).setBody(body).execute(new AsyncCompletionHandler() {
+ @Override
+ public Object onCompleted(Response response) throws Exception {
+ try (JsonReader reader = Json.createReader(response.getResponseBodyAsStream())) {
+ JsonObject json = reader.readObject().getJsonObject("location");
+ if (json.containsKey("lat") && json.containsKey("lon")) {
+ callback.onSuccess(
+ json.getJsonNumber("lat").doubleValue(),
+ json.getJsonNumber("lon").doubleValue());
+ } else {
+ callback.onFailure();
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void onThrowable(Throwable t) {
+ callback.onFailure();
+ }
+ });
+
+ }
+
+}
diff --git a/src/org/traccar/location/OpenCellIdLocationProvider.java b/src/org/traccar/location/OpenCellIdLocationProvider.java
index b06f44d1e..94cc1a4e4 100644
--- a/src/org/traccar/location/OpenCellIdLocationProvider.java
+++ b/src/org/traccar/location/OpenCellIdLocationProvider.java
@@ -38,26 +38,26 @@ public class OpenCellIdLocationProvider extends BaseLocationProvider {
protected void getLocation(int mcc, int mnc, long lac, long cid, final LocationProviderCallback callback) {
Context.getAsyncHttpClient().prepareGet(String.format(url, mcc, mnc, lac, cid))
.execute(new AsyncCompletionHandler() {
- @Override
- public Object onCompleted(Response response) throws Exception {
- try (JsonReader reader = Json.createReader(response.getResponseBodyAsStream())) {
- JsonObject json = reader.readObject();
- if (json.containsKey("lat") && json.containsKey("lon")) {
- callback.onSuccess(
- json.getJsonNumber("lat").doubleValue(),
- json.getJsonNumber("lon").doubleValue());
- } else {
- callback.onFailure();
- }
- }
- return null;
- }
-
- @Override
- public void onThrowable(Throwable t) {
+ @Override
+ public Object onCompleted(Response response) throws Exception {
+ try (JsonReader reader = Json.createReader(response.getResponseBodyAsStream())) {
+ JsonObject json = reader.readObject();
+ if (json.containsKey("lat") && json.containsKey("lon")) {
+ callback.onSuccess(
+ json.getJsonNumber("lat").doubleValue(),
+ json.getJsonNumber("lon").doubleValue());
+ } else {
callback.onFailure();
}
- });
+ }
+ return null;
+ }
+
+ @Override
+ public void onThrowable(Throwable t) {
+ callback.onFailure();
+ }
+ });
}
}