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

Timestamp:

2020-01-06T20:05:34+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18494 - GPX layers should use the name from the file instead of Downloaded GPX Data whenever possible (patch by taylor.smock, modified)

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) (7 diffs)

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.Bounds.ParseMethod;
 import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -34 +35 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
@@ -44 +46 @@
     private GpxLayer gpxLayer;
 
-    protected String newLayerName;
+    protected String url;
 
     @Override
@@ -68 +70 @@
     public Future<?> loadUrl(DownloadParams settings, String url, ProgressMonitor progressMonitor) {
         CheckParameterUtil.ensureParameterNotNull(url, "url");
+        this.url = url;
         final Optional<String> mappedUrl = Stream.of(GpxUrlPattern.USER_TRACE_ID, GpxUrlPattern.EDIT_TRACE_ID)
                 .map(p -> Pattern.compile(p.pattern()).matcher(url))
@@ -81 +84 @@
             downloadTask = new DownloadTask(settings,
                     new OsmServerLocationReader(url), progressMonitor);
-            // Extract .gpx filename from URL to set the new layer name
-            Matcher matcher = Pattern.compile(GpxUrlPattern.EXTERNAL_GPX_FILE.pattern()).matcher(url);
-            newLayerName = matcher.matches() ? matcher.group(1) : null;
             // We need submit instead of execute so we can wait for it to finish and get the error
             // message if necessary. If no one calls getErrorMessage() it just behaves like execute.
@@ -139 +139 @@
             if (rawData == null)
                 return;
-            String name = newLayerName != null ? newLayerName : tr("Downloaded GPX Data");
+            String name = getLayerName();
 
             GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name,
@@ -149 +149 @@
 
             layers.getPostLayerTask().run();
+        }
+
+        private String getLayerName() {
+            // Extract .gpx filename from URL to set the new layer name
+            final Matcher matcher = Pattern.compile(GpxUrlPattern.EXTERNAL_GPX_FILE.pattern()).matcher(url);
+            final String newLayerName = matcher.matches() ? matcher.group(1) : null;
+            final String metadataName = rawData != null ? rawData.getString(GpxConstants.META_NAME) : null;
+            final String defaultName = tr("Downloaded GPX Data");
+
+            if (Config.getPref().getBoolean("gpx.prefermetadataname", false)) {
+                return Utils.firstNotEmptyString(defaultName, metadataName, newLayerName);
+            } else {
+                return Utils.firstNotEmptyString(defaultName, newLayerName, metadataName);
+            }
         }