Rename Location to Geolocation

5 files changed, 0 insertions, 227 deletions

diff --git a/src/org/traccar/location/GoogleLocationProvider.java b/src/org/traccar/location/GoogleLocationProvider.java
deleted file mode 100644
index d4c449170..000000000
--- a/src/org/traccar/location/GoogleLocationProvider.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.location;
-
-public class GoogleLocationProvider extends UniversalLocationProvider {
-
-    private static final String URL = "https://www.googleapis.com/geolocation/v1/geolocate";
-
-    public GoogleLocationProvider(String key) {
-        super(URL, key);
-    }
-
-}
diff --git a/src/org/traccar/location/LocationProvider.java b/src/org/traccar/location/LocationProvider.java
deleted file mode 100644
index ed1494ec3..000000000
--- a/src/org/traccar/location/LocationProvider.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.location;
-
-import org.traccar.model.Network;
-
-public interface LocationProvider {
-
-    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/location/MozillaLocationProvider.java b/src/org/traccar/location/MozillaLocationProvider.java
deleted file mode 100644
index 90be7c456..000000000
--- a/src/org/traccar/location/MozillaLocationProvider.java
+++ /dev/null
@@ -1,30 +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.location;
-
-public class MozillaLocationProvider extends UniversalLocationProvider {
-
-    private static final String URL = "https://location.services.mozilla.com/v1/geolocate";
-
-    public MozillaLocationProvider() {
-        this("test");
-    }
-
-    public MozillaLocationProvider(String key) {
-        super(URL, key);
-    }
-
-}
diff --git a/src/org/traccar/location/OpenCellIdLocationProvider.java b/src/org/traccar/location/OpenCellIdLocationProvider.java
deleted file mode 100644
index a9f815399..000000000
--- a/src/org/traccar/location/OpenCellIdLocationProvider.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2015 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.location;
-
-import com.ning.http.client.AsyncCompletionHandler;
-import com.ning.http.client.Response;
-import org.traccar.Context;
-import org.traccar.model.CellTower;
-import org.traccar.model.Network;
-
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-
-public class OpenCellIdLocationProvider implements LocationProvider {
-
-    private String url;
-
-    public OpenCellIdLocationProvider(String key) {
-        this("http://opencellid.org/cell/get", key);
-    }
-
-    public OpenCellIdLocationProvider(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.getAsyncHttpClient().prepareGet(request).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(), 0);
-                        } else {
-                            callback.onFailure(new IllegalArgumentException("Coordinates are missing"));
-                        }
-                    }
-                    return null;
-                }
-
-                @Override
-                public void onThrowable(Throwable t) {
-                    callback.onFailure(t);
-                }
-            });
-
-        } else {
-            callback.onFailure(new IllegalArgumentException("No network information"));
-        }
-    }
-
-}
diff --git a/src/org/traccar/location/UniversalLocationProvider.java b/src/org/traccar/location/UniversalLocationProvider.java
deleted file mode 100644
index 63ab681e7..000000000
--- a/src/org/traccar/location/UniversalLocationProvider.java
+++ /dev/null
@@ -1,64 +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.location;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.ning.http.client.AsyncCompletionHandler;
-import com.ning.http.client.Response;
-import org.traccar.Context;
-import org.traccar.model.Network;
-
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-
-public class UniversalLocationProvider implements LocationProvider {
-
-    private String url;
-
-    public UniversalLocationProvider(String url, String key) {
-        this.url = url + "?key=" + key;
-    }
-
-    @Override
-    public void getLocation(Network network, final LocationProviderCallback callback) {
-        try {
-            String request = Context.getObjectMapper().writeValueAsString(network);
-            Context.getAsyncHttpClient().preparePost(url).setBody(request).execute(new AsyncCompletionHandler() {
-                @Override
-                public Object onCompleted(Response response) throws Exception {
-                    try (JsonReader reader = Json.createReader(response.getResponseBodyAsStream())) {
-                        JsonObject json = reader.readObject();
-                        JsonObject location = json.getJsonObject("location");
-                        callback.onSuccess(
-                                location.getJsonNumber("lat").doubleValue(),
-                                location.getJsonNumber("lng").doubleValue(),
-                                json.getJsonNumber("accuracy").doubleValue());
-                    }
-                    return null;
-                }
-
-                @Override
-                public void onThrowable(Throwable t) {
-                    callback.onFailure(t);
-                }
-            });
-        } catch (JsonProcessingException e) {
-            callback.onFailure(e);
-        }
-    }
-
-}