Changeset 35289 in osm for applications/editors/josm/plugins/comfort0/src

Timestamp:

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

Author:

simon04

Message:

JOSM/comfort0: 2020 compatibility

File:

• applications/editors/josm/plugins/comfort0/src/net/simon04/comfort0/OsmToLevel0L.java (modified) (5 diffs)

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

@@ -1 +1 @@
 package net.simon04.comfort0;
 
-import java.util.Collections;
-import java.util.List;
+import java.util.Collection;
 
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.AbstractPrimitive;
-import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
+import org.openstreetmap.josm.data.osm.KeyValueVisitor;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -12 +11 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
 
-public class OsmToLevel0L implements Visitor, AbstractPrimitive.KeyValueVisitor {
+/**
+ * Implements a conversion from {@link OsmPrimitive} to <a href="https://wiki.openstreetmap.org/wiki/Level0L">Level0L</a>.
+ */
+public class OsmToLevel0L implements OsmPrimitiveVisitor, KeyValueVisitor {
 
     private final StringBuilder sb = new StringBuilder();
 
-    public void visit(List<OsmPrimitive> primitives) {
-        Collections.sort(primitives, new OsmPrimitiveComparator());
-        for (OsmPrimitive primitive : primitives) {
-            primitive.accept(this);
-        }
+    public void visit(Collection<OsmPrimitive> primitives) {
+        primitives.stream()
+                .sorted(OsmPrimitiveComparator.orderingWaysRelationsNodes().thenComparing(OsmPrimitiveComparator.comparingUniqueId()))
+                .forEachOrdered(p -> p.accept(this));
     }
 
@@ -56 +57 @@
                     sb.append("rel ");
                     break;
+                default:
+                    break;
             }
             sb.append(member.getUniqueId()).append(" ");
@@ -66 +69 @@
         sb.append("\n");
         sb.append(p.getType().getAPIName()).append(" ").append(p.getUniqueId());
-        if (p instanceof Node && ((Node) p).isLatLonKnown()) {
-            final LatLon coor = ((Node) p).getCoor();
-            sb.append(": ").append(coor.lat()).append(", ").append(coor.lon());
+        if (p instanceof Node) {
+            final LatLon latLon = ((Node) p).getCoor();
+            if (latLon != null) {
+                sb.append(": ").append(latLon.lat()).append(", ").append(latLon.lon());
+            }
         }
         appendDisplayName(p);
@@ -79 +84 @@
 
     @Override
-    public void visit(Changeset cs) {
-    }
-
-    @Override
-    public void visitKeyValue(AbstractPrimitive primitive, String key, String value) {
+    public void visitKeyValue(Tagged primitive, String key, String value) {
         if (key.contains("#") || key.contains("=")) {
             throw new UnsupportedOperationException("# and = are not supported in keys");