Changeset 6069 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
- Timestamp:
- 2013-07-17T00:01:07+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
r6031 r6069 126 126 return; 127 127 String name = newLayerName != null ? newLayerName : tr("Downloaded GPX Data"); 128 128 129 129 GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name, tr("Markers from {0}", name)); 130 130 131 131 GpxLayer gpxLayer = addOrMergeLayer(layers.getGpxLayer(), findGpxMergeLayer()); 132 132 addOrMergeLayer(layers.getMarkerLayer(), findMarkerMergeLayer(gpxLayer)); 133 133 134 134 layers.getPostLayerTask().run(); 135 135 } 136 136 137 137 private <L extends Layer> L addOrMergeLayer(L layer, L mergeLayer) { 138 138 if (layer == null) return null; … … 160 160 return null; 161 161 } 162 162 163 163 private MarkerLayer findMarkerMergeLayer(GpxLayer fromLayer) { 164 164 if (!Main.isDisplayingMapView()) … … 189 189 return null; 190 190 } 191 191 192 192 /** 193 193 * Determines if the given URL denotes an OSM gpx-related API call.
Note:
See TracChangeset
for help on using the changeset viewer.