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

Merge pull request #21 from nrenner/download

Browse source 
improve downloading GPX+KML
This commit is contained in:
abrensch 2014-08-10 17:58:22 +02:00
commit a63e9eb166
3 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
brouter-server/src/main/java/btools/server/RouteServer.java
View file

@ -105,7 +105,7 @@ public class RouteServer extends Thread
else
{
OsmTrack track = cr.getFoundTrack();
writeHttpHeader(bw, handler.getMimeType());
writeHttpHeader(bw, handler.getMimeType(), handler.getFileName());
if ( track != null )
{
bw.write( handler.formatTrack(track) );
@ -211,11 +211,20 @@ public class RouteServer extends Thread
}
private static void writeHttpHeader( BufferedWriter bw, String mimeType ) throws IOException
{
writeHttpHeader( bw, mimeType, null );
}
private static void writeHttpHeader( BufferedWriter bw, String mimeType, String fileName ) throws IOException
{
// http-header
bw.write( "HTTP/1.1 200 OK\n" );
bw.write( "Connection: close\n" );
bw.write( "Content-Type: " + mimeType + "; charset=utf-8\n" );
if ( fileName != null )
{
bw.write( "Content-Disposition: attachment; filename=" + fileName + "\n" );
}
bw.write( "Access-Control-Allow-Origin: *\n" );
bw.write( "\n" );
}

2
brouter-server/src/main/java/btools/server/request/RequestHandler.java
View file

@ -26,4 +26,6 @@ public abstract class RequestHandler
public abstract String formatTrack(OsmTrack track);
public abstract String getMimeType();
public abstract String getFileName();
}

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

@ -133,9 +133,13 @@ public class ServerHandler extends RequestHandler {
String format = params.get( "format" );
if ( format != null )
{
if ( "gpx".equals( format ) || "kml".equals( format ) )
if ( "gpx".equals( format ) )
{
result = "text/xml";
result = "application/gpx+xml";
}
else if ( "kml".equals( format ) )
{
result = "application/vnd.google-earth.kml+xml";
}
else if ( "csv".equals( format ) )
{
@ -146,6 +150,20 @@ public class ServerHandler extends RequestHandler {
return result;
}
@Override
public String getFileName()
{
String fileName = null;
String format = params.get( "format" );
if ( format != null )
{
fileName = "brouter." + format;
}
return fileName;
}
private static OsmNodeNamed readPosition( String vlon, String vlat, String name )
{
if ( vlon == null ) throw new IllegalArgumentException( "lon " + name + " not found in input" );