diff options
| author | jcardus <joaquim.cardeira@gmail.com> | 2020-03-25 17:25:19 +0000 |
|---|---|---|
| committer | jcardus <joaquim.cardeira@gmail.com> | 2020-03-25 17:25:19 +0000 |
| commit | feac85bad4004fb3e316a88285626e12840398d2 (patch) | |
| tree | d268a79d63b9d1f27b6e433fedc90de7b427b172 /src/main/java/org/traccar/geocoder/FactualGeocoder.java | |
| parent | 7b669e3181f637f06b31b55bd930584c7b08e897 (diff) | |
| parent | f3d465abe7f255ec44e976caade642e4c2fd7598 (diff) | |
| download | trackermap-server-feac85bad4004fb3e316a88285626e12840398d2.tar.gz trackermap-server-feac85bad4004fb3e316a88285626e12840398d2.tar.bz2 trackermap-server-feac85bad4004fb3e316a88285626e12840398d2.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/java/org/traccar/geocoder/FactualGeocoder.java')
| -rw-r--r-- | src/main/java/org/traccar/geocoder/FactualGeocoder.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/geocoder/FactualGeocoder.java b/src/main/java/org/traccar/geocoder/FactualGeocoder.java index c7a68c293..f540eb8fe 100644 --- a/src/main/java/org/traccar/geocoder/FactualGeocoder.java +++ b/src/main/java/org/traccar/geocoder/FactualGeocoder.java @@ -1,6 +1,6 @@ /* * Copyright 2014 - 2015 Stefaan Van Dooren (stefaan.vandooren@gmail.com) - * Copyright 2017 Anton Tananaev (anton@traccar.org) + * Copyright 2017 - 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. @@ -20,8 +20,16 @@ import javax.json.JsonObject; public class FactualGeocoder extends JsonGeocoder { + private static String formatUrl(String url, String key) { + if (url == null) { + url = "https://api.factual.com/geotag"; + } + url += "?latitude=%f&longitude=%f&KEY=" + key; + return url; + } + public FactualGeocoder(String url, String key, int cacheSize, AddressFormat addressFormat) { - super(url + "?latitude=%f&longitude=%f&KEY=" + key, cacheSize, addressFormat); + super(formatUrl(url, key), cacheSize, addressFormat); } @Override |