Changeset 15760 in josm

Timestamp:

2020-01-25T21:11:58+01:00 (4 years ago)

Author:

simon04

Message:

fix #15628 - Strip HTML code from GPX descriptions

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/gpx/GpxData.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -79 +79 @@
     private final ArrayList<GpxRoute> privateRoutes = new ArrayList<>();
     /**
-     * Addidionaly waypoints for this file.
+     * Additional waypoints for this file.
      */
     private final ArrayList<WayPoint> privateWaypoints = new ArrayList<>();

trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.projection.Projecting;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
@@ -265 +266 @@
     @Override
     public Object getTemplateValue(String name, boolean special) {
-        if (!special)
+        if (special) {
+            return null;
+        } else if ("desc".equals(name)) {
+            final Object value = get(name);
+            return value instanceof String ? Utils.stripHtml(((String) value)) : value;
+        } else {
             return get(name);
-        else
-            return null;
+        }
     }
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1990 +1990 @@
         }
     }
+
+    /**
+     * Strips all HTML characters and return the result.
+     *
+     * @param rawString The raw HTML string
+     * @return the plain text from the HTML string
+     * @since 15760
+     */
+    public static String stripHtml(String rawString) {
+        // remove HTML tags
+        rawString = rawString.replaceAll("<.*?>", " ");
+        // consolidate multiple spaces between a word to a single space
+        rawString = rawString.replaceAll("\\b\\s{2,}\\b", " ");
+        // remove extra whitespaces
+        return rawString.trim();
+    }
 }

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -317 +317 @@
         assertTrue(Utils.isSimilar("Rua São João", "Rua SAO Joao"));
     }
+
+    /**
+     * Test of {@link Utils#stripHtml(String)}
+     */
+    @Test
+    public void testStripHtml() {
+        assertEquals("Hoogte 55 m", Utils.stripHtml(
+                "<table width=\"100%\"><tr>" +
+                        "<td align=\"left\" valign=\"center\"><small><b>Hoogte</b></small></td>" +
+                        "<td align=\"center\" valign=\"center\">55 m</td></tr></table>"));
+    }
 }