Changeset 15178 in josm for trunk/src/org

Timestamp:

2019-06-17T11:05:51+02:00 (5 years ago)

Author:

GerdP

Message:

fix #17819

• Create ArrayList instead of modifying a CopyList instance in joinWays()
• Avoid to remove node, instead add sublist to avoid duplicate nodes, always use addAll().
• use HashSet to store larger collections of way ids, Collections.singleton for single ids

Result: Multipolygon.load() performance is much better for very complex multipolygons (1.6 secs instead of 30), no changes for normal sized relations.

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -185 +185 @@
         public JoinedWay(List<Node> nodes, Collection<Long> wayIds, boolean selected) {
             this.nodes = new ArrayList<>(nodes);
-            this.wayIds = new ArrayList<>(wayIds);
+            // see #17819
+            if (wayIds.size() == 1) {
+                this.wayIds = Collections.singleton(wayIds.iterator().next());
+            } else {
+                this.wayIds = wayIds.size() <= 10 ? new ArrayList<>(wayIds) : new HashSet<>(wayIds);
+            }
             this.selected = selected;
         }
@@ -638 +643 @@
                                 --left;
                                 if (nodes == null) {
-                                    nodes = w.getNodes();
+                                    nodes = new ArrayList<>(w.getNodes());
                                     wayIds.add(w.getUniqueId());
                                 }
-                                nodes.remove((mode == 21 || mode == 22) ? nl : 0);
                                 if (mode == 21) {
-                                    nodes.addAll(c.getNodes());
+                                    nodes.addAll(c.getNodes().subList(1, cl + 1));
                                 } else if (mode == 12) {
-                                    nodes.addAll(0, c.getNodes());
-                                } else if (mode == 22) {
-                                    for (Node node : c.getNodes()) {
-                                        nodes.add(nl, node);
-                                    }
-                                } else /* mode == 11 */ {
-                                    for (Node node : c.getNodes()) {
-                                        nodes.add(0, node);
+                                    nodes.addAll(0, c.getNodes().subList(0, cl));
+                                } else {
+                                    ArrayList<Node> reversed = new ArrayList<>(c.getNodes());
+                                    Collections.reverse(reversed);
+                                    if (mode == 22) {
+                                        nodes.addAll(reversed.subList(1, cl + 1));
+                                    } else /* mode == 11 */ {
+                                        nodes.addAll(0, reversed.subList(0, cl));
                                     }
                                 }