Changeset 14763 in josm for trunk/src

Timestamp:

2019-02-05T17:18:01+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17279: improve performance when retrieving history

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmChangeTask.java (modified) (1 diff)
• gui/history/HistoryLoadTask.java (modified) (5 diffs)
• io/OsmServerHistoryReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java

@@ -138 +138 @@
         private HistoryLoaderAndListener(Map<OsmPrimitive, Date> toLoad) {
             this.toLoad = toLoad;
+            this.setChangesetDataNeeded(false);
             add(toLoad.keySet());
             // Updating process is done after all history requests have been made

trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

@@ -27 +27 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Logging;
 import org.xml.sax.SAXException;
 
@@ -53 +54 @@
     private HistoryDataSet loadedData;
     private OsmServerHistoryReader reader;
+    private boolean getChangesetData = true;
 
     /**
@@ -164 +166 @@
     protected void realRun() throws SAXException, IOException, OsmTransferException {
         loadedData = new HistoryDataSet();
+        int ticks = toLoad.size();
+        if (getChangesetData)
+            ticks *= 2;
         try {
-            progressMonitor.setTicksCount(2 * toLoad.size());
+            progressMonitor.setTicksCount(ticks);
             for (PrimitiveId pid: toLoad) {
                 if (canceled) {
@@ -184 +189 @@
         try {
             reader = new OsmServerHistoryReader(pid.getType(), pid.getUniqueId());
-            ds = loadHistory(reader, progressMonitor);
+            if (getChangesetData) {
+                ds = loadHistory(reader, progressMonitor);
+            } else {
+                ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false));
+            }
         } catch (OsmTransferException e) {
             if (canceled)
@@ -241 +250 @@
         return lastException;
     }
+
+    /**
+     * Determine if changeset information is needed. By default it is retrieved.
+     * @param b false means don't retrieve changeset data.
+     */
+    public void setChangesetDataNeeded(boolean b) {
+        getChangesetData = b;
+    }
 }

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

@@ -60 +60 @@
         progressMonitor.beginTask("");
         try {
-            progressMonitor.indeterminateSubTask(tr("Contacting OSM Server..."));
             final String urlStr = primitiveType.getAPIName() + '/' + id + "/history";
+            progressMonitor.indeterminateSubTask(tr("Contacting OSM Server for {0}", urlStr));
 
             try (InputStream in = getInputStream(urlStr, progressMonitor.createSubTaskMonitor(1, true))) {