From 2744b305b48d1d1215e326b3858a18f32d485eef Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 21 Aug 2021 22:41:47 -0700 Subject: Implement MapTiler geocoder --- src/main/java/org/traccar/MainModule.java | 5 +- .../java/org/traccar/geocoder/JsonGeocoder.java | 4 +- .../org/traccar/geocoder/MapTilerGeocoder.java | 73 ++++++++++++++++++++++ .../java/org/traccar/geocoder/GeocoderTest.java | 9 +++ 4 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/traccar/geocoder/MapTilerGeocoder.java (limited to 'src') diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java index e1a4d6b1c..80baebeee 100644 --- a/src/main/java/org/traccar/MainModule.java +++ b/src/main/java/org/traccar/MainModule.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 - 2019 Anton Tananaev (anton@traccar.org) + * Copyright 2018 - 2021 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. @@ -40,6 +40,7 @@ import org.traccar.geocoder.GisgraphyGeocoder; import org.traccar.geocoder.GoogleGeocoder; import org.traccar.geocoder.HereGeocoder; import org.traccar.geocoder.MapQuestGeocoder; +import org.traccar.geocoder.MapTilerGeocoder; import org.traccar.geocoder.MapmyIndiaGeocoder; import org.traccar.geocoder.NominatimGeocoder; import org.traccar.geocoder.OpenCageGeocoder; @@ -188,6 +189,8 @@ public class MainModule extends AbstractModule { return new PositionStackGeocoder(key, cacheSize, addressFormat); case "mapbox": return new MapboxGeocoder(key, cacheSize, addressFormat); + case "maptiler": + return new MapTilerGeocoder(key, cacheSize, addressFormat); default: return new GoogleGeocoder(key, language, cacheSize, addressFormat); } diff --git a/src/main/java/org/traccar/geocoder/JsonGeocoder.java b/src/main/java/org/traccar/geocoder/JsonGeocoder.java index 3cd5b596e..f20aa79d6 100644 --- a/src/main/java/org/traccar/geocoder/JsonGeocoder.java +++ b/src/main/java/org/traccar/geocoder/JsonGeocoder.java @@ -97,7 +97,9 @@ public abstract class JsonGeocoder implements Geocoder { } } - Main.getInjector().getInstance(StatisticsManager.class).registerGeocoderRequest(); + if (Main.getInjector() != null) { + Main.getInjector().getInstance(StatisticsManager.class).registerGeocoderRequest(); + } Invocation.Builder request = Context.getClient().target(String.format(url, latitude, longitude)).request(); diff --git a/src/main/java/org/traccar/geocoder/MapTilerGeocoder.java b/src/main/java/org/traccar/geocoder/MapTilerGeocoder.java new file mode 100644 index 000000000..6b688a6e8 --- /dev/null +++ b/src/main/java/org/traccar/geocoder/MapTilerGeocoder.java @@ -0,0 +1,73 @@ +/* + * Copyright 2021 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 javax.json.JsonArray; +import javax.json.JsonObject; + +public class MapTilerGeocoder extends JsonGeocoder { + + public MapTilerGeocoder(String key, int cacheSize, AddressFormat addressFormat) { + super("https://api.maptiler.com/geocoding/%2$f,%1$f.json?key=" + key, cacheSize, addressFormat); + } + + @Override + public Address parseAddress(JsonObject json) { + JsonArray features = json.getJsonArray("features"); + + if (!features.isEmpty()) { + Address address = new Address(); + + for (int i = 0; i < features.size(); i++) { + JsonObject feature = features.getJsonObject(i); + String type = feature.getJsonArray("place_type").getString(0); + String value = feature.getString("text"); + switch (type) { + case "street": + address.setStreet(value); + break; + case "city": + address.setSettlement(value); + break; + case "county": + address.setDistrict(value); + break; + case "state": + address.setState(value); + break; + case "country": + address.setCountry(value); + break; + default: + break; + } + if (address.getFormattedAddress() == null) { + address.setFormattedAddress(feature.getString("place_name")); + } + } + + return address; + } + + return null; + } + + @Override + protected String parseError(JsonObject json) { + return null; + } + +} diff --git a/src/test/java/org/traccar/geocoder/GeocoderTest.java b/src/test/java/org/traccar/geocoder/GeocoderTest.java index 5f1748984..380980d2b 100644 --- a/src/test/java/org/traccar/geocoder/GeocoderTest.java +++ b/src/test/java/org/traccar/geocoder/GeocoderTest.java @@ -101,4 +101,13 @@ public class GeocoderTest { String address = geocoder.getAddress(40.733, -73.989, null); assertEquals("120 East 13th Street, New York, New York 10003, United States", address); } + + @Ignore + @Test + public void testMapTiler() { + Geocoder geocoder = new MapTilerGeocoder("mnbnwLErpdspq13f0kC6", 0, new AddressFormat()); + String address = geocoder.getAddress(40.733, -73.989, null); + assertEquals("East 13th Street, New York City, New York, United States", address); + } + } -- cgit v1.2.3