Changeset 15531 in josm for trunk

Timestamp:

2019-11-19T11:35:34+01:00 (4 years ago)

Author:

GerdP

Message:

see #18341: Improve performance when incomplete multipolygon is updated (Ctrl+Shift+B)
Only download a set of incomplete members if the number is not bigger than 100, else download the full relation.
This is expected to be much faster and less stressing for the server when the multipolygon is very complex (thousands of members).

File:

• trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -50 +51 @@
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -70 +72 @@
 
     private final boolean update;
+    private static final int MAX_MEMBERS_TO_DOWNLOAD = 100;
 
     /**
@@ -170 +173 @@
         if (multipolygonRelation != null && editLayer != null && editLayer.isDownloadable()) {
             if (!multipolygonRelation.isNew() && multipolygonRelation.isIncomplete()) {
-                MainApplication.worker.submit(
-                        new DownloadRelationTask(Collections.singleton(multipolygonRelation), editLayer));
+                MainApplication.worker
+                        .submit(new DownloadRelationTask(Collections.singleton(multipolygonRelation), editLayer));
             } else if (multipolygonRelation.hasIncompleteMembers()) {
-                MainApplication.worker.submit(new DownloadRelationMemberTask(multipolygonRelation,
-                        Utils.filteredCollection(
-                            DownloadSelectedIncompleteMembersAction.buildSetOfIncompleteMembers(
-                                    Collections.singleton(multipolygonRelation)), OsmPrimitive.class),
-                        editLayer));
+                // with complex relations the download of the full relation is much faster than download of almost all members, see #18341
+                SubclassFilteredCollection<IPrimitive, OsmPrimitive> incompleteMembers = Utils
+                        .filteredCollection(DownloadSelectedIncompleteMembersAction.buildSetOfIncompleteMembers(
+                                Collections.singleton(multipolygonRelation)), OsmPrimitive.class);
+
+                if (incompleteMembers.size() <= MAX_MEMBERS_TO_DOWNLOAD) {
+                    MainApplication.worker
+                            .submit(new DownloadRelationMemberTask(multipolygonRelation, incompleteMembers, editLayer));
+                } else {
+                    MainApplication.worker
+                            .submit(new DownloadRelationTask(Collections.singleton(multipolygonRelation), editLayer));
+
+                }
             }
         }