Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Simonstrator
PeerfactSim.KOM
Commits
d7c80570
Commit
d7c80570
authored
Aug 04, 2017
by
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
Changes
3
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
d7c80570
...
...
@@ -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>
...
...
src/de/tud/kom/p2psim/impl/topology/movement/local/RealWorldStreetsMovement.java
View file @
d7c80570
...
...
@@ -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
));
}
}
...
...
src/de/tud/kom/p2psim/impl/topology/movement/modularosm/GPSCalculation.java
View file @
d7c80570
...
...
@@ -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
()
/
111111
d
)
*
scaleFactor
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment