- Combine "getAddress" functions

- Change switches logic

1 files changed, 9 insertions, 6 deletions

diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
index f0d6d40c2..e04f2f90c 100644
--- a/src/org/traccar/reports/ReportUtils.java
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -191,8 +191,9 @@ public final class ReportUtils {
         trip.setStartLon(startTrip.getLongitude());
         trip.setStartTime(startTrip.getFixTime());
         String startAddress = startTrip.getAddress();
-        if (startAddress == null && Context.getConfig().getBoolean("report.retryGeocoding")) {
-            startAddress = Context.getGeocoder().getAddress(startTrip.getLatitude(), startTrip.getLongitude());
+        if (startAddress == null && Context.getGeocoder() != null
+                && Context.getConfig().getBoolean("geocoder.onRequest")) {
+            startAddress = Context.getGeocoder().getAddress(startTrip.getLatitude(), startTrip.getLongitude(), null);
         }
         trip.setStartAddress(startAddress);
 
@@ -201,8 +202,9 @@ public final class ReportUtils {
         trip.setEndLon(endTrip.getLongitude());
         trip.setEndTime(endTrip.getFixTime());
         String endAddress = endTrip.getAddress();
-        if (endAddress == null && Context.getConfig().getBoolean("report.retryGeocoding")) {
-            endAddress = Context.getGeocoder().getAddress(startTrip.getLatitude(), startTrip.getLongitude());
+        if (endAddress == null && Context.getGeocoder() != null
+                && Context.getConfig().getBoolean("geocoder.onRequest")) {
+            endAddress = Context.getGeocoder().getAddress(endTrip.getLatitude(), endTrip.getLongitude(), null);
         }
         trip.setEndAddress(endAddress);
 
@@ -233,8 +235,9 @@ public final class ReportUtils {
         stop.setLongitude(startStop.getLongitude());
         stop.setStartTime(startStop.getFixTime());
         String address = startStop.getAddress();
-        if (address == null && Context.getConfig().getBoolean("report.retryGeocoding")) {
-            address = Context.getGeocoder().getAddress(stop.getLatitude(), stop.getLongitude());
+        if (address == null && Context.getGeocoder() != null
+                && Context.getConfig().getBoolean("geocoder.onRequest")) {
+            address = Context.getGeocoder().getAddress(stop.getLatitude(), stop.getLongitude(), null);
         }
         stop.setAddress(address);