From e8cd15c0fb192f635808adfde4e8614e6b4b3c3f Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 31 Dec 2016 11:34:22 +1300 Subject: Rename Location to Geolocation --- src/org/traccar/BasePipelineFactory.java | 4 +- src/org/traccar/Context.java | 28 ++++---- src/org/traccar/LocationProviderHandler.java | 10 +-- .../traccar/geolocation/GeolocationProvider.java | 32 +++++++++ .../geolocation/GoogleGeolocationProvider.java | 26 ++++++++ .../geolocation/MozillaGeolocationProvider.java | 30 +++++++++ .../geolocation/OpenCellIdGeolocationProvider.java | 75 ++++++++++++++++++++++ .../geolocation/UniversalGeolocationProvider.java | 68 ++++++++++++++++++++ .../traccar/location/GoogleLocationProvider.java | 26 -------- src/org/traccar/location/LocationProvider.java | 32 --------- .../traccar/location/MozillaLocationProvider.java | 30 --------- .../location/OpenCellIdLocationProvider.java | 75 ---------------------- .../location/UniversalLocationProvider.java | 64 ------------------ 13 files changed, 252 insertions(+), 248 deletions(-) create mode 100644 src/org/traccar/geolocation/GeolocationProvider.java create mode 100644 src/org/traccar/geolocation/GoogleGeolocationProvider.java create mode 100644 src/org/traccar/geolocation/MozillaGeolocationProvider.java create mode 100644 src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java create mode 100644 src/org/traccar/geolocation/UniversalGeolocationProvider.java delete mode 100644 src/org/traccar/location/GoogleLocationProvider.java delete mode 100644 src/org/traccar/location/LocationProvider.java delete mode 100644 src/org/traccar/location/MozillaLocationProvider.java delete mode 100644 src/org/traccar/location/OpenCellIdLocationProvider.java delete mode 100644 src/org/traccar/location/UniversalLocationProvider.java (limited to 'src/org') diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index d73b022ae..94a6d85aa 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -130,9 +130,9 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { Context.getReverseGeocoder(), Context.getConfig().getBoolean("geocoder.processInvalidPositions")); } - if (Context.getLocationProvider() != null) { + if (Context.getGeolocationProvider() != null) { locationProviderHandler = new LocationProviderHandler( - Context.getLocationProvider(), Context.getConfig().getBoolean("location.processInvalidPositions")); + Context.getGeolocationProvider(), Context.getConfig().getBoolean("location.processInvalidPositions")); } distanceHandler = new DistanceHandler(); diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index 14ef85929..4825158c4 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -44,10 +44,10 @@ import org.traccar.geocode.NominatimReverseGeocoder; import org.traccar.geocode.OpenCageReverseGeocoder; import org.traccar.geocode.ReverseGeocoder; import org.traccar.helper.Log; -import org.traccar.location.GoogleLocationProvider; -import org.traccar.location.LocationProvider; -import org.traccar.location.MozillaLocationProvider; -import org.traccar.location.OpenCellIdLocationProvider; +import org.traccar.geolocation.GoogleGeolocationProvider; +import org.traccar.geolocation.GeolocationProvider; +import org.traccar.geolocation.MozillaGeolocationProvider; +import org.traccar.geolocation.OpenCellIdGeolocationProvider; import org.traccar.notification.EventForwarder; import org.traccar.web.WebServer; @@ -110,10 +110,10 @@ public final class Context { return reverseGeocoder; } - private static LocationProvider locationProvider; + private static GeolocationProvider geolocationProvider; - public static LocationProvider getLocationProvider() { - return locationProvider; + public static GeolocationProvider getGeolocationProvider() { + return geolocationProvider; } private static WebServer webServer; @@ -249,20 +249,20 @@ public final class Context { } } - if (config.getBoolean("location.enable")) { - String type = config.getString("location.type", "mozilla"); - String key = config.getString("location.key"); + if (config.getBoolean("geolocation.enable")) { + String type = config.getString("geolocation.type", "mozilla"); + String key = config.getString("geolocation.key"); switch (type) { case "google": - locationProvider = new GoogleLocationProvider(key); + geolocationProvider = new GoogleGeolocationProvider(key); case "opencellid": - locationProvider = new OpenCellIdLocationProvider(key); + geolocationProvider = new OpenCellIdGeolocationProvider(key); default: if (key != null) { - locationProvider = new MozillaLocationProvider(key); + geolocationProvider = new MozillaGeolocationProvider(key); } else { - locationProvider = new MozillaLocationProvider(); + geolocationProvider = new MozillaGeolocationProvider(); } break; } diff --git a/src/org/traccar/LocationProviderHandler.java b/src/org/traccar/LocationProviderHandler.java index ca3094ac2..bf37a8b88 100644 --- a/src/org/traccar/LocationProviderHandler.java +++ b/src/org/traccar/LocationProviderHandler.java @@ -21,16 +21,16 @@ import org.jboss.netty.channel.ChannelUpstreamHandler; import org.jboss.netty.channel.Channels; import org.jboss.netty.channel.MessageEvent; import org.traccar.helper.Log; -import org.traccar.location.LocationProvider; +import org.traccar.geolocation.GeolocationProvider; import org.traccar.model.Position; public class LocationProviderHandler implements ChannelUpstreamHandler { - private final LocationProvider locationProvider; + private final GeolocationProvider geolocationProvider; private final boolean processInvalidPositions; - public LocationProviderHandler(LocationProvider locationProvider, boolean processInvalidPositions) { - this.locationProvider = locationProvider; + public LocationProviderHandler(GeolocationProvider geolocationProvider, boolean processInvalidPositions) { + this.geolocationProvider = geolocationProvider; this.processInvalidPositions = processInvalidPositions; } @@ -47,7 +47,7 @@ public class LocationProviderHandler implements ChannelUpstreamHandler { final Position position = (Position) message; if ((position.getOutdated() || processInvalidPositions && !position.getValid()) && position.getNetwork() != null) { - locationProvider.getLocation(position.getNetwork(), new LocationProvider.LocationProviderCallback() { + geolocationProvider.getLocation(position.getNetwork(), new GeolocationProvider.LocationProviderCallback() { @Override public void onSuccess(double latitude, double longitude, double accuracy) { position.set(Position.KEY_APPROXIMATE, true); diff --git a/src/org/traccar/geolocation/GeolocationProvider.java b/src/org/traccar/geolocation/GeolocationProvider.java new file mode 100644 index 000000000..d9dec6bbb --- /dev/null +++ b/src/org/traccar/geolocation/GeolocationProvider.java @@ -0,0 +1,32 @@ +/* + * 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 new file mode 100644 index 000000000..5901b47cd --- /dev/null +++ b/src/org/traccar/geolocation/GoogleGeolocationProvider.java @@ -0,0 +1,26 @@ +/* + * 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 new file mode 100644 index 000000000..af917d6fe --- /dev/null +++ b/src/org/traccar/geolocation/MozillaGeolocationProvider.java @@ -0,0 +1,30 @@ +/* + * 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() { + this("test"); + } + + public MozillaGeolocationProvider(String key) { + super(URL, key); + } + +} diff --git a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java b/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java new file mode 100644 index 000000000..7d129e3e9 --- /dev/null +++ b/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java @@ -0,0 +1,75 @@ +/* + * 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.geolocation; + +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 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.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/geolocation/UniversalGeolocationProvider.java b/src/org/traccar/geolocation/UniversalGeolocationProvider.java new file mode 100644 index 000000000..320d0774b --- /dev/null +++ b/src/org/traccar/geolocation/UniversalGeolocationProvider.java @@ -0,0 +1,68 @@ +/* + * 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; + +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 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) { + 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(); + if (json.containsKey("error")) { + callback.onFailure(new RuntimeException(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()); + } + } + return null; + } + + @Override + public void onThrowable(Throwable t) { + callback.onFailure(t); + } + }); + } catch (JsonProcessingException e) { + callback.onFailure(e); + } + } + +} 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); - } - } - -} -- cgit v1.2.3