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

remove special characters in trackname

Browse source
This commit is contained in:
Arndt Brenschede 2019-05-25 18:47:02 +02:00
parent ef567095ea
commit c89058ee63
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,7 +113,7 @@ public class ServerHandler extends RequestHandler {
String result; String result;
// optional, may be null // optional, may be null
String format = params.get( "format" ); String format = params.get( "format" );
String trackName = params.get( "trackname" ); String trackName = getTrackName();
if (trackName != null) { if (trackName != null) {
track.name = trackName; track.name = trackName;
} }
@ -188,15 +188,21 @@ public class ServerHandler extends RequestHandler {
{ {
String fileName = null; String fileName = null;
String format = params.get( "format" ); String format = params.get( "format" );
String trackName = getTrackName();
if ( format != null ) if ( format != null )
{ {
fileName = ( params.get( "trackname" ) == null ? "brouter" : params.get( "trackname" ).replaceAll("[^a-zA-Z0-9 \\._\\-]+", "") ) + "." + format; fileName = ( trackName == null ? "brouter" : trackName ) + "." + format;
} }
return fileName; return fileName;
} }
private String getTrackName()
{
return params.get( "trackname" ) == null ? null : params.get( "trackname" ).replaceAll("[^a-zA-Z0-9 \\._\\-]+", "");
}
private static OsmNodeNamed readPosition( String vlon, String vlat, String name ) private static OsmNodeNamed readPosition( String vlon, String vlat, String name )
{ {
if ( vlon == null ) throw new IllegalArgumentException( "lon " + name + " not found in input" ); if ( vlon == null ) throw new IllegalArgumentException( "lon " + name + " not found in input" );