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

add parsing of NogoPolygons to ServerHandler

Browse source
This commit is contained in:
ntruchsess 2018-01-22 23:24:59 +01:00
parent 32a49bfa32
commit f30ba74ac1
2 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java
View file

@ -67,7 +67,7 @@ public class BRouterWorker
} }
readNogos( params ); // add interface provided nogos readNogos( params ); // add interface provided nogos
rc.prepareNogoPoints( nogoList ); RoutingContext.prepareNogoPoints( nogoList );
rc.nogopoints = nogoList; rc.nogopoints = nogoList;
waypoints = readPositions(params); waypoints = readPositions(params);

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

@ -1,6 +1,7 @@
package btools.server.request; package btools.server.request;
import btools.router.OsmNodeNamed; import btools.router.OsmNodeNamed;
import btools.router.OsmNogoPolygon;
import btools.router.OsmTrack; import btools.router.OsmTrack;
import btools.router.RoutingContext; import btools.router.RoutingContext;
import btools.server.ServiceContext; import btools.server.ServiceContext;
@ -57,10 +58,16 @@ public class ServerHandler extends RequestHandler {
List<OsmNodeNamed> nogoList = readNogoList(); List<OsmNodeNamed> nogoList = readNogoList();
if ( nogoList != null ) if ( nogoList != null )
{ {
rc.prepareNogoPoints( nogoList ); RoutingContext.prepareNogoPoints( nogoList );
rc.nogopoints = nogoList; rc.nogopoints = nogoList;
} }
List<OsmNogoPolygon> nogoPolygonsList = readNogoPolygons();
if ( nogoPolygonsList != null )
{
rc.nogopoints.addAll(nogoPolygonsList);
}
return rc; return rc;
} }
@ -225,4 +232,30 @@ public class ServerHandler extends RequestHandler {
n.isNogo = true; n.isNogo = true;
return n; return n;
} }
private List<OsmNogoPolygon> readNogoPolygons()
{
String polygons = params.get( "polygons" );
if ( polygons == null ) return null;
String[] polygonList = polygons.split("\\|");
List<OsmNogoPolygon> nogoPolygonList = new ArrayList<OsmNogoPolygon>();
for (int i = 0; i < polygonList.length; i++)
{
String[] lonLatList = polygonList[i].split(",");
OsmNogoPolygon polygon = new OsmNogoPolygon();
for (int j = 0; j < lonLatList.length; j++)
{
String slon = lonLatList[i++];
String slat = lonLatList[i];
int lon = (int)( ( Double.parseDouble(slon) + 180. ) *1000000. + 0.5);
int lat = (int)( ( Double.parseDouble(slat) + 90. ) *1000000. + 0.5);
polygon.addVertex(lon, lat);
}
polygon.calcBoundingCircle();
nogoPolygonList.add(polygon);
}
return nogoPolygonList;
}
} }