Move getMinWeight into AbstractAdjustedWeighting

graphhopper · Dec 31, 2019 · 210cddd · 210cddd
1 parent 03dd6d4
commit 210cddd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/weighting/AbstractAdjustedWeighting.java b/core/src/main/java/com/graphhopper/routing/weighting/AbstractAdjustedWeighting.java
@@ -35,6 +35,11 @@ public AbstractAdjustedWeighting(Weighting superWeighting) {
         this.superWeighting = superWeighting;
     }
 
+    @Override
+    public double getMinWeight(double distance) {
+        return superWeighting.getMinWeight(distance);
+    }
+
     @Override
     public long calcMillis(EdgeIteratorState edgeState, boolean reverse, int prevOrNextEdgeId) {
         return superWeighting.calcMillis(edgeState, reverse, prevOrNextEdgeId);

diff --git a/core/src/main/java/com/graphhopper/routing/weighting/AvoidEdgesWeighting.java b/core/src/main/java/com/graphhopper/routing/weighting/AvoidEdgesWeighting.java
@@ -53,11 +53,6 @@ public void addEdges(Collection<EdgeIteratorState> edges) {
         }
     }
 
-    @Override
-    public double getMinWeight(double distance) {
-        return superWeighting.getMinWeight(distance);
-    }
-
     @Override
     public double calcWeight(EdgeIteratorState edgeState, boolean reverse, int prevOrNextEdgeId) {
         double weight = superWeighting.calcWeight(edgeState, reverse, prevOrNextEdgeId);

diff --git a/core/src/main/java/com/graphhopper/routing/weighting/BlockAreaWeighting.java b/core/src/main/java/com/graphhopper/routing/weighting/BlockAreaWeighting.java
@@ -15,11 +15,6 @@ public BlockAreaWeighting(Weighting superWeighting, GraphEdgeIdFinder.BlockArea
         this.blockArea = blockArea;
     }
 
-    @Override
-    public double getMinWeight(double distance) {
-        return superWeighting.getMinWeight(distance);
-    }
-
     @Override
     public double calcWeight(EdgeIteratorState edgeState, boolean reverse, int prevOrNextEdgeId) {
         if (blockArea.contains(edgeState))