Skip to content

Commit

Permalink
fix(fastisochrones): use correct edge filter fast-isochrones snapping
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelsJP committed Oct 17, 2023
1 parent 79f3e8c commit f4d9909
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ RELEASING:
- various style and low level code problems ([#1489](https://github.com/GIScience/openrouteservice/pull/1489))
- Fix the max visited nodes bug for fast-isochrones ([#1538](https://github.com/GIScience/openrouteservice/pull/1538))
- fix isochrones snapping ([#1568](https://github.com/GIScience/openrouteservice/pull/1568))
- fix fast-isochrones snapping ([#1570](https://github.com/GIScience/openrouteservice/pull/1570))

## [7.1.0] - 2023-06-13
### Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@
import com.carrotsearch.hppc.IntHashSet;
import com.carrotsearch.hppc.IntObjectMap;
import com.carrotsearch.hppc.cursors.IntObjectCursor;
import com.graphhopper.GraphHopper;
import com.graphhopper.coll.GHIntObjectHashMap;
import com.graphhopper.routing.SPTEntry;
import com.graphhopper.routing.ev.Subnetwork;
import com.graphhopper.routing.querygraph.QueryGraph;
import com.graphhopper.routing.util.EdgeFilter;
import com.graphhopper.routing.util.HikeFlagEncoder;
import com.graphhopper.routing.util.TraversalMode;
import com.graphhopper.routing.util.*;
import com.graphhopper.routing.weighting.Weighting;
import com.graphhopper.storage.Graph;
import com.graphhopper.storage.GraphHopperStorage;
import com.graphhopper.storage.index.Snap;
import com.graphhopper.util.*;
import com.graphhopper.util.shapes.GHPoint3D;
import org.heigit.ors.util.ProfileTools;
import org.locationtech.jts.geom.*;
import org.locationtech.jts.index.quadtree.Quadtree;
import org.locationtech.jts.operation.union.UnaryUnionOp;
Expand Down Expand Up @@ -135,8 +136,15 @@ public IsochroneMap compute(IsochroneSearchParameters parameters) throws Excepti
Weighting weighting = ORSWeightingFactory.createIsochroneWeighting(searchcontext, parameters.getRangeType());

Coordinate loc = parameters.getLocation();

FlagEncoder encoder = searchcontext.getEncoder();
String profileName = ProfileTools.makeProfileName(encoder.toString(), weighting.getName(), false);
GraphHopper gh = searchcontext.getGraphHopper();
GraphHopperStorage graphHopperStorage = gh.getGraphHopperStorage();
EdgeFilter defaultSnapFilter = new DefaultSnapFilter(weighting, graphHopperStorage.getEncodingManager().getBooleanEncodedValue(Subnetwork.key(profileName)));

ORSEdgeFilterFactory edgeFilterFactory = new ORSEdgeFilterFactory();
EdgeFilterSequence edgeFilterSequence = getEdgeFilterSequence(edgeFilterFactory);
EdgeFilterSequence edgeFilterSequence = getEdgeFilterSequence(edgeFilterFactory, defaultSnapFilter);
Snap res = searchcontext.getGraphHopper().getLocationIndex().findClosest(loc.y, loc.x, edgeFilterSequence);
List<Snap> snaps = new ArrayList<>(1);
snaps.add(res);
Expand Down Expand Up @@ -255,9 +263,9 @@ public IsochroneMap compute(IsochroneSearchParameters parameters) throws Excepti
return isochroneMap;
}

private EdgeFilterSequence getEdgeFilterSequence(ORSEdgeFilterFactory edgeFilterFactory) throws Exception {
private EdgeFilterSequence getEdgeFilterSequence(ORSEdgeFilterFactory edgeFilterFactory, EdgeFilter prependFilter) throws Exception {
EdgeFilterSequence edgeFilterSequence = new EdgeFilterSequence();
EdgeFilter edgeFilter = edgeFilterFactory.createEdgeFilter(searchcontext.getProperties(), searchcontext.getEncoder(), searchcontext.getGraphHopper().getGraphHopperStorage());
EdgeFilter edgeFilter = edgeFilterFactory.createEdgeFilter(searchcontext.getProperties(), searchcontext.getEncoder(), searchcontext.getGraphHopper().getGraphHopperStorage(), prependFilter);
edgeFilterSequence.add(edgeFilter);
edgeFilterSequence.add(new AvoidFeaturesEdgeFilter(AvoidFeatureFlags.FERRIES, searchcontext.getGraphHopper().getGraphHopperStorage()));
return edgeFilterSequence;
Expand Down

0 comments on commit f4d9909

Please sign in to comment.