aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/org/traccar/Context.java7
-rw-r--r--src/org/traccar/geocode/GeocodeFarmReverseGeocoder.java59
-rw-r--r--test/org/traccar/geocode/ReverseGeocoderTest.java14
-rw-r--r--test/org/traccar/protocol/AquilaProtocolDecoderTest.java8
-rw-r--r--test/org/traccar/protocol/Gps103ProtocolDecoderTest.java6
5 files changed, 92 insertions, 2 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index b37e87331..ebe700221 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -24,6 +24,7 @@ import org.traccar.database.PermissionsManager;
import org.traccar.database.GeofenceManager;
import org.traccar.geocode.BingMapsReverseGeocoder;
import org.traccar.geocode.FactualReverseGeocoder;
+import org.traccar.geocode.GeocodeFarmReverseGeocoder;
import org.traccar.geocode.GisgraphyReverseGeocoder;
import org.traccar.geocode.GoogleReverseGeocoder;
import org.traccar.geocode.MapQuestReverseGeocoder;
@@ -161,6 +162,12 @@ public final class Context {
case "factual":
reverseGeocoder = new FactualReverseGeocoder(url, key, cacheSize);
break;
+ case "geocodefarm":
+ if (key != null) {
+ reverseGeocoder = new GeocodeFarmReverseGeocoder(key, cacheSize);
+ } else {
+ reverseGeocoder = new GeocodeFarmReverseGeocoder(cacheSize);
+ }
default:
if (key != null) {
reverseGeocoder = new GoogleReverseGeocoder(key, cacheSize);
diff --git a/src/org/traccar/geocode/GeocodeFarmReverseGeocoder.java b/src/org/traccar/geocode/GeocodeFarmReverseGeocoder.java
new file mode 100644
index 000000000..e100d3081
--- /dev/null
+++ b/src/org/traccar/geocode/GeocodeFarmReverseGeocoder.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * 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.geocode;
+
+import javax.json.JsonObject;
+
+public class GeocodeFarmReverseGeocoder extends JsonReverseGeocoder {
+
+ public GeocodeFarmReverseGeocoder(int cacheSize) {
+ super("https://www.geocode.farm/v3/json/reverse/?lat=%f&lon=%f&country=us&lang=en&count=1", cacheSize);
+ }
+
+ public GeocodeFarmReverseGeocoder(String key, int cacheSize) {
+ super("https://www.geocode.farm/v3/json/reverse/?lat=%f&lon=%f&country=us&lang=en&count=1&key=" + key, cacheSize);
+ }
+
+ @Override
+ public Address parseAddress(JsonObject json) {
+ Address address = new Address();
+
+ JsonObject result = json
+ .getJsonObject("geocoding_results")
+ .getJsonArray("RESULTS")
+ .getJsonObject(0)
+ .getJsonObject("ADDRESS");
+
+ if (result.containsKey("street_number")) {
+ address.setStreet(result.getString("street_number"));
+ }
+ if (result.containsKey("street_name")) {
+ address.setStreet(result.getString("street_name"));
+ }
+ if (result.containsKey("locality")) {
+ address.setSettlement(result.getString("locality"));
+ }
+ if (result.containsKey("admin_1")) {
+ address.setState(result.getString("admin_1"));
+ }
+ if (result.containsKey("country")) {
+ address.setCountry(result.getString("country"));
+ }
+
+ return address;
+ }
+
+}
diff --git a/test/org/traccar/geocode/ReverseGeocoderTest.java b/test/org/traccar/geocode/ReverseGeocoderTest.java
index ada0afbbe..2b0c30779 100644
--- a/test/org/traccar/geocode/ReverseGeocoderTest.java
+++ b/test/org/traccar/geocode/ReverseGeocoderTest.java
@@ -10,7 +10,7 @@ public class ReverseGeocoderTest {
@Test
public void test() throws InterruptedException {
if (enable) {
- testGoogle();
+ testGeocodeFarm();
}
}
@@ -79,4 +79,16 @@ public class ReverseGeocoderTest {
Assert.assertEquals("Charleston Road, California, US", waitAddress());
}
+ public void testGeocodeFarm() throws InterruptedException {
+ ReverseGeocoder reverseGeocoder = new GeocodeFarmReverseGeocoder(0);
+
+ reverseGeocoder.getAddress(new AddressFormat(), 34.116302, -118.051519, new ReverseGeocoder.ReverseGeocoderCallback() {
+ @Override
+ public void onResult(String address) {
+ setAddress(address);
+ }
+ });
+ Assert.assertEquals("Estrella Avenue, Arcadia, California, United States", waitAddress());
+ }
+
}
diff --git a/test/org/traccar/protocol/AquilaProtocolDecoderTest.java b/test/org/traccar/protocol/AquilaProtocolDecoderTest.java
index ed6e5d725..a62e20e1e 100644
--- a/test/org/traccar/protocol/AquilaProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AquilaProtocolDecoderTest.java
@@ -9,7 +9,13 @@ public class AquilaProtocolDecoderTest extends ProtocolTest {
public void testDecode() throws Exception {
AquilaProtocolDecoder decoder = new AquilaProtocolDecoder(new AquilaProtocol());
-
+
+ verifyPosition(decoder, text(
+ "$$CLIENT_1DT,151028368,1,19.108438,72.925308,160628154920,A,22,0,0,131,3503,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,*1D"));
+
+ verifyNothing(decoder, text(
+ "$$CLIENT_1DT,160319372,1,28.549541,77.249802,160628140743,A,23,0,-65025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,*0D"));
+
verifyPosition(decoder, text(
"$$SRINI_1MS,141214807,1,12.963515,77.533844,150925161628,A,27,0,8,0,68,0,0,0,0,0,0,0,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,*43"));
diff --git a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
index eb71b3034..72b0be1b5 100644
--- a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
@@ -11,6 +11,12 @@ public class Gps103ProtocolDecoderTest extends ProtocolTest {
Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(new Gps103Protocol());
verifyAttributes(decoder, text(
+ "imei:359710049090138,OBD,160629022949,51442,0.00,15.88,5632,122,40.39%,95,0.00%,2101,13.80,,,,;"));
+
+ verifyPosition(decoder, text(
+ "imei:359710049090138,tracker,160629022948,,F,182949.000,A,4043.8839,N,11328.8029,W,65.26,271.82,,1,0,31.37%,51442,;"));
+
+ verifyAttributes(decoder, text(
"imei:359710049042014,001,160615040011,,F,040011.000,A,2833.0957,N,07711.9465,E,0.01,215.33,,0,,,,;"));
verifyAttributes(decoder, text(
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-29 16:34:24 +0000