Merge remote-tracking branch 'origin/master'

1 files changed, 8 insertions, 4 deletions

diff --git a/src/main/java/org/traccar/geocoder/GisgraphyGeocoder.java b/src/main/java/org/traccar/geocoder/GisgraphyGeocoder.java
index 3a173f985..b4881a006 100644
--- a/src/main/java/org/traccar/geocoder/GisgraphyGeocoder.java
+++ b/src/main/java/org/traccar/geocoder/GisgraphyGeocoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2020 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.
@@ -19,12 +19,16 @@ import javax.json.JsonObject;
 
 public class GisgraphyGeocoder extends JsonGeocoder {
 
-    public GisgraphyGeocoder(AddressFormat addressFormat) {
-        this("http://services.gisgraphy.com/reversegeocoding/search", 0, addressFormat);
+    private static String formatUrl(String url) {
+        if (url == null) {
+            url = "http://services.gisgraphy.com/reversegeocoding/search";
+        }
+        url += "?format=json&lat=%f&lng=%f&from=1&to=1";
+        return url;
     }
 
     public GisgraphyGeocoder(String url, int cacheSize, AddressFormat addressFormat) {
-        super(url + "?format=json&lat=%f&lng=%f&from=1&to=1", cacheSize, addressFormat);
+        super(formatUrl(url), cacheSize, addressFormat);
     }
 
     @Override