aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-03-23 21:07:56 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2014-03-23 21:07:56 +1300
commit23086613c6e88aa768afa795340fe9ac0ac3a7db (patch)
tree9536d308574a113215a58f3d1d24ec15618ef855 /src
parent35701e0a14782d67320a7c667d7afd980bbc5dd0 (diff)
downloadtraccar-server-23086613c6e88aa768afa795340fe9ac0ac3a7db.tar.gz
traccar-server-23086613c6e88aa768afa795340fe9ac0ac3a7db.tar.bz2
traccar-server-23086613c6e88aa768afa795340fe9ac0ac3a7db.zip
Add Nominatim reverse geocoding (fix #615)
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/ServerManager.java9
-rw-r--r--src/org/traccar/geocode/GoogleReverseGeocoder.java3
-rw-r--r--src/org/traccar/geocode/NominatimReverseGeocoder.java54
3 files changed, 64 insertions, 2 deletions
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 4e5b283d4..1dfe5e3d6 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -36,6 +36,7 @@ import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
import org.jboss.netty.handler.codec.string.StringDecoder;
import org.jboss.netty.handler.codec.string.StringEncoder;
import org.traccar.geocode.GoogleReverseGeocoder;
+import org.traccar.geocode.NominatimReverseGeocoder;
import org.traccar.geocode.ReverseGeocoder;
import org.traccar.helper.Log;
import org.traccar.http.WebServer;
@@ -199,7 +200,13 @@ public class ServerManager {
private void initGeocoder(Properties properties) throws IOException {
if (Boolean.parseBoolean(properties.getProperty("geocoder.enable"))) {
- reverseGeocoder = new GoogleReverseGeocoder();
+ String type = properties.getProperty("geocoder.type");
+ if (type != null && type.equals("nominatim")) {
+ reverseGeocoder = new NominatimReverseGeocoder(
+ getProperties().getProperty("geocoder.url"));
+ } else {
+ reverseGeocoder = new GoogleReverseGeocoder();
+ }
}
}
diff --git a/src/org/traccar/geocode/GoogleReverseGeocoder.java b/src/org/traccar/geocode/GoogleReverseGeocoder.java
index 9aebbf8a0..4ec6e10af 100644
--- a/src/org/traccar/geocode/GoogleReverseGeocoder.java
+++ b/src/org/traccar/geocode/GoogleReverseGeocoder.java
@@ -16,6 +16,7 @@
package org.traccar.geocode;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
@@ -49,7 +50,7 @@ public class GoogleReverseGeocoder implements ReverseGeocoder {
reader.close();
- } catch(Exception error) {
+ } catch(IOException error) {
Log.warning(error);
}
diff --git a/src/org/traccar/geocode/NominatimReverseGeocoder.java b/src/org/traccar/geocode/NominatimReverseGeocoder.java
new file mode 100644
index 000000000..c9393da42
--- /dev/null
+++ b/src/org/traccar/geocode/NominatimReverseGeocoder.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 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 java.net.URL;
+import java.net.URLConnection;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.traccar.helper.Log;
+import org.w3c.dom.Document;
+
+public class NominatimReverseGeocoder implements ReverseGeocoder {
+
+ private final String url;
+
+ public NominatimReverseGeocoder(String url) {
+ this.url = url + "?format=xml&lat=%f&lon=%f&zoom=18&addressdetails=0";
+ }
+
+ @Override
+ public String getAddress(double latitude, double longitude) {
+
+ try {
+
+ URLConnection conn = new URL(String.format(url, latitude, longitude)).openConnection();
+
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ Document doc = builder.parse(conn.getInputStream());
+
+ return doc.getFirstChild().getLastChild().getFirstChild().getNodeValue();
+
+ } catch(Exception error) {
+ Log.warning(error);
+ }
+
+ return null;
+ }
+
+}