Changeset 5745 in josm for trunk/src

Timestamp:

2013-02-25T21:47:20+01:00 (12 years ago)

Author:

Don-vip

Message:

see #8453 - Do not consider remote .gpx files as downloaded from OSM API server

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadGpsTask.java (modified) (1 diff)
• io/OsmServerLocationReader.java (modified) (2 diffs)

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

@@ -185 +185 @@
         return null;
     }
+    
+    /**
+     * Determines if the given URL denotes an OSM gpx-related API call.
+     * @param url The url to check
+     * @return true if the url matches "Trace ID" API call or "Trackpoints bbox" API call, false otherwise
+     * @see GpxData#fromServer
+     * @since 5745
+     */
+    public static final boolean isFromServer(String url) {
+        return url != null && (url.matches(PATTERN_TRACE_ID) || url.matches(PATTERN_TRACKPOINTS_BBOX));
+    }
 }

trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java

@@ -9 +9 @@
 
 import org.apache.tools.bzip2.CBZip2InputStream;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -168 +169 @@
                 gpxParsedProperly = reader.parse(false);
                 GpxData result = reader.getGpxData();
-                result.fromServer = true;
+                result.fromServer = DownloadGpsTask.isFromServer(url);
                 return result;
             }