Changeset 12692 in josm for trunk

Timestamp:

2017-08-28T22:01:42+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14704 - properly encode strings

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmWriter.java (modified) (2 diffs)
• ValidatorErrorWriter.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/OsmWriter.java

@@ -205 +205 @@
     }
 
+    void writeLatLon(LatLon ll) {
+        if (ll != null) {
+            out.print(" lat='"+LatLon.cDdHighPecisionFormatter.format(ll.lat())+
+                     "' lon='"+LatLon.cDdHighPecisionFormatter.format(ll.lon())+'\'');
+        }
+    }
+
     @Override
     public void visit(INode n) {
@@ -212 +219 @@
             out.println("/>");
         } else {
-            if (n.getCoor() != null) {
-                out.print(" lat='"+LatLon.cDdHighPecisionFormatter.format(n.getCoor().lat())+
-                          "' lon='"+LatLon.cDdHighPecisionFormatter.format(n.getCoor().lon())+'\'');
-            }
+            writeLatLon(n.getCoor());
             addTags(n, "node", true);
         }

trunk/src/org/openstreetmap/josm/io/ValidatorErrorWriter.java

@@ -65 +65 @@
         String timestamp = DateUtils.fromDate(new Date());
 
-        out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-        out.println("<analysers generator='JOSM' timestamp=\""+timestamp+"\">");
+        out.println("<?xml version='1.0' encoding='UTF-8'?>");
+        out.println("<analysers generator='JOSM' timestamp='"+timestamp+"'>");
 
         OsmWriter osmWriter = OsmWriterFactory.createOsmWriter(out, true, OsmChangeBuilder.DEFAULT_API_VERSION);
@@ -72 +72 @@
 
         for (Test test : analysers) {
-            out.println("  <analyser timestamp=\""+timestamp+"\" name=\""+test.getName()+"\">");
+            out.println("  <analyser timestamp='"+timestamp+"' name='"+XmlWriter.encode(test.getName())+"'>");
             // Build map of test error classes for the current test
             Map<ErrorClass, List<TestError>> map = new HashMap<>();
@@ -89 +89 @@
             // Write classes
             for (ErrorClass ec : map.keySet()) {
-                out.println("    <class id=\""+ec.id+"\" level=\""+ec.severity.getLevel()+"\">");
-                out.println("      <classtext lang=\""+lang+"\" title=\""+ec.message+"\"/>");
+                out.println("    <class id='"+ec.id+"' level='"+ec.severity.getLevel()+"'>");
+                out.println("      <classtext lang='"+XmlWriter.encode(lang)+"' title='"+XmlWriter.encode(ec.message)+"'/>");
                 out.println("    </class>");
             }
@@ -98 +98 @@
                 for (TestError error : entry.getValue()) {
                     LatLon ll = error.getPrimitives().iterator().next().getBBox().getCenter();
-                    out.println("    <error class=\""+entry.getKey().id+"\">");
-                    out.println("      <location lat=\""+ll.lat()+"\" lon=\""+ll.lon()+"\">");
+                    out.println("    <error class='"+entry.getKey().id+"'>");
+                    out.print("      <location");
+                    osmWriter.writeLatLon(ll);
+                    out.println(">");
                     for (OsmPrimitive p : error.getPrimitives()) {
                         p.accept(osmWriter);
                     }
-                    out.println("      <text lang=\""+lang+"\" value=\""+error.getDescription()+"\">");
+                    out.println("      <text lang='"+XmlWriter.encode(lang)+"' value='"+XmlWriter.encode(error.getDescription())+"'>");
                     if (error.isFixable()) {
                         out.println("      <fixes>");