diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-14 15:15:31 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-14 15:15:31 +1200 |
| commit | 7310ee5f15729ea8517bfb6b0890a46da1217610 (patch) | |
| tree | 44504738f127708420179a7dbbe2942cb67d0849 /src/org/traccar/Context.java | |
| parent | 8e8da7019aab023ae255d0ed6d16b94d303fd468 (diff) | |
| parent | 0a6faa86c4b634fa3a94633506c4422623e36f1e (diff) | |
| download | trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.tar.gz trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.tar.bz2 trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.zip | |
Merge Java 7 update (fix #1273)
Diffstat (limited to 'src/org/traccar/Context.java')
| -rw-r--r-- | src/org/traccar/Context.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index 0b74eacd0..707e6edb6 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -103,14 +103,18 @@ public class Context { } if (config.getBoolean("geocoder.enable")) { - String type = config.getString("geocoder.type"); + String type = config.getString("geocoder.type", "google"); String url = config.getString("geocoder.url"); - if (type != null && type.equals("nominatim")) { - reverseGeocoder = new NominatimReverseGeocoder(url); - } else if (type != null && type.equals("gisgraphy")) { - reverseGeocoder = new GisgraphyReverseGeocoder(url); - } else { - reverseGeocoder = new GoogleReverseGeocoder(); + switch (type) { + case "google": + reverseGeocoder = new GoogleReverseGeocoder(); + break; + case "nominatim": + reverseGeocoder = new NominatimReverseGeocoder(url); + break; + case "gisgraphy": + reverseGeocoder = new GisgraphyReverseGeocoder(url); + break; } } |