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

fix radius-calculation, clockwise windingnumber and wp-init

Browse source
This commit is contained in:
ntruchsess 2018-01-24 15:40:34 +01:00
parent 144c0018de
commit 1fc6c9e62c
3 changed files with 36 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
brouter-core/src/main/java/btools/router/OsmNogoPolygon.java
View file

@ -27,11 +27,6 @@ import java.util.List;
public class OsmNogoPolygon extends OsmNodeNamed
{
public OsmNogoPolygon()
{
isNogo = true;
}
private final static class Point
{
final int y;
@ -44,7 +39,7 @@ public class OsmNogoPolygon extends OsmNodeNamed
}
}
private final List<Point> points = new ArrayList<Point>();
public final List<Point> points = new ArrayList<Point>();
public final void addVertex(int lon, int lat)
{
@ -160,7 +155,7 @@ public class OsmNogoPolygon extends OsmNodeNamed
dpx = cx - ilon; // rounding error
dpy = cy - ilat;
// compensate rounding error of center-point
radius = rad + Math.sqrt(dpx * dpx + dpy * dpy);
radius = (rad + Math.sqrt(dpx * dpx + dpy * dpy)) * 0.000001;
return;
}
@ -178,7 +173,7 @@ public class OsmNogoPolygon extends OsmNodeNamed
*/
public boolean isWithin(int lon, int lat)
{
return wn_PnPoly(new Point(lon,lat),points) > 0;
return wn_PnPoly(lon,lat,points) != 0;
}
/**
@ -196,13 +191,13 @@ public class OsmNogoPolygon extends OsmNodeNamed
*/
public boolean intersectsOrIsWithin(int lon0, int lat0, int lon1, int lat1)
{
final Point p0 = new Point (lon0,lat0);
final Point p1 = new Point (lon1,lat1);
// is start or endpoint within polygon?
if ((wn_PnPoly(p0, points) > 0) || (wn_PnPoly(p1, points) > 0))
if ((wn_PnPoly(lon0,lat0, points) != 0) || (wn_PnPoly(lon1,lat1, points) != 0))
{
return true;
}
final Point p0 = new Point (lon0,lat0);
final Point p1 = new Point (lon1,lat1);
int i_last = points.size()-1;
Point p2 = points.get(i_last);
for (int i = 0; i <= i_last; i++)
@ -275,12 +270,9 @@ public class OsmNogoPolygon extends OsmNodeNamed
* is implicitly closed connecting the last and first point.
* @return the winding number (=0 only when P is outside)
*/
private static int wn_PnPoly(final Point p, final List<Point> v) {
private static int wn_PnPoly(final long px, final long py, final List<Point> v) {
int wn = 0; // the winding number counter
final long px = p.x;
final long py = p.y;
// loop through all edges of the polygon
final int i_last = v.size()-1;
final Point p0 = v.get(i_last);

2
brouter-core/src/test/java/btools/router/OsmNogoPolygonTest.java
View file

@ -62,7 +62,7 @@ public class OsmNogoPolygonTest {
double py = toOsmLat(lats[i]);
double dpx = (toOsmLon(lons[i]) - p.ilon) * coslat(p.ilat);
double dpy = py - p.ilat;
double r1 = Math.sqrt(dpx * dpx + dpy * dpy);
double r1 = Math.sqrt(dpx * dpx + dpy * dpy) * 0.000001;
double diff = r-r1;
assertTrue("i: "+i+" r("+r+") >= r1("+r1+")", diff >= 0);
}

44
brouter-server/src/main/java/btools/server/request/ServerHandler.java
View file

@ -56,23 +56,21 @@ public class ServerHandler extends RequestHandler {
rc.setAlternativeIdx(Integer.parseInt(params.get( "alternativeidx" )));
List<OsmNodeNamed> nogoList = readNogoList();
List<OsmNodeNamed> nogoPolygonsList = readNogoPolygons();
if ( nogoList != null )
{
RoutingContext.prepareNogoPoints( nogoList );
rc.nogopoints = nogoList;
}
List<OsmNodeNamed> nogoPolygonsList = readNogoPolygons();
if ( nogoPolygonsList != null )
if (rc.nogopoints == null)
{
if (rc.nogopoints == null)
{
rc.nogopoints = nogoPolygonsList;
}
else
{
rc.nogopoints.addAll(nogoPolygonsList);
}
rc.nogopoints = nogoPolygonsList;
}
else if ( nogoPolygonsList != null )
{
rc.nogopoints.addAll(nogoPolygonsList);
}
return rc;
@ -251,17 +249,25 @@ public class ServerHandler extends RequestHandler {
for (int i = 0; i < polygonList.length; i++)
{
String[] lonLatList = polygonList[i].split(",");
OsmNogoPolygon polygon = new OsmNogoPolygon();
for (int j = 0; j < lonLatList.length-1;)
if ( lonLatList.length > 1 )
{
String slon = lonLatList[j++];
String slat = lonLatList[j++];
int lon = (int)( ( Double.parseDouble(slon) + 180. ) *1000000. + 0.5);
int lat = (int)( ( Double.parseDouble(slat) + 90. ) *1000000. + 0.5);
polygon.addVertex(lon, lat);
OsmNogoPolygon polygon = new OsmNogoPolygon();
for (int j = 0; j < lonLatList.length-1;)
{
String slon = lonLatList[j++];
String slat = lonLatList[j++];
int lon = (int)( ( Double.parseDouble(slon) + 180. ) *1000000. + 0.5);
int lat = (int)( ( Double.parseDouble(slat) + 90. ) *1000000. + 0.5);
polygon.addVertex(lon, lat);
}
if ( polygon.points.size() > 0 )
{
polygon.name = "";
polygon.isNogo = true;
polygon.calcBoundingCircle();
nogoPolygonList.add(polygon);
}
}
polygon.calcBoundingCircle();
nogoPolygonList.add(polygon);
}
return nogoPolygonList;
}