Index: applications/editors/josm/plugins/DirectDownload/build.xml
===================================================================
--- applications/editors/josm/plugins/DirectDownload/build.xml (revision 35943)
+++ applications/editors/josm/plugins/DirectDownload/build.xml (revision 35944)
@@ -13,4 +13,5 @@
+
Index: applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java
===================================================================
--- applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java (revision 35943)
+++ applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java (revision 35944)
@@ -5,6 +5,8 @@
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,9 +22,7 @@
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,12 +33,12 @@
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,5 +48,5 @@
go.setVisible(true);
- ArrayList tracks = go.getSelectedUserTracks();
+ List tracks = go.getSelectedUserTracks();
if (!((go.getValue() == 1) && (tracks != null))) {
@@ -84,5 +84,5 @@
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);
}
Index: applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java
===================================================================
--- applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java (revision 35943)
+++ applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java (revision 35944)
@@ -105,11 +105,13 @@
}
- public ArrayList getSelectedUserTracks() {
- ArrayList DataArray = model.getDataArrayList();
+ public List getSelectedUserTracks() {
+ List dataArray = model.getDataArrayList();
int[] selected = tblSearchResults.getSelectedRows();
- ArrayList selectedTracks = new ArrayList<>(selected.length);
- for (int i = 0; i < selected.length; i++) {
- selectedTracks.add(DataArray.get(selected[i]));
- }
+ List selectedTracks = new ArrayList<>(selected.length);
+
+ for (int i : selected) {
+ selectedTracks.add(dataArray.get(i));
+ }
+
return selectedTracks;
}
@@ -121,5 +123,5 @@
static class NamedResultTableColumnModel extends DefaultTableColumnModel {
protected void createColumns() {
- TableColumn col = null;
+ TableColumn col;
NamedResultCellRenderer renderer = new NamedResultCellRenderer();
@@ -207,5 +209,5 @@
case 3:
- setText(sr.tags);
+ setText(String.join(";", sr.tags));
break;
Index: applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/GpxServerReader.java
===================================================================
--- applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/GpxServerReader.java (revision 35943)
+++ applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/GpxServerReader.java (revision 35944)
@@ -23,9 +23,16 @@
public GpxData loadGpx(final long id) {
- final String urlString = OsmApi.getOsmApi().getBaseUrl() + "gpx/" + id + "/data";
+ return fetchUrl(OsmApi.getOsmApi().getBaseUrl() + "gpx/" + id + "/data");
+ }
+ private GpxData fetchUrl(final String urlString) {
+ HttpClient client = null;
try {
- final HttpClient client = HttpClient.create(new URL(urlString));
- addAuth(client);
+ client = HttpClient.create(new URL(urlString));
+ // At some point OSM started hosting the files on Amazon S3. S3 does not like multiple authentication methods.
+ // See JOSM #21935.
+ if (!urlString.contains("X-Amz-Algorithm") && !urlString.contains("Signature")) {
+ addAuth(client);
+ }
try (InputStream in = client.connect().uncompressAccordingToContentDisposition(true).getContent()) {
@@ -34,9 +41,16 @@
if (!parsedProperly) {
JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
- tr("Error occurred while parsing gpx file {0}. Only a part of the file will be available.", urlString));
+ tr("Error occurred while parsing gpx file {0}. Only a part of the file will be available.",
+ urlString));
}
return r.getGpxData();
}
} catch (IOException | OsmTransferException e) {
+ if (client != null && client.getResponse() != null
+ && !client.getResponse().getURL().toExternalForm().equals(urlString) /* Check if we were redirected */
+ && client.getRequestHeader("Authorization") != null) {
+ // OK. We may have hit JOSM #21935.
+ return fetchUrl(client.getResponse().getURL().toExternalForm());
+ }
Logging.warn(e);
JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Error fetching URL {0}", urlString));
Index: applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrack.java
===================================================================
--- applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrack.java (revision 35943)
+++ applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrack.java (revision 35944)
@@ -1,4 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.plugins.directdownload;
+
+import java.util.ArrayList;
+import java.util.List;
class UserTrack {
@@ -6,5 +9,5 @@
public String filename;
public String description;
- public String tags;
+ public final List tags = new ArrayList<>();
public String datetime;
}
Index: applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrackReader.java
===================================================================
--- applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrackReader.java (revision 35943)
+++ applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrackReader.java (revision 35944)
@@ -66,5 +66,5 @@
@Override
- public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
+ public void startElement(String namespaceURI, String localName, String qName, Attributes atts) {
if (qName.equals("gpx_file")) {
UserTrack track = new UserTrack();
@@ -80,16 +80,15 @@
@Override
- public void characters(char[] ch, int start, int length)
- throws SAXException {
+ public void characters(char[] ch, int start, int length) {
cdata += new String(ch, start, length);
}
@Override
- public void endElement(String uri, String localName, String qName) throws SAXException {
+ public void endElement(String uri, String localName, String qName) {
if (qName.equals("description")) {
data.getFirst().description = cdata;
} else if (qName.equals("tag")) {
- data.getFirst().tags = cdata;
- cdata = new String();
+ data.getFirst().tags.add(cdata);
+ cdata = "";
}