Changeset 11627 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2017-02-26T00:59:32+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #3346 - improve drastically the performance of fixing duplicate nodes by:

• caching data sources area computation
• moving layer invalidation from UndoRedoHandler.addNoRedraw to UndoRedoHandler.add
• avoiding any EDT call when building tag conflict dialog if it's not meant to be displayed

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmReader.java (modified) (1 diff)
• OsmWriter.java (modified) (1 diff)
• OverpassDownloadReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -198 +198 @@
             }
             DataSource src = new DataSource(bounds, origin);
-            ds.dataSources.add(src);
+            ds.addDataSource(src);
         } else {
             throwException(tr("Missing mandatory attributes on element ''bounds''. " +

trunk/src/org/openstreetmap/josm/io/OsmWriter.java

@@ -174 +174 @@
 
     public void writeDataSources(DataSet ds) {
-        for (DataSource s : ds.dataSources) {
+        for (DataSource s : ds.getDataSources()) {
             out.println("  <bounds minlat='"
                     + s.bounds.getMin().latToString(CoordinateFormat.DECIMAL_DEGREES)

trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

@@ -169 +169 @@
 
         // add bounds if necessary (note that Overpass API does not return bounds in the response XML)
-        if (ds != null && ds.dataSources.isEmpty() && overpassQuery.contains("{{bbox}}")) {
+        if (ds != null && ds.getDataSources().isEmpty() && overpassQuery.contains("{{bbox}}")) {
             if (crosses180th) {
                 Bounds bounds = new Bounds(lat1, lon1, lat2, 180.0);
                 DataSource src = new DataSource(bounds, getBaseUrl());
-                ds.dataSources.add(src);
+                ds.addDataSource(src);
 
                 bounds = new Bounds(lat1, -180.0, lat2, lon2);
                 src = new DataSource(bounds, getBaseUrl());
-                ds.dataSources.add(src);
+                ds.addDataSource(src);
             } else {
                 Bounds bounds = new Bounds(lat1, lon1, lat2, lon2);
                 DataSource src = new DataSource(bounds, getBaseUrl());
-                ds.dataSources.add(src);
+                ds.addDataSource(src);
             }
         }