Changeset 18868 in josm for trunk/src

Timestamp:

2023-10-12T22:32:39+02:00 (8 months ago)

Author:

taylor.smock

Message:

See #16207: Keep track of download area for notes

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadNotesTask.java (modified) (4 diffs)
• data/osm/NoteData.java (modified) (4 diffs)

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

@@ -13 +13 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.ViewportData;
@@ -73 +74 @@
     @Override
     public Future<?> download(DownloadParams settings, Bounds downloadArea, ProgressMonitor progressMonitor) {
-        downloadTask = new DownloadBoundingBoxTask(new BoundingBoxDownloader(downloadArea), progressMonitor);
+        downloadTask = new DownloadBoundingBoxTask(downloadArea, progressMonitor);
         return MainApplication.worker.submit(downloadTask);
     }
@@ -145 +146 @@
 
             noteLayer = new NoteLayer(notesData, tr("Notes"));
+            if (this instanceof DownloadBoundingBoxTask && ((DownloadBoundingBoxTask) this).bounds != null) {
+                noteLayer.getNoteData().addDataSource(new DataSource(((DownloadBoundingBoxTask) this).bounds, "OpenStreetMap server"));
+            }
             NoteLayer l = MainApplication.getLayerManager().getNoteLayer();
             if (l != null) {
@@ -170 +174 @@
 
     class DownloadBoundingBoxTask extends DownloadTask {
+        private Bounds bounds;
+
+        DownloadBoundingBoxTask(Bounds bounds, ProgressMonitor progressMonitor) {
+            this(new BoundingBoxDownloader(bounds), progressMonitor);
+            this.bounds = bounds;
+        }
 
         DownloadBoundingBoxTask(OsmServerReader reader, ProgressMonitor progressMonitor) {

trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

@@ -7 +7 @@
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.openstreetmap.josm.data.Data;
@@ -53 +55 @@
     private final ListenerList<NoteDataUpdateListener> listeners = ListenerList.create();
 
+    private final Set<DataSource> dataSourceSet = new HashSet<>();
+
     /**
      * Construct a new note container without notes
@@ -140 +144 @@
         if (this != from) {
             addNotes(from.noteList);
+            from.getDataSources().forEach(this::addDataSource);
         }
     }
@@ -315 +320 @@
     @Override
     public Collection<DataSource> getDataSources() {
-        return Collections.emptyList(); // Notes don't currently store data sources
+        return Collections.unmodifiableSet(this.dataSourceSet);
+    }
+
+    /**
+     * Adds a new data source.
+     * @param source data source to add
+     * @return {@code true} if the collection changed as a result of the call
+     * @since 18868
+     */
+    public synchronized boolean addDataSource(DataSource source) {
+        return this.dataSourceSet.add(source);
     }
 }