Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

change distance call

Browse source
This commit is contained in:
afischerdev 2023-02-19 13:48:20 +01:00
parent c9ae7c8681
commit e905eefc6c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
brouter-core/src/main/java/btools/router/RoutingEngine.java
View file

@ -297,7 +297,7 @@ public class RoutingEngine extends Thread {
int ind = s.indexOf("%"); int ind = s.indexOf("%");
if (ind != -1) if (ind != -1)
s = s.substring(0, ind); s = s.substring(0, ind);
ind = s.indexOf("<EFBFBD>"); ind = s.indexOf("°");
if (ind != -1) if (ind != -1)
s = s.substring(0, ind); s = s.substring(0, ind);
tmpincline = Double.parseDouble(s.trim()); tmpincline = Double.parseDouble(s.trim());
@ -313,7 +313,7 @@ public class RoutingEngine extends Thread {
if (startincline == 0) { if (startincline == 0) {
startincline = tmpincline; startincline = tmpincline;
} else if (startincline < 0 && tmpincline > 0) { } else if (startincline < 0 && tmpincline > 0) {
// for the way ?p find the exit point // for the way up find the exit point
double diff = endElev - selev; double diff = endElev - selev;
tmpincline = diff / (distRest / 100.); tmpincline = diff / (distRest / 100.);
} }
@ -733,7 +733,7 @@ public class RoutingEngine extends Thread {
lon2 = t.nodes.get(i).getILon(); lon2 = t.nodes.get(i).getILon();
lat2 = t.nodes.get(i).getILat(); lat2 = t.nodes.get(i).getILat();
nLast = t.nodes.get(0); nLast = t.nodes.get(0);
dist = routingContext.calcDistance(lon0, lat0, lon1, lat1); dist = nLast.calcDistance(n);
} else { } else {
lon0 = t.nodes.get(i - 2).getILon(); lon0 = t.nodes.get(i - 2).getILon();
lat0 = t.nodes.get(i - 2).getILat(); lat0 = t.nodes.get(i - 2).getILat();
@ -742,7 +742,7 @@ public class RoutingEngine extends Thread {
lon2 = t.nodes.get(i).getILon(); lon2 = t.nodes.get(i).getILon();
lat2 = t.nodes.get(i).getILat(); lat2 = t.nodes.get(i).getILat();
nLast = t.nodes.get(i - 1); nLast = t.nodes.get(i - 1);
dist = routingContext.calcDistance(lon1, lat1, lon2, lat2); dist = nLast.calcDistance(n);
} }
angle = routingContext.anglemeter.calcAngle(lon0, lat0, lon1, lat1, lon2, lat2); angle = routingContext.anglemeter.calcAngle(lon0, lat0, lon1, lat1, lon2, lat2);
n.message.linkdist = dist; n.message.linkdist = dist;