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

formatting: replace tabs with spaces

Browse source
This commit is contained in:
Norbert Renner 2014-08-23 21:55:45 +02:00
parent 76c1641899
commit dbc0222784
1 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,14 +32,14 @@ public class ServerHandler extends RequestHandler {
private RoutingContext rc; private RoutingContext rc;
public ServerHandler( ServiceContext serviceContext, HashMap<String, String> params ) public ServerHandler( ServiceContext serviceContext, HashMap<String, String> params )
{ {
super( serviceContext, params ); super( serviceContext, params );
} }
@Override @Override
public RoutingContext readRoutingContext() public RoutingContext readRoutingContext()
{ {
rc = new RoutingContext(); rc = new RoutingContext();
String profile = params.get( "profile" ); String profile = params.get( "profile" );
@ -61,50 +61,50 @@ public class ServerHandler extends RequestHandler {
} }
return rc; return rc;
} }
@Override @Override
public List<OsmNodeNamed> readWayPointList() public List<OsmNodeNamed> readWayPointList()
{ {
// lon,lat|... // lon,lat|...
String lonLats = params.get( "lonlats" ); String lonLats = params.get( "lonlats" );
if (lonLats == null) throw new IllegalArgumentException( "lonlats parameter not set" ); if (lonLats == null) throw new IllegalArgumentException( "lonlats parameter not set" );
String[] coords = lonLats.split("\\|"); String[] coords = lonLats.split("\\|");
if (coords.length < 2) throw new IllegalArgumentException( "we need two lat/lon points at least!" ); if (coords.length < 2) throw new IllegalArgumentException( "we need two lat/lon points at least!" );
List<OsmNodeNamed> wplist = new ArrayList<OsmNodeNamed>(); List<OsmNodeNamed> wplist = new ArrayList<OsmNodeNamed>();
for (int i = 0; i < coords.length; i++) for (int i = 0; i < coords.length; i++)
{ {
String[] lonLat = coords[i].split(","); String[] lonLat = coords[i].split(",");
wplist.add( readPosition( lonLat[0], lonLat[1], "via" + i ) ); wplist.add( readPosition( lonLat[0], lonLat[1], "via" + i ) );
} }
wplist.get(0).name = "from"; wplist.get(0).name = "from";
wplist.get(wplist.size()-1).name = "to"; wplist.get(wplist.size()-1).name = "to";
return wplist; return wplist;
} }
@Override @Override
public String formatTrack(OsmTrack track) public String formatTrack(OsmTrack track)
{ {
String result; String result;
// optional, may be null // optional, may be null
String format = params.get( "format" ); String format = params.get( "format" );
if (format == null || "gpx".equals(format)) if (format == null || "gpx".equals(format))
{ {
result = track.formatAsGpx(); result = track.formatAsGpx();
} }
else if ("kml".equals(format)) else if ("kml".equals(format))
{ {
result = track.formatAsKml(); result = track.formatAsKml();
}
else if ("geojson".equals(format))
{
result = track.formatAsGeoJson();
} }
else if ("geojson".equals(format))
{
result = track.formatAsGeoJson();
}
else if ("csv".equals(format)) else if ("csv".equals(format))
{ {
try try
@ -119,13 +119,13 @@ public class ServerHandler extends RequestHandler {
return "Error: " + ex.getMessage(); return "Error: " + ex.getMessage();
} }
} }
else { else {
System.out.println("unknown track format '" + format + "', using default"); System.out.println("unknown track format '" + format + "', using default");
result = track.formatAsGpx(); result = track.formatAsGpx();
} }
return result; return result;
} }
@Override @Override
public String getMimeType() public String getMimeType()