From 3d793f502e1d48eb9c1dd60005ccf6c8682d73ca Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 7 Apr 2024 14:55:48 -0700 Subject: Add Open Location Code geocoder --- build.gradle | 1 + debug.xml | 2 +- src/main/java/org/traccar/MainModule.java | 6 ++-- .../org/traccar/geocoder/PlusCodesGeocoder.java | 37 ++++++++++++++++++++++ .../java/org/traccar/geocoder/TestGeocoder.java | 36 --------------------- 5 files changed, 42 insertions(+), 40 deletions(-) create mode 100644 src/main/java/org/traccar/geocoder/PlusCodesGeocoder.java delete mode 100644 src/main/java/org/traccar/geocoder/TestGeocoder.java diff --git a/build.gradle b/build.gradle index 2fe2bfaab..e731f99ed 100644 --- a/build.gradle +++ b/build.gradle @@ -90,6 +90,7 @@ dependencies { implementation "com.nimbusds:oauth2-oidc-sdk:11.10.1" implementation "com.rabbitmq:amqp-client:5.20.0" implementation "com.warrenstrange:googleauth:1.5.0" + implementation 'com.google.openlocationcode:openlocationcode:1.0.4' testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion" testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitVersion" testImplementation "org.mockito:mockito-core:5.11.0" diff --git a/debug.xml b/debug.xml index a0c179cff..89b5a5ba3 100644 --- a/debug.xml +++ b/debug.xml @@ -10,7 +10,7 @@ true true - test + pluscodes ./target/media diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java index 791d61c61..d1d3d4663 100644 --- a/src/main/java/org/traccar/MainModule.java +++ b/src/main/java/org/traccar/MainModule.java @@ -66,7 +66,7 @@ import org.traccar.geocoder.MapmyIndiaGeocoder; import org.traccar.geocoder.NominatimGeocoder; import org.traccar.geocoder.OpenCageGeocoder; import org.traccar.geocoder.PositionStackGeocoder; -import org.traccar.geocoder.TestGeocoder; +import org.traccar.geocoder.PlusCodesGeocoder; import org.traccar.geocoder.TomTomGeocoder; import org.traccar.geolocation.GeolocationProvider; import org.traccar.geolocation.GoogleGeolocationProvider; @@ -211,8 +211,8 @@ public class MainModule extends AbstractModule { int cacheSize = config.getInteger(Keys.GEOCODER_CACHE_SIZE); Geocoder geocoder; switch (type) { - case "test": - geocoder = new TestGeocoder(); + case "pluscodes": + geocoder = new PlusCodesGeocoder(); break; case "nominatim": geocoder = new NominatimGeocoder(client, url, key, language, cacheSize, addressFormat); diff --git a/src/main/java/org/traccar/geocoder/PlusCodesGeocoder.java b/src/main/java/org/traccar/geocoder/PlusCodesGeocoder.java new file mode 100644 index 000000000..5d003192f --- /dev/null +++ b/src/main/java/org/traccar/geocoder/PlusCodesGeocoder.java @@ -0,0 +1,37 @@ +/* + * Copyright 2022 - 2024 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.geocoder; + +import com.google.openlocationcode.OpenLocationCode; +import org.traccar.database.StatisticsManager; + +public class PlusCodesGeocoder implements Geocoder { + + @Override + public void setStatisticsManager(StatisticsManager statisticsManager) { + } + + @Override + public String getAddress(double latitude, double longitude, ReverseGeocoderCallback callback) { + String address = new OpenLocationCode(latitude, longitude).getCode(); + if (callback != null) { + callback.onSuccess(address); + return null; + } + return address; + } + +} diff --git a/src/main/java/org/traccar/geocoder/TestGeocoder.java b/src/main/java/org/traccar/geocoder/TestGeocoder.java deleted file mode 100644 index 259f13c6c..000000000 --- a/src/main/java/org/traccar/geocoder/TestGeocoder.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2022 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.geocoder; - -import org.traccar.database.StatisticsManager; - -public class TestGeocoder implements Geocoder { - - @Override - public void setStatisticsManager(StatisticsManager statisticsManager) { - } - - @Override - public String getAddress(double latitude, double longitude, ReverseGeocoderCallback callback) { - String address = String.format("Location %f, %f", latitude, longitude); - if (callback != null) { - callback.onSuccess(address); - return null; - } - return address; - } - -} -- cgit v1.2.3