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

Merge pull request #499 from quaelnix/fix-calc-distance

Browse source 
Fix rounding error in calcDistance
This commit is contained in:
afischerdev 2023-02-15 17:24:03 +01:00 committed by GitHub
commit 8903939176
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brouter-core/src/main/java/btools/router/OsmPathElement.java
View file

@ -75,7 +75,7 @@ public class OsmPathElement implements OsmPos {
} }
public final int calcDistance(OsmPos p) { public final int calcDistance(OsmPos p) {
return (int) (CheapRuler.distance(ilon, ilat, p.getILon(), p.getILat()) + 1.0); return (int) Math.max(1.0, Math.round(CheapRuler.distance(ilon, ilat, p.getILon(), p.getILat())));
} }
public OsmPathElement origin; public OsmPathElement origin;

2
brouter-core/src/main/java/btools/router/RoutingContext.java
View file

@ -462,7 +462,7 @@ public final class RoutingContext {
} }
} }
} }
return (int) (d + 0.5); return (int) Math.max(1.0, Math.round(d));
} }
public OsmPathModel pm; public OsmPathModel pm;

2
brouter-mapaccess/src/main/java/btools/mapaccess/OsmNode.java
View file

@ -100,7 +100,7 @@ public class OsmNode extends OsmLink implements OsmPos {
} }
public final int calcDistance(OsmPos p) { public final int calcDistance(OsmPos p) {
return (int) (CheapRuler.distance(ilon, ilat, p.getILon(), p.getILat()) + 1.0); return (int) Math.max(1.0, Math.round(CheapRuler.distance(ilon, ilat, p.getILon(), p.getILat())));
} }
public String toString() { public String toString() {