aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/geolocation
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/geolocation')
-rw-r--r--src/org/traccar/geolocation/GeolocationException.java24
-rw-r--r--src/org/traccar/geolocation/GeolocationProvider.java32
-rw-r--r--src/org/traccar/geolocation/GoogleGeolocationProvider.java26
-rw-r--r--src/org/traccar/geolocation/MozillaGeolocationProvider.java26
-rw-r--r--src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java68
-rw-r--r--src/org/traccar/geolocation/UniversalGeolocationProvider.java58
-rw-r--r--src/org/traccar/geolocation/UnwiredGeolocationProvider.java111
7 files changed, 0 insertions, 345 deletions
diff --git a/src/org/traccar/geolocation/GeolocationException.java b/src/org/traccar/geolocation/GeolocationException.java
deleted file mode 100644
index 5847cc807..000000000
--- a/src/org/traccar/geolocation/GeolocationException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- *
- * 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.geolocation;
-
-public class GeolocationException extends RuntimeException {
-
- public GeolocationException(String message) {
- super(message);
- }
-
-}
diff --git a/src/org/traccar/geolocation/GeolocationProvider.java b/src/org/traccar/geolocation/GeolocationProvider.java
deleted file mode 100644
index d9dec6bbb..000000000
--- a/src/org/traccar/geolocation/GeolocationProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
- *
- * 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.geolocation;
-
-import org.traccar.model.Network;
-
-public interface GeolocationProvider {
-
- interface LocationProviderCallback {
-
- void onSuccess(double latitude, double longitude, double accuracy);
-
- void onFailure(Throwable e);
-
- }
-
- void getLocation(Network network, LocationProviderCallback callback);
-
-}
diff --git a/src/org/traccar/geolocation/GoogleGeolocationProvider.java b/src/org/traccar/geolocation/GoogleGeolocationProvider.java
deleted file mode 100644
index 5901b47cd..000000000
--- a/src/org/traccar/geolocation/GoogleGeolocationProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- *
- * 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.geolocation;
-
-public class GoogleGeolocationProvider extends UniversalGeolocationProvider {
-
- private static final String URL = "https://www.googleapis.com/geolocation/v1/geolocate";
-
- public GoogleGeolocationProvider(String key) {
- super(URL, key);
- }
-
-}
diff --git a/src/org/traccar/geolocation/MozillaGeolocationProvider.java b/src/org/traccar/geolocation/MozillaGeolocationProvider.java
deleted file mode 100644
index c6a73a52b..000000000
--- a/src/org/traccar/geolocation/MozillaGeolocationProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
- *
- * 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.geolocation;
-
-public class MozillaGeolocationProvider extends UniversalGeolocationProvider {
-
- private static final String URL = "https://location.services.mozilla.com/v1/geolocate";
-
- public MozillaGeolocationProvider(String key) {
- super(URL, key != null ? key : "test");
- }
-
-}
diff --git a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java b/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java
deleted file mode 100644
index 768aaf6a2..000000000
--- a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
- *
- * 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.geolocation;
-
-import org.traccar.Context;
-import org.traccar.model.CellTower;
-import org.traccar.model.Network;
-
-import javax.json.JsonObject;
-import javax.ws.rs.client.InvocationCallback;
-
-public class OpenCellIdGeolocationProvider implements GeolocationProvider {
-
- private String url;
-
- public OpenCellIdGeolocationProvider(String key) {
- this("http://opencellid.org/cell/get", key);
- }
-
- public OpenCellIdGeolocationProvider(String url, String key) {
- this.url = url + "?format=json&mcc=%d&mnc=%d&lac=%d&cellid=%d&key=" + key;
- }
-
- @Override
- public void getLocation(Network network, final LocationProviderCallback callback) {
- if (network.getCellTowers() != null && !network.getCellTowers().isEmpty()) {
-
- CellTower cellTower = network.getCellTowers().iterator().next();
- String request = String.format(url, cellTower.getMobileCountryCode(), cellTower.getMobileNetworkCode(),
- cellTower.getLocationAreaCode(), cellTower.getCellId());
-
- Context.getClient().target(request).request().async().get(new InvocationCallback<JsonObject>() {
- @Override
- public void completed(JsonObject json) {
- if (json.containsKey("lat") && json.containsKey("lon")) {
- callback.onSuccess(
- json.getJsonNumber("lat").doubleValue(),
- json.getJsonNumber("lon").doubleValue(), 0);
- } else {
- callback.onFailure(new GeolocationException("Coordinates are missing"));
- }
- }
-
- @Override
- public void failed(Throwable throwable) {
- callback.onFailure(throwable);
- }
- });
-
- } else {
- callback.onFailure(new GeolocationException("No network information"));
- }
- }
-
-}
diff --git a/src/org/traccar/geolocation/UniversalGeolocationProvider.java b/src/org/traccar/geolocation/UniversalGeolocationProvider.java
deleted file mode 100644
index f71620d8a..000000000
--- a/src/org/traccar/geolocation/UniversalGeolocationProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org)
- *
- * 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.geolocation;
-
-import org.traccar.Context;
-import org.traccar.model.Network;
-
-import javax.json.JsonObject;
-import javax.ws.rs.client.AsyncInvoker;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.InvocationCallback;
-
-public class UniversalGeolocationProvider implements GeolocationProvider {
-
- private String url;
-
- public UniversalGeolocationProvider(String url, String key) {
- this.url = url + "?key=" + key;
- }
-
- @Override
- public void getLocation(Network network, final LocationProviderCallback callback) {
- AsyncInvoker invoker = Context.getClient().target(url).request().async();
- invoker.post(Entity.json(network), new InvocationCallback<JsonObject>() {
- @Override
- public void completed(JsonObject json) {
- if (json.containsKey("error")) {
- callback.onFailure(new GeolocationException(json.getJsonObject("error").getString("message")));
- } else {
- JsonObject location = json.getJsonObject("location");
- callback.onSuccess(
- location.getJsonNumber("lat").doubleValue(),
- location.getJsonNumber("lng").doubleValue(),
- json.getJsonNumber("accuracy").doubleValue());
- }
- }
-
- @Override
- public void failed(Throwable throwable) {
- callback.onFailure(throwable);
- }
- });
- }
-
-}
diff --git a/src/org/traccar/geolocation/UnwiredGeolocationProvider.java b/src/org/traccar/geolocation/UnwiredGeolocationProvider.java
deleted file mode 100644
index 963bcb688..000000000
--- a/src/org/traccar/geolocation/UnwiredGeolocationProvider.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org)
- *
- * 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.geolocation;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.traccar.Context;
-import org.traccar.model.CellTower;
-import org.traccar.model.Network;
-import org.traccar.model.WifiAccessPoint;
-
-import javax.json.JsonObject;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.InvocationCallback;
-import java.util.Collection;
-
-public class UnwiredGeolocationProvider implements GeolocationProvider {
-
- private String url;
- private String key;
-
- private ObjectMapper objectMapper;
-
- private abstract static class NetworkMixIn {
- @JsonProperty("mcc")
- abstract Integer getHomeMobileCountryCode();
- @JsonProperty("mnc")
- abstract Integer getHomeMobileNetworkCode();
- @JsonProperty("radio")
- abstract String getRadioType();
- @JsonIgnore
- abstract String getCarrier();
- @JsonIgnore
- abstract Boolean getConsiderIp();
- @JsonProperty("cells")
- abstract Collection<CellTower> getCellTowers();
- @JsonProperty("wifi")
- abstract Collection<WifiAccessPoint> getWifiAccessPoints();
- }
-
- private abstract static class CellTowerMixIn {
- @JsonProperty("radio")
- abstract String getRadioType();
- @JsonProperty("mcc")
- abstract Integer getMobileCountryCode();
- @JsonProperty("mnc")
- abstract Integer getMobileNetworkCode();
- @JsonProperty("lac")
- abstract Integer getLocationAreaCode();
- @JsonProperty("cid")
- abstract Long getCellId();
- }
-
- private abstract static class WifiAccessPointMixIn {
- @JsonProperty("bssid")
- abstract String getMacAddress();
- @JsonProperty("signal")
- abstract Integer getSignalStrength();
- }
-
- public UnwiredGeolocationProvider(String url, String key) {
- this.url = url;
- this.key = key;
-
- objectMapper = new ObjectMapper();
- objectMapper.addMixIn(Network.class, NetworkMixIn.class);
- objectMapper.addMixIn(CellTower.class, CellTowerMixIn.class);
- objectMapper.addMixIn(WifiAccessPoint.class, WifiAccessPointMixIn.class);
- }
-
- @Override
- public void getLocation(Network network, final LocationProviderCallback callback) {
- ObjectNode json = objectMapper.valueToTree(network);
- json.put("token", key);
-
- Context.getClient().target(url).request().async().post(Entity.json(json), new InvocationCallback<JsonObject>() {
- @Override
- public void completed(JsonObject json) {
- if (json.getString("status").equals("error")) {
- callback.onFailure(new GeolocationException(json.getString("message")));
- } else {
- callback.onSuccess(
- json.getJsonNumber("lat").doubleValue(),
- json.getJsonNumber("lon").doubleValue(),
- json.getJsonNumber("accuracy").doubleValue());
- }
- }
-
- @Override
- public void failed(Throwable throwable) {
- callback.onFailure(throwable);
- }
- });
- }
-
-}