Changeset 35292 in osm for applications/editors

Timestamp:

2020-01-13T21:45:38+01:00 (5 years ago)

Author:

simon04

Message:

JOSM/comfort0: fix generated Level0L

Location:

applications/editors/josm/plugins/comfort0

Files:

• src/net/simon04/comfort0/OsmToLevel0L.java (modified) (4 diffs)
• test/unit/net/simon04/comfort0/OsmToLevel0LTest.java (modified) (3 diffs)

applications/editors/josm/plugins/comfort0/src/net/simon04/comfort0/OsmToLevel0L.java

@@ -22 +22 @@
     private final StringBuilder sb = new StringBuilder();
 
-    public void visit(Collection<OsmPrimitive> primitives) {
+    /**
+     * Visits a collection of primitives
+     * @param primitives The collection of primitives
+     * @return {@code this}
+     */
+    public OsmToLevel0L visit(Collection<OsmPrimitive> primitives) {
         primitives.stream()
                 .sorted(OsmPrimitiveComparator.orderingWaysRelationsNodes().thenComparing(OsmPrimitiveComparator.comparingUniqueId()))
                 .forEachOrdered(p -> p.accept(this));
+        return this;
     }
 
@@ -37 +43 @@
         appendCommon(w);
         for (Node node : w.getNodes()) {
-            sb.append("  n").append(node.getUniqueId());
-            appendDisplayName(node);
+            appendRef(node, "");
         }
     }
@@ -46 +51 @@
         appendCommon(r);
         for (RelationMember member : r.getMembers()) {
-            sb.append("  ");
-            switch (member.getType()) {
-                case NODE:
-                    sb.append("nd ");
-                    break;
-                case WAY:
-                    sb.append("wy ");
-                    break;
-                case RELATION:
-                    sb.append("rel ");
-                    break;
-                default:
-                    break;
-            }
-            sb.append(member.getUniqueId()).append(" ");
-            sb.append(member.getRole());
-            appendDisplayName(member.getMember());
+            appendRef(member.getMember(), " " + member.getRole());
         }
+    }
+
+    private void appendRef(OsmPrimitive primitive, String mixin) {
+        sb.append("  ");
+        switch (primitive.getType()) {
+            case NODE:
+                sb.append("nd ");
+                break;
+            case WAY:
+                sb.append("wy ");
+                break;
+            case RELATION:
+                sb.append("rel ");
+                break;
+            default:
+                break;
+        }
+        sb.append(primitive.getUniqueId());
+        sb.append(mixin);
+        appendDisplayName(primitive);
     }
 
@@ -93 +102 @@
     @Override
     public String toString() {
-        return sb.toString().trim();
+        return sb.toString().replaceFirst("^\\n", "");
     }
 }

applications/editors/josm/plugins/comfort0/test/unit/net/simon04/comfort0/OsmToLevel0LTest.java

@@ -40 +40 @@
         assertThat(converter.toString(), is(""
                 + "node 1234: 123.45, 67.89 #Comfort0 \u200E(123.45, 67.89)\n"
-                + "  name = Comfort0"));
+                + "  name = Comfort0\n"));
     }
 
@@ -57 +57 @@
                     "  highway = unclassified\n" +
                     "  name = Pastower Straße\n" +
-                    "  n292403538 #incomplete\n" +
-                    "  n298884289 #incomplete\n" +
-                    "  n261728686 #261728686 \u200E(54.0906309, 12.2441924)\n" +
+                    "  nd 292403538 #incomplete\n" +
+                    "  nd 298884289 #incomplete\n" +
+                    "  nd 261728686 #261728686 \u200E(54.0906309, 12.2441924)\n" +
                     "\n" +
                     "relation 56688 #route (\"Küstenbus Linie 123\", 4 members, incomplete)\n" +
@@ -91 +91 @@
                     "node 1831881213: 54.0900666, 12.2539381 #Neu Broderstorf \u200E(54.0900666, 12.2539381)\n" +
                     "  name = Neu Broderstorf\n" +
-                    "  traffic_sign = city_limit"));
+                    "  traffic_sign = city_limit\n"));
         }
     }