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

removed apache commons dependency

Browse source
This commit is contained in:
Arndt Brenschede 2019-10-05 16:44:42 +02:00
parent 853e3e10d6
commit 89ef900b7c
3 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
brouter-core/pom.xml
View file

@ -37,10 +37,5 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.8</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

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

@ -26,7 +26,7 @@ import btools.mapaccess.MatchedWaypoint;
import btools.mapaccess.OsmPos; import btools.mapaccess.OsmPos;
import btools.util.CompactLongMap; import btools.util.CompactLongMap;
import btools.util.FrozenLongMap; import btools.util.FrozenLongMap;
import org.apache.commons.text.StringEscapeUtils; import btools.util.StringUtils;
public final class OsmTrack public final class OsmTrack
{ {
@ -542,7 +542,7 @@ public final class OsmTrack
OsmNodeNamed poi = pois.get(i); OsmNodeNamed poi = pois.get(i);
sb.append( " <wpt lon=\"" ).append( formatILon( poi.ilon ) ).append( "\" lat=\"" ) sb.append( " <wpt lon=\"" ).append( formatILon( poi.ilon ) ).append( "\" lat=\"" )
.append( formatILat( poi.ilat ) ).append( "\">\n" ) .append( formatILat( poi.ilat ) ).append( "\">\n" )
.append( " <name>" ).append( StringEscapeUtils.escapeXml10(poi.name) ).append( "</name>\n" ) .append( " <name>" ).append( StringUtils.escapeXml10(poi.name) ).append( "</name>\n" )
.append( " </wpt>\n" ); .append( " </wpt>\n" );
} }
@ -553,7 +553,7 @@ public final class OsmTrack
MatchedWaypoint wt = matchedWaypoints.get(i); MatchedWaypoint wt = matchedWaypoints.get(i);
sb.append( " <wpt lon=\"" ).append( formatILon( wt.waypoint.ilon ) ).append( "\" lat=\"" ) sb.append( " <wpt lon=\"" ).append( formatILon( wt.waypoint.ilon ) ).append( "\" lat=\"" )
.append( formatILat( wt.waypoint.ilat ) ).append( "\">\n" ) .append( formatILat( wt.waypoint.ilat ) ).append( "\">\n" )
.append( " <name>" ).append( StringEscapeUtils.escapeXml10(wt.name) ).append( "</name>\n" ); .append( " <name>" ).append( StringUtils.escapeXml10(wt.name) ).append( "</name>\n" );
if(i == 0) if(i == 0)
{ {
sb.append( " <type>from</type>\n" ); sb.append( " <type>from</type>\n" );
@ -690,7 +690,7 @@ public final class OsmTrack
private void createPlaceMark(StringBuilder sb, String name, int ilat, int ilon) { private void createPlaceMark(StringBuilder sb, String name, int ilat, int ilon) {
sb.append(" <Placemark>\n"); sb.append(" <Placemark>\n");
sb.append(" <name>" + StringEscapeUtils.escapeXml10(name) + "</name>\n"); sb.append(" <name>" + StringUtils.escapeXml10(name) + "</name>\n");
sb.append(" <Point>\n"); sb.append(" <Point>\n");
sb.append(" <coordinates>" + formatILon(ilon) + "," + formatILat(ilat) + "</coordinates>\n"); sb.append(" <coordinates>" + formatILon(ilon) + "," + formatILat(ilat) + "</coordinates>\n");
sb.append(" </Point>\n"); sb.append(" </Point>\n");
@ -837,7 +837,7 @@ public final class OsmTrack
sb.append( " {\n" ); sb.append( " {\n" );
sb.append( " \"type\": \"Feature\",\n" ); sb.append( " \"type\": \"Feature\",\n" );
sb.append( " \"properties\": {\n" ); sb.append( " \"properties\": {\n" );
sb.append( " \"name\": \"" + StringEscapeUtils.escapeJson(name) + "\",\n" ); sb.append( " \"name\": \"" + StringUtils.escapeJson(name) + "\",\n" );
sb.append( " \"type\": \"" + type + "\"\n" ); sb.append( " \"type\": \"" + type + "\"\n" );
sb.append( " },\n" ); sb.append( " },\n" );
sb.append( " \"geometry\": {\n" ); sb.append( " \"geometry\": {\n" );

24
brouter-util/src/main/java/btools/util/StringUtils.java Normal file
View file

@ -0,0 +1,24 @@
package btools.util;
/**
* Some methods for String handling
*/
public class StringUtils
{
/**
* Escape a literal to put into a json document
*/
public static String escapeJson( String s )
{
return s;
}
/**
* Escape a literal to put into a xml document
*/
public static String escapeXml10( String s )
{
return s;
}
}