Changeset 35944 in osm for applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java

Timestamp:

2022-03-23T00:11:16+01:00 (2 years ago)

Author:

taylor.smock

Message:

DirectDownload: fix #21935 and #21952

#21935: "Error fetching URL" when trying to download a GPS track

This was caused due to a change in where OSM stores GPX data files.
OSM now uses s3 buckets, and redirects using a signed URL. S3 does
not like multiple authentication methods.

#21952: Only the first tag in the Tags column in "Download Track" window is shown

This was caused due to only keeping the last encountered tag.

File:

• applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java (modified) (5 diffs)

applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java

@@ -5 +5 @@
 
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import org.openstreetmap.josm.actions.JosmAction;
@@ -20 +22 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.Shortcut;
 
 public class DirectDownload extends Plugin {
-
-    private DownloadAction openaction;
-
     /**
      * Will be invoked by JOSM to bootstrap the plugin
@@ -33 +33 @@
         super(info);
 
-        openaction = new DownloadAction();
-        MainMenu.add(MainApplication.getMenu().gpsMenu, openaction);
+        MainMenu.add(MainApplication.getMenu().gpsMenu, new DownloadAction());
     }
 
     static class DownloadAction extends JosmAction {
         DownloadAction() {
-            super(tr("Download Track ..."), "DownloadAction",
-                    tr("Download GPX track from openstreetmap.org"), null, false);
+            super(tr("Download Track ..."), "DownloadAction", tr("Download GPX track from openstreetmap.org"),
+                    Shortcut.registerShortcut("directdownload:downloadgpxaction", tr("DirectDownload: Download GPX Track"),
+                            KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false);
         }
 
@@ -48 +48 @@
             go.setVisible(true);
 
-            ArrayList<UserTrack> tracks = go.getSelectedUserTracks();
+            List<UserTrack> tracks = go.getSelectedUserTracks();
 
             if (!((go.getValue() == 1) && (tracks != null))) {
@@ -84 +84 @@
                 if (Config.getPref().getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {
                     MarkerLayer ml = new MarkerLayer(data, tr("Markers from {0}", track.filename), null, gpxLayer);
-                    if (ml.data.size() > 0) {
+                    if (!ml.data.isEmpty()) {
                         MainApplication.getLayerManager().addLayer(ml);
                     }