Changeset 16951 in josm

Timestamp:

2020-08-28T22:38:23+02:00 (4 years ago)

Author:

simon04

Message:

fix #19717 - DefaultNameFormatter: add missing U+202C POP DIRECTIONAL FORMATTING

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/datatransfer/RelationMemberTransferable.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/util/MultipleNameVisitorTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java

@@ -213 +213 @@
                 name.append(" \u200E(");
                 name.append(CoordinateFormatManager.getDefaultFormat().toString(node, ", "));
-                name.append(')');
+                name.append(")\u200C");
             }
         }
@@ -306 +306 @@
         }
         decorateNameWithId(name, way);
+        name.append('\u200C');
 
         String result = name.toString();

trunk/src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.java

@@ -91 +91 @@
             sb.append(OsmPrimitiveType.from(primitive).getAPIName()).append(' ').append(primitive.getId());
         }
-        return sb.toString().replace("\u200E", "").replace("\u200F", "");
+        return sb.toString().replace("\u200C", "").replace("\u200E", "").replace("\u200F", "");
     }
 }

trunk/src/org/openstreetmap/josm/gui/datatransfer/RelationMemberTransferable.java

@@ -107 +107 @@
               .append('\n');
         }
-        return sb.toString().replace("\u200E", "").replace("\u200F", "");
+        return sb.toString().replace("\u200C", "").replace("\u200E", "").replace("\u200F", "");
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java

@@ -124 +124 @@
     @Test
     public void testWayName() {
-        assertEquals("building (0 nodes)", getFormattedWayName("building=yes"));
-        assertEquals("House number 123 (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123"));
-        assertEquals("House number 123 at FooStreet (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:street=FooStreet"));
-        assertEquals("House FooName (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:housename=FooName"));
+        assertEquals("\u200Ebuilding\u200E (0 nodes)\u200C", getFormattedWayName("building=yes"));
+        assertEquals("\u200EHouse number 123\u200E (0 nodes)\u200C",
+                getFormattedWayName("building=yes addr:housenumber=123"));
+        assertEquals("\u200EHouse number 123 at FooStreet\u200E (0 nodes)\u200C",
+                getFormattedWayName("building=yes addr:housenumber=123 addr:street=FooStreet"));
+        assertEquals("\u200EHouse FooName\u200E (0 nodes)\u200C",
+                getFormattedWayName("building=yes addr:housenumber=123 addr:housename=FooName"));
     }
 
     static String getFormattedRelationName(String tagsString) {
-        return DefaultNameFormatter.getInstance().format((Relation) OsmUtils.createPrimitive("relation " + tagsString))
-                .replace("\u200E", "").replace("\u200F", "");
+        return DefaultNameFormatter.getInstance().format((Relation) OsmUtils.createPrimitive("relation " + tagsString));
     }
 
     static String getFormattedWayName(String tagsString) {
-        return DefaultNameFormatter.getInstance().format((Way) OsmUtils.createPrimitive("way " + tagsString))
-                .replace("\u200E", "").replace("\u200F", "");
+        return DefaultNameFormatter.getInstance().format((Way) OsmUtils.createPrimitive("way " + tagsString));
     }
 

trunk/test/unit/org/openstreetmap/josm/data/validation/util/MultipleNameVisitorTest.java

@@ -33 +33 @@
         MultipleNameVisitor visitor = new MultipleNameVisitor();
         visitor.visit(Arrays.asList(new Way(), new Way()));
-        assertEquals("2 ways: ‎0‎ (0 nodes), ‎0‎ (0 nodes)", visitor.toString());
+        assertEquals("2 ways: \u200E0\u200E (0 nodes)\u200C, \u200E0\u200E (0 nodes)\u200C", visitor.toString());
     }
 
@@ -46 +46 @@
                 TestUtils.newWay("addr:housename=Stark"),
                 TestUtils.newRelation("type=route")));
-        assertEquals("3 objects: foo, ‎House Stark‎ (0 nodes), route (0, 0 members)", visitor.toString());
+        assertEquals("3 objects: foo, \u200EHouse Stark\u200E (0 nodes)\u200C, route (0, 0 members)", visitor.toString());
     }
 }