Skip to content

Commit fb4dffa

Browse files
committed
renamed variables, see graphhopper#1844 (comment)
1 parent dc3b5e6 commit fb4dffa

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

core/src/main/java/com/graphhopper/routing/InstructionsOutgoingEdges.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ class InstructionsOutgoingEdges {
5858
private final EdgeIteratorState prevEdge;
5959
private final EdgeIteratorState currentEdge;
6060
// Outgoing edges that we would be allowed to turn on
61-
private final List<EdgeIteratorState> allowedOutgoingEdges;
61+
private final List<EdgeIteratorState> filteredOutgoingEdges;
6262
// All outgoing edges, including oneways in the wrong direction
63-
private final List<EdgeIteratorState> allOutgoingEdges;
63+
private final List<EdgeIteratorState> filteredEdges;
6464
private final DecimalEncodedValue maxSpeedEnc;
6565
private final DecimalEncodedValue avgSpeedEnc;
6666
private final NodeAccess nodeAccess;
@@ -83,15 +83,15 @@ public InstructionsOutgoingEdges(EdgeIteratorState prevEdge,
8383

8484
EdgeIteratorState tmpEdge;
8585

86-
allOutgoingEdges = new ArrayList<>();
87-
allowedOutgoingEdges = new ArrayList<>();
86+
filteredEdges = new ArrayList<>();
87+
filteredOutgoingEdges = new ArrayList<>();
8888
EdgeIterator edgeIter = crossingExplorer.setBaseNode(baseNode);
8989
while (edgeIter.next()) {
9090
if (edgeIter.getAdjNode() != prevNode && edgeIter.getAdjNode() != adjNode) {
9191
tmpEdge = edgeIter.detach(false);
92-
allOutgoingEdges.add(tmpEdge);
92+
filteredEdges.add(tmpEdge);
9393
if (tmpEdge.get(accessEnc)) {
94-
allowedOutgoingEdges.add(tmpEdge);
94+
filteredOutgoingEdges.add(tmpEdge);
9595
}
9696
}
9797
}
@@ -102,15 +102,15 @@ public InstructionsOutgoingEdges(EdgeIteratorState prevEdge,
102102
* roads one might take at the intersection. This excludes the road you are coming from and inaccessible roads.
103103
*/
104104
public int nrOfAllowedOutgoingEdges() {
105-
return 1 + allowedOutgoingEdges.size();
105+
return 1 + filteredOutgoingEdges.size();
106106
}
107107

108108
/**
109109
* This method calculates the number of all outgoing edges, which could be considered the number of roads you see
110110
* at the intersection. This excludes the road your are coming from.
111111
*/
112112
public int nrOfAllOutgoingEdges() {
113-
return 1 + allOutgoingEdges.size();
113+
return 1 + filteredEdges.size();
114114
}
115115

116116

@@ -129,7 +129,7 @@ public boolean outgoingEdgesAreSlowerByFactor(double factor) {
129129

130130
double maxSurroundingSpeed = -1;
131131

132-
for (EdgeIteratorState edge : allOutgoingEdges) {
132+
for (EdgeIteratorState edge : filteredEdges) {
133133
tmpSpeed = getSpeed(edge);
134134
if (tmpSpeed < 1) {
135135
// This might happen for the DataFlagEncoder, might create unnecessary turn instructions
@@ -162,7 +162,7 @@ private double getSpeed(EdgeIteratorState edge) {
162162
*/
163163
public EdgeIteratorState getOtherContinue(double prevLat, double prevLon, double prevOrientation) {
164164
int tmpSign;
165-
for (EdgeIteratorState edge : allowedOutgoingEdges) {
165+
for (EdgeIteratorState edge : filteredOutgoingEdges) {
166166
GHPoint point = InstructionsHelper.getPointForOrientationCalculation(edge, nodeAccess);
167167
tmpSign = InstructionsHelper.calculateSign(prevLat, prevLon, point.getLat(), point.getLon(), prevOrientation);
168168
if (Math.abs(tmpSign) <= 1) {
@@ -184,7 +184,7 @@ public boolean isLeavingCurrentStreet(String prevName, String name) {
184184

185185
// If flags are changing, there might be a chance we find these flags on a different edge
186186
boolean checkFlag = currentEdge.getFlags() != prevEdge.getFlags();
187-
for (EdgeIteratorState edge : allowedOutgoingEdges) {
187+
for (EdgeIteratorState edge : filteredOutgoingEdges) {
188188
String edgeName = edge.getName();
189189
IntsRef edgeFlag = edge.getFlags();
190190
// leave the current street || enter a different street

0 commit comments

Comments
 (0)