24
24
import com .graphhopper .routing .weighting .ShortestWeighting ;
25
25
import com .graphhopper .storage .*;
26
26
import com .graphhopper .util .*;
27
- import org .junit .Ignore ;
28
27
import org .junit .Test ;
29
28
30
29
import java .util .*;
@@ -55,8 +54,7 @@ public void testFound() {
55
54
g .close ();
56
55
}
57
56
58
- // TODO fix
59
- @ Ignore
57
+ @ Test
60
58
public void testWayList () {
61
59
GraphHopperStorage g = new GraphBuilder (carManager ).create ();
62
60
NodeAccess na = g .getNodeAccess ();
@@ -95,6 +93,9 @@ public void testWayList() {
95
93
96
94
// force minor change for instructions
97
95
edge2 .setName ("2" );
96
+ na .setNode (3 , 1.0 , 1.0 );
97
+ EdgeIteratorState edge3 = g .edge (1 , 3 ).setDistance (1000 ).setFlags (encoder .setProperties (10 , true , true ));
98
+
98
99
path = new Path (g , new FastestWeighting (encoder ));
99
100
e1 = new SPTEntry (edge2 .getEdge (), 2 , 1 );
100
101
e1 .parent = new SPTEntry (edge1 .getEdge (), 1 , 1 );
@@ -145,8 +146,7 @@ public void testWayList() {
145
146
assertEquals (path .calcPoints ().size () - 1 , lastIndex );
146
147
}
147
148
148
- // TODO
149
- @ Ignore
149
+ @ Test
150
150
public void testFindInstruction () {
151
151
Graph g = new GraphBuilder (carManager ).create ();
152
152
NodeAccess na = g .getNodeAccess ();
@@ -155,6 +155,8 @@ public void testFindInstruction() {
155
155
na .setNode (2 , 5.0 , 0.5 );
156
156
na .setNode (3 , 10.0 , 0.5 );
157
157
na .setNode (4 , 7.5 , 0.25 );
158
+ na .setNode (5 , 5.0 , 1.0 );
159
+
158
160
159
161
EdgeIteratorState edge1 = g .edge (0 , 1 ).setDistance (1000 ).setFlags (encoder .setProperties (50 , true , true ));
160
162
edge1 .setWayGeometry (Helper .createPointList ());
@@ -169,6 +171,10 @@ public void testFindInstruction() {
169
171
edge4 .setWayGeometry (Helper .createPointList ());
170
172
edge4 .setName ("Street 4" );
171
173
174
+ g .edge (1 , 5 ).setDistance (10000 ).setFlags (encoder .setProperties (50 , true , true ));
175
+ g .edge (2 , 5 ).setDistance (10000 ).setFlags (encoder .setProperties (50 , true , true ));
176
+ g .edge (3 , 5 ).setDistance (100000 ).setFlags (encoder .setProperties (50 , true , true ));
177
+
172
178
Path path = new Path (g , new FastestWeighting (encoder ));
173
179
SPTEntry e1 = new SPTEntry (edge4 .getEdge (), 4 , 1 );
174
180
e1 .parent = new SPTEntry (edge3 .getEdge (), 3 , 1 );
0 commit comments