diff --git a/brouter-core/pom.xml b/brouter-core/pom.xml index eb6ffcb..43b909f 100644 --- a/brouter-core/pom.xml +++ b/brouter-core/pom.xml @@ -37,10 +37,5 @@ junit test - - org.apache.commons - commons-text - 1.8 - diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index 9d8a2e1..b18415a 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -26,7 +26,7 @@ import btools.mapaccess.MatchedWaypoint; import btools.mapaccess.OsmPos; import btools.util.CompactLongMap; import btools.util.FrozenLongMap; -import org.apache.commons.text.StringEscapeUtils; +import btools.util.StringUtils; public final class OsmTrack { @@ -542,7 +542,7 @@ public final class OsmTrack OsmNodeNamed poi = pois.get(i); sb.append( " \n" ) - .append( " " ).append( StringEscapeUtils.escapeXml10(poi.name) ).append( "\n" ) + .append( " " ).append( StringUtils.escapeXml10(poi.name) ).append( "\n" ) .append( " \n" ); } @@ -553,7 +553,7 @@ public final class OsmTrack MatchedWaypoint wt = matchedWaypoints.get(i); sb.append( " \n" ) - .append( " " ).append( StringEscapeUtils.escapeXml10(wt.name) ).append( "\n" ); + .append( " " ).append( StringUtils.escapeXml10(wt.name) ).append( "\n" ); if(i == 0) { sb.append( " from\n" ); @@ -690,7 +690,7 @@ public final class OsmTrack private void createPlaceMark(StringBuilder sb, String name, int ilat, int ilon) { sb.append(" \n"); - sb.append(" " + StringEscapeUtils.escapeXml10(name) + "\n"); + sb.append(" " + StringUtils.escapeXml10(name) + "\n"); sb.append(" \n"); sb.append(" " + formatILon(ilon) + "," + formatILat(ilat) + "\n"); sb.append(" \n"); @@ -837,7 +837,7 @@ public final class OsmTrack sb.append( " {\n" ); sb.append( " \"type\": \"Feature\",\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( " },\n" ); sb.append( " \"geometry\": {\n" ); diff --git a/brouter-util/src/main/java/btools/util/StringUtils.java b/brouter-util/src/main/java/btools/util/StringUtils.java new file mode 100644 index 0000000..f2f299b --- /dev/null +++ b/brouter-util/src/main/java/btools/util/StringUtils.java @@ -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; + } + +}