From 953852e6e984f8a639cf1a5ac4116fff755d538a Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Thu, 7 May 2015 15:39:42 +1200
Subject: Add Gisgraphy reverse geocoder

---
 .../traccar/geocode/GoogleReverseGeocoderTest.java | 19 -----------
 .../geocode/NominatimReverseGeocoderTest.java      | 19 -----------
 test/org/traccar/geocode/ReverseGeocoderTest.java  | 38 ++++++++++++++++++++++
 3 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 test/org/traccar/geocode/GoogleReverseGeocoderTest.java
 delete mode 100644 test/org/traccar/geocode/NominatimReverseGeocoderTest.java
 create mode 100644 test/org/traccar/geocode/ReverseGeocoderTest.java

(limited to 'test/org/traccar/geocode')

diff --git a/test/org/traccar/geocode/GoogleReverseGeocoderTest.java b/test/org/traccar/geocode/GoogleReverseGeocoderTest.java
deleted file mode 100644
index de1e182cc..000000000
--- a/test/org/traccar/geocode/GoogleReverseGeocoderTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.traccar.geocode;
-
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-
-public class GoogleReverseGeocoderTest {
-
-    @Test
-    public void testGetAddress() {
-
-        ReverseGeocoder reverseGeocoder = new GoogleReverseGeocoder();
-        
-        /*assertEquals(
-                "ulitsa Morskiye dubki, 2, Lisy Nos, Saint Petersburg, Russia, 197755",
-                reverseGeocoder.getAddress(60.0, 30.0));*/
-
-    }
-
-}
diff --git a/test/org/traccar/geocode/NominatimReverseGeocoderTest.java b/test/org/traccar/geocode/NominatimReverseGeocoderTest.java
deleted file mode 100644
index 74e03f271..000000000
--- a/test/org/traccar/geocode/NominatimReverseGeocoderTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.traccar.geocode;
-
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-
-public class NominatimReverseGeocoderTest {
-
-    @Test
-    public void testGetAddress() {
-
-        ReverseGeocoder reverseGeocoder = new NominatimReverseGeocoder("http://nominatim.openstreetmap.org/reverse");
-        
-        /*assertEquals(
-                "ulitsa Morskiye dubki, 2, Lisy Nos, Saint Petersburg, Russia, 197755",
-                reverseGeocoder.getAddress(60.0, 30.0));*/
-
-    }
-
-}
diff --git a/test/org/traccar/geocode/ReverseGeocoderTest.java b/test/org/traccar/geocode/ReverseGeocoderTest.java
new file mode 100644
index 000000000..6f244b545
--- /dev/null
+++ b/test/org/traccar/geocode/ReverseGeocoderTest.java
@@ -0,0 +1,38 @@
+package org.traccar.geocode;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class ReverseGeocoderTest {
+
+    /*@Test
+    public void testGoogle() {
+
+        ReverseGeocoder reverseGeocoder = new GoogleReverseGeocoder();
+
+        assertEquals(
+                "1700 Charleston Rd, Mountain View, CA, US",
+                reverseGeocoder.getAddress(new AddressFormat(), 37.4217550, -122.0846330));
+    }
+
+    @Test
+    public void testNominatim() {
+
+        ReverseGeocoder reverseGeocoder = new NominatimReverseGeocoder();
+
+        assertEquals(
+                "35 West 9th Street, NYC, New York, US",
+                reverseGeocoder.getAddress(new AddressFormat(), 40.7337807, -73.9974401));
+    }
+
+    @Test
+    public void testGisgraphy() {
+
+        ReverseGeocoder reverseGeocoder = new GisgraphyReverseGeocoder();
+
+        assertEquals(
+                "Rue du Jardinet, Paris, FR",
+                reverseGeocoder.getAddress(new AddressFormat(), 48.8530000, 2.3400000));
+    }*/
+
+}
-- 
cgit v1.2.3