refactor: use common min/max factors and abstract repetitive code to a method

Author: aoles

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/weighting/LimitedAccessWeighting.java

@@ -27,24 +27,20 @@
  * @author Andrzej Oles
  */
 public class LimitedAccessWeighting extends AbstractAdjustedWeighting {
+    public static final double MIN_FACTOR = 1;// ensure that we do not need to change getMinWeight, i.e. road_access_factor >= 1
+    public static final double MAX_FACTOR = 10;
     public static final double DEFAULT_DESTINATION_FACTOR = 1;
     public static final double VEHICLE_DESTINATION_FACTOR = 10;
     public static final double DEFAULT_PRIVATE_FACTOR = 1.2;
     public static final double VEHICLE_PRIVATE_FACTOR = 10;
     public static final double DEFAULT_CUSTOMERS_FACTOR = 1.2;
     public static final double VEHICLE_CUSTOMERS_FACTOR = 1.5;
 
-    static double MIN_DESTINATION_FACTOR = 1;
-    static double MAX_DESTINATION_FACTOR = 10;
-    static double MIN_PRIVATE_FACTOR = 1;
-    static double MAX_PRIVATE_FACTOR = 10;
-    static double MIN_CUSTOMERS_FACTOR = 1;
-    static double MAX_CUSTOMERS_FACTOR = 10;
-
     private final EnumEncodedValue<RoadAccess> roadAccessEnc;
     // this factor puts a penalty on roads with a "destination"-only or private access, see GH#733 and GH#1936
     private final double destinationPenalty;
     private final double privatePenalty;
+    // this factor puts a penalty on roads with a "customers"-only access, see ORS#1981
     private final double customersPenalty;
 
     public LimitedAccessWeighting(Weighting superWeighting, PMap map) {
@@ -53,16 +49,18 @@ public LimitedAccessWeighting(Weighting superWeighting, PMap map) {
         if (!encoder.hasEncodedValue(RoadAccess.KEY))
             throw new IllegalArgumentException("road_access is not available");
 
-        // ensure that we do not need to change getMinWeight, i.e. road_access_factor >= 1
-        double defaultDestinationFactor = encoder.getTransportationMode().isMotorVehicle() ? VEHICLE_DESTINATION_FACTOR : DEFAULT_DESTINATION_FACTOR;
-        destinationPenalty = checkBounds("road_access_destination_factor", map.getDouble("road_access_destination_factor", defaultDestinationFactor), MIN_DESTINATION_FACTOR, MAX_DESTINATION_FACTOR);
-        double defaultPrivateFactor = encoder.getTransportationMode().isMotorVehicle() ? VEHICLE_PRIVATE_FACTOR : DEFAULT_PRIVATE_FACTOR;
-        privatePenalty = checkBounds("road_access_private_factor", map.getDouble("road_access_private_factor", defaultPrivateFactor), MIN_PRIVATE_FACTOR, MAX_PRIVATE_FACTOR);
-        double defaultCustomersFactor = encoder.getTransportationMode().isMotorVehicle() ? VEHICLE_CUSTOMERS_FACTOR : DEFAULT_CUSTOMERS_FACTOR;
-        customersPenalty = checkBounds("road_access_customers_factor", map.getDouble("road_access_customers_factor", defaultCustomersFactor), MIN_CUSTOMERS_FACTOR, MAX_CUSTOMERS_FACTOR);
+        destinationPenalty = getFactorValue(encoder, map, "road_access_destination_factor", DEFAULT_DESTINATION_FACTOR, VEHICLE_DESTINATION_FACTOR);
+        privatePenalty = getFactorValue(encoder, map, "road_access_private_factor", DEFAULT_PRIVATE_FACTOR, VEHICLE_PRIVATE_FACTOR);
+        customersPenalty = getFactorValue(encoder, map, "road_access_customers_factor", DEFAULT_CUSTOMERS_FACTOR, VEHICLE_CUSTOMERS_FACTOR);
+
         roadAccessEnc = destinationPenalty > 1 || privatePenalty > 1 || customersPenalty > 1 ? encoder.getEnumEncodedValue(RoadAccess.KEY, RoadAccess.class) : null;
     }
 
+    static double getFactorValue(FlagEncoder encoder, PMap map, String key, double defaultFactor, double vehicleFactor) {
+        double defaultValue = encoder.getTransportationMode().isMotorVehicle() ? vehicleFactor : defaultFactor;
+        return checkBounds(key, map.getDouble(key, defaultValue), MIN_FACTOR, MAX_FACTOR);
+    }
+
     static double checkBounds(String key, double val, double from, double to) {
         if (val < from || val > to)
             throw new IllegalArgumentException(key + " has invalid range should be within [" + from + ", " + to + "]");