Changeset 7531 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-09-13T00:40:11+02:00 (12 years ago)

Author:

bastiK

Message:

applied #10503 - Note download code (patch by ToeBee)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DownloadAction.java (modified) (2 diffs)
• OpenLocationAction.java (modified) (2 diffs)
• downloadtasks/DownloadNotesTask.java (added)

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

@@ -11 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
@@ -54 +55 @@
                 Main.worker.submit(new PostDownloadHandler(task, future));
             }
+
+            //TODO: This eventually needs to be a checkbox in the UI
+            //For now I'm adding it as a hidden feature since this is still a work in progress
+            if (Main.pref.getBoolean("osm.notes.enableDownload", false)) {
+                DownloadNotesTask task = new DownloadNotesTask();
+                Future<?> future = task.download(false, area, null);
+                Main.worker.submit(new PostDownloadHandler(task, future));
+            }
         }
     }

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

@@ -23 +23 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmChangeCompressedTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmChangeTask;
@@ -59 +60 @@
         addDownloadTaskClass(DownloadOsmTask.class);
         addDownloadTaskClass(DownloadGpsTask.class);
+        addDownloadTaskClass(DownloadNotesTask.class);
         addDownloadTaskClass(DownloadOsmChangeTask.class);
         addDownloadTaskClass(DownloadOsmUrlTask.class);