Commit d7c80570 authored by Björn Richerzhagen's avatar Björn Richerzhagen
Browse files

Merge branch 'br/pubsub-zobel' into 'master'

Update GraphHopper to 0.7.0

See merge request !17
parents beae4fd2 d963d167
......@@ -340,7 +340,7 @@
<dependency>
<groupId>com.graphhopper</groupId>
<artifactId>graphhopper</artifactId>
<version>0.5.0</version>
<version>0.7.0</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
......
......@@ -127,7 +127,7 @@ public class RealWorldStreetsMovement extends AbstractLocalMovementStrategy {
movementPoints.put(comp, new RealWorldMovementPoints(comp.getRealPosition(), destination, pointList, 0));
}
else {
pointList = rsp.getPoints();
pointList = rsp.getBest().getPoints();
movementPoints.put(comp, new RealWorldMovementPoints(comp.getRealPosition(), destination, pointList, 0));
}
}
......
......@@ -78,7 +78,17 @@ public class GPSCalculation {
public static int getZoom() {
return zoom;
}
public static double getWorldDimensionsX() {
return Binder.getComponentOrNull(Topology.class)
.getWorldDimensions().getX();
}
public static double getWorldDimensionsY() {
return Binder.getComponentOrNull(Topology.class)
.getWorldDimensions().getY();
}
public static double getLatUpper() {
return latCenter + (Binder.getComponentOrNull(Topology.class)
.getWorldDimensions().getY() / 111111d) * scaleFactor;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment