Skip to content

Specify argument source for pointsNotFound #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
igor-suhorukov wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Specify argument source for pointsNotFound #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion core/src/main/java/com/graphhopper/routing/MultiplePointsNotFoundException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,24 @@

public class MultiplePointsNotFoundException extends RuntimeException {

public enum IssueLocation{
ORIGIN,DESTINATION, SIMPLE_ROUTE
}

private final IntArrayList pointsNotFound;

MultiplePointsNotFoundException(IntArrayList pointsNotFound) {
private final IssueLocation issueLocation;

MultiplePointsNotFoundException(IssueLocation issueLocation, IntArrayList pointsNotFound) {
this.issueLocation = issueLocation;
this.pointsNotFound = pointsNotFound;
}

public IntArrayList getPointsNotFound() {
return pointsNotFound;
}

public IssueLocation getIssueLocation() {
return issueLocation;
}
}
9 changes: 6 additions & 3 deletions core/src/main/java/com/graphhopper/routing/ViaRouting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class ViaRouting {

public static MatrixSnapResult lookupMatrix(boolean failFast, EncodedValueLookup lookup, List<GHPoint> points, EdgeFilter snapFilter,
LocationIndex locationIndex, List<String> snapPreventions, List<String> pointHints,
DirectedEdgeFilter directedSnapFilter, List<Double> headings) {
DirectedEdgeFilter directedSnapFilter, List<Double> headings, boolean isOrigins) {
if (points.size() < 1)
throw new IllegalArgumentException("At least 1 point have to be specified, but was:" + points.size());

Expand Down Expand Up @@ -93,7 +93,9 @@ public static MatrixSnapResult lookupMatrix(boolean failFast, EncodedValueLookup
}

if (!pointsNotFound.isEmpty() && failFast)
throw new MultiplePointsNotFoundException(pointsNotFound);
throw new MultiplePointsNotFoundException(isOrigins?
MultiplePointsNotFoundException.IssueLocation.ORIGIN:
MultiplePointsNotFoundException.IssueLocation.DESTINATION, pointsNotFound);

return new MatrixSnapResult(snaps,snapIndexes,pointsNotFound);

Expand Down Expand Up @@ -139,7 +141,8 @@ public static List<Snap> lookup(EncodedValueLookup lookup, List<GHPoint> points,
}

if (!pointsNotFound.isEmpty())
throw new MultiplePointsNotFoundException(pointsNotFound);
throw new MultiplePointsNotFoundException(
MultiplePointsNotFoundException.IssueLocation.SIMPLE_ROUTE, pointsNotFound);

return snaps;
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/graphhopper/routing/matrix/RouterMatrix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ public GHMatrixResponse matrix(GHMatrixRequest request) {
List<String> snapPreventions = new ArrayList<>();

MatrixSnapResult originsResult = ViaRouting.lookupMatrix(request.isFailFast(), encodingManager, request.getOrigins(), solver.createSnapFilter(), locationIndex,
snapPreventions, pointHints, directedEdgeFilter, headings);
snapPreventions, pointHints, directedEdgeFilter, headings, true);
MatrixSnapResult destinationsResult = ViaRouting.lookupMatrix(request.isFailFast(), encodingManager, request.getDestinations(), solver.createSnapFilter(), locationIndex,
snapPreventions, pointHints, directedEdgeFilter, headings);
snapPreventions, pointHints, directedEdgeFilter, headings, false);

List<Snap> allCorrectSnaps = new ArrayList<>(originsResult.snaps);
allCorrectSnaps.addAll(destinationsResult.snaps);
Expand Down