Changeset 35984 in osm for applications/editors

Timestamp:

2022-06-16T23:41:29+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #20703: GeographicReader.createOrGetWay is slow due to many Arrays.copyOf (opendata)

This lead to a speedup for loading the simplified-land-polygons-complete-3857.zip
file from ~5.5 minutes to <2 minutes. Allocations in createOrGetWay went from
187 GiB to 3.5 GiB.

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java

@@ -181 +181 @@
         Way tempWay = new Way();
         if (ls != null) {
+            final List<Node> nodes = new ArrayList<>(ls.getNumPoints());
             // Build list of nodes
             for (int i = 0; i < ls.getNumPoints(); i++) {
                 try {
-                    tempWay.addNode(createOrGetNode(ls.getPointN(i)));
+                    nodes.add(createOrGetNode(ls.getPointN(i)));
                 } catch (TransformException | IllegalArgumentException e) {
                     Logging.error("Exception for " + ls + ": " + e.getClass().getName() + ": " + e.getMessage());
                 }
             }
+            tempWay.setNodes(nodes);
             // Find possible duplicated ways
             if (tempWay.getNodesCount() > 0) {