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

Merge pull request #23 from nrenner/geojson

Browse source 
add GeoJSON track format
This commit is contained in:
abrensch 2014-08-24 09:26:59 +02:00
commit 0cb894465e
2 changed files with 90 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
brouter-core/src/main/java/btools/router/OsmTrack.java
View file

@ -286,6 +286,43 @@ public final class OsmTrack
return sb.toString();
}
public String formatAsGeoJson()
{
StringBuilder sb = new StringBuilder(8192);
sb.append( "{\n" );
sb.append( " \"type\": \"FeatureCollection\",\n" );
sb.append( " \"features\": [\n" );
sb.append( " {\n" );
sb.append( " \"type\": \"Feature\",\n" );
sb.append( " \"properties\": {\n" );
sb.append( " \"creator\": \"BRouter-1.0.2\",\n" );
sb.append( " \"name\": \"" ).append( name ).append( "\",\n" );
sb.append( " \"track-length\": \"" ).append( distance ).append( "\",\n" );
sb.append( " \"filtered ascend\": \"" ).append( ascend ).append( "\",\n" );
sb.append( " \"plain-ascend\": \"" ).append( plainAscend ).append( "\",\n" );
sb.append( " \"cost\": \"" ).append( cost ).append( "\"\n" );
sb.append( " },\n" );
sb.append( " \"geometry\": {\n" );
sb.append( " \"type\": \"LineString\",\n" );
sb.append( " \"coordinates\": [\n" );
for( OsmPathElement n : nodes )
{
String sele = n.getSElev() == Short.MIN_VALUE ? "" : ", " + n.getElev();
sb.append( " [" ).append(formatPos(n.getILon() - 180000000)).append(", ").append(formatPos(n.getILat() - 90000000)).append(sele).append( "],\n" );
}
sb.deleteCharAt( sb.lastIndexOf( "," ) );
sb.append( " ]\n" );
sb.append( " }\n" );
sb.append( " }\n" );
sb.append( " ]\n" );
sb.append( "}\n" );
return sb.toString();
}
private static String formatPos( int p )
{
boolean negative = p < 0;

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

@ -21,7 +21,7 @@ import java.util.List;
* nogos = lon,lat,radius|... (optional, radius in meters)
* profile = profile file name without .brf
* alternativeidx = [0|1|2|3] (optional, default 0)
* format = [kml|gpx] (optional, default gpx)
* format = [kml|gpx|geojson] (optional, default gpx)
*
* Example URLs:
* http://localhost:17777/brouter?lonlats=8.799297,49.565883|8.811764,49.563606&nogos=&profile=trekking&alternativeidx=0&format=gpx
@ -32,14 +32,14 @@ public class ServerHandler extends RequestHandler {
private RoutingContext rc;
public ServerHandler( ServiceContext serviceContext, HashMap<String, String> params )
{
super( serviceContext, params );
}
public ServerHandler( ServiceContext serviceContext, HashMap<String, String> params )
{
super( serviceContext, params );
}
@Override
public RoutingContext readRoutingContext()
{
@Override
public RoutingContext readRoutingContext()
{
rc = new RoutingContext();
String profile = params.get( "profile" );
@ -61,46 +61,50 @@ public class ServerHandler extends RequestHandler {
}
return rc;
}
}
@Override
public List<OsmNodeNamed> readWayPointList()
{
// lon,lat|...
String lonLats = params.get( "lonlats" );
if (lonLats == null) throw new IllegalArgumentException( "lonlats parameter not set" );
@Override
public List<OsmNodeNamed> readWayPointList()
{
// lon,lat|...
String lonLats = params.get( "lonlats" );
if (lonLats == null) throw new IllegalArgumentException( "lonlats parameter not set" );
String[] coords = lonLats.split("\\|");
if (coords.length < 2) throw new IllegalArgumentException( "we need two lat/lon points at least!" );
String[] coords = lonLats.split("\\|");
if (coords.length < 2) throw new IllegalArgumentException( "we need two lat/lon points at least!" );
List<OsmNodeNamed> wplist = new ArrayList<OsmNodeNamed>();
for (int i = 0; i < coords.length; i++)
{
String[] lonLat = coords[i].split(",");
wplist.add( readPosition( lonLat[0], lonLat[1], "via" + i ) );
}
{
String[] lonLat = coords[i].split(",");
wplist.add( readPosition( lonLat[0], lonLat[1], "via" + i ) );
}
wplist.get(0).name = "from";
wplist.get(wplist.size()-1).name = "to";
return wplist;
}
@Override
public String formatTrack(OsmTrack track)
{
String result;
// optional, may be null
String format = params.get( "format" );
}
@Override
public String formatTrack(OsmTrack track)
{
String result;
// optional, may be null
String format = params.get( "format" );
if (format == null || "gpx".equals(format))
{
result = track.formatAsGpx();
}
else if ("kml".equals(format))
{
result = track.formatAsKml();
}
if (format == null || "gpx".equals(format))
{
result = track.formatAsGpx();
}
else if ("kml".equals(format))
{
result = track.formatAsKml();
}
else if ("geojson".equals(format))
{
result = track.formatAsGeoJson();
}
else if ("csv".equals(format))
{
try
@ -115,13 +119,13 @@ public class ServerHandler extends RequestHandler {
return "Error: " + ex.getMessage();
}
}
else {
System.out.println("unknown track format '" + format + "', using default");
result = track.formatAsGpx();
}
return result;
}
else {
System.out.println("unknown track format '" + format + "', using default");
result = track.formatAsGpx();
}
return result;
}
@Override
public String getMimeType()
@ -141,6 +145,10 @@ public class ServerHandler extends RequestHandler {
{
result = "application/vnd.google-earth.kml+xml";
}
else if ( "geojson".equals( format ) )
{
result = "application/vnd.geo+json";
}
else if ( "csv".equals( format ) )
{
result = "text/tab-separated-values";