Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
- Timestamp:
- 2015-06-20T23:42:21+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
r8444 r8510 82 82 } else if (url.matches(PATTERN_TRACKPOINTS_BBOX)) { 83 83 String[] table = url.split("\\?|=|&"); 84 for (int i = 0; i <table.length; i++) {85 if ("bbox".equals(table[i]) && i <table.length-1)84 for (int i = 0; i < table.length; i++) { 85 if ("bbox".equals(table[i]) && i < table.length-1) 86 86 return download(newLayer, new Bounds(table[i+1], ",", ParseMethod.LEFT_BOTTOM_RIGHT_TOP), progressMonitor); 87 87 } … … 115 115 ProgressMonitor subMonitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false); 116 116 rawData = reader.parseRawGps(subMonitor); 117 } catch (Exception e) {117 } catch (Exception e) { 118 118 if (isCanceled()) 119 119 return; … … 160 160 boolean merge = Main.pref.getBoolean("download.gps.mergeWithLocal", false); 161 161 Layer active = Main.map.mapView.getActiveLayer(); 162 if (active instanceof GpxLayer && (merge || ((GpxLayer) active).data.fromServer))162 if (active instanceof GpxLayer && (merge || ((GpxLayer) active).data.fromServer)) 163 163 return (GpxLayer) active; 164 164 for (GpxLayer l : Main.map.mapView.getLayersOfType(GpxLayer.class)) {
Note:
See TracChangeset
for help on using the changeset viewer.