Skip to content

Commit ec8ad6a

Browse files
committed
chore: clean up (remove deprecated WheelchairGraphStorageBuilder)
1 parent 3d93373 commit ec8ad6a

18 files changed

Lines changed: 4 additions & 2094 deletions

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/core/CorePreparationHandler.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ private EdgeFilter createCoreEdgeFilter(CHConfig chProfile, GraphHopperStorage g
106106
edgeFilterSequence.add(new AvoidBordersCoreEdgeFilter(gs));
107107
}
108108

109-
if (routingProfileCategory == RoutingProfileCategory.WHEELCHAIR) {
110-
edgeFilterSequence.add(new WheelchairCoreEdgeFilter(gs));
111-
}
112-
113109
/* Maximum speed & turn restrictions */
114110
if ((routingProfileCategory & RoutingProfileCategory.DRIVING) != 0) {
115111
String[] encoders = {FlagEncoderNames.CAR_ORS, FlagEncoderNames.HEAVYVEHICLE};

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/edgefilters/WheelchairEdgeFilter.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,21 @@
1313
*/
1414
package org.heigit.ors.routing.graphhopper.extensions.edgefilters;
1515

16-
import com.graphhopper.routing.ev.*;
1716
import com.graphhopper.routing.util.EdgeFilter;
18-
import com.graphhopper.routing.util.EncodingManager;
1917
import com.graphhopper.storage.GraphHopperStorage;
2018
import com.graphhopper.util.EdgeIteratorState;
2119
import org.apache.log4j.Logger;
2220
import org.heigit.ors.routing.graphhopper.extensions.WheelchairAttributes;
2321
import org.heigit.ors.routing.graphhopper.extensions.util.WheelchairAttributesEncodedValues;
2422
import org.heigit.ors.routing.parameters.WheelchairParameters;
2523

26-
import java.util.List;
27-
2824
public class WheelchairEdgeFilter implements EdgeFilter {
2925
private static final Logger LOGGER = Logger.getLogger(WheelchairEdgeFilter.class.getName());
3026
private final WheelchairAttributesEncodedValues encodedValues;
3127
private WheelchairAttributes attributes;
3228
private WheelchairParameters params;
33-
private WheelchairEdgeFilterOld oldFilter;
3429

3530
public WheelchairEdgeFilter(WheelchairParameters params, GraphHopperStorage graphStorage) throws Exception {
36-
oldFilter = new WheelchairEdgeFilterOld(params, graphStorage);
3731
encodedValues = new WheelchairAttributesEncodedValues(graphStorage.getEncodingManager());
3832
this.params = params;
3933
if (this.params == null) {
@@ -44,11 +38,10 @@ public WheelchairEdgeFilter(WheelchairParameters params, GraphHopperStorage grap
4438

4539
@Override
4640
public boolean accept(EdgeIteratorState iter) {
47-
boolean oldValue = oldFilter.accept(iter);
4841
attributes = encodedValues.getAttributes(iter.getFlags());
4942

5043
LOGGER.debug("edge: " + iter + (attributes.hasValues() ? " suitable: " + attributes.isSuitable() + " surfaceQualityKnown: " + attributes.isSurfaceQualityKnown() : " no wheelchair attributes"));
51-
boolean newValue = !attributes.hasValues() || !(
44+
return !attributes.hasValues() || !(
5245
checkSurfaceType()
5346
|| checkSmoothnessType()
5447
|| checkTrackType()
@@ -58,10 +51,6 @@ public boolean accept(EdgeIteratorState iter) {
5851
|| checkSurfaceQualityKnown()
5952
|| checkUnsuitable()
6053
);
61-
if (oldValue != newValue) {
62-
LOGGER.warn(attributes.difference(this.oldFilter.attributes));
63-
}
64-
return newValue;
6554
}
6655

6756
private boolean checkSurfaceType() {

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/edgefilters/WheelchairEdgeFilterOld.java

Lines changed: 0 additions & 98 deletions
This file was deleted.

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/edgefilters/core/WheelchairCoreEdgeFilter.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)