Changeset 5345 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-07-15T16:34:27+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7857 - Mark osmChange primitives inside <modify> block as modified + allow to load remote .osc files

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmBzip2Task.java (modified) (2 diffs)
• actions/downloadtasks/DownloadOsmChangeTask.java (modified) (2 diffs)
• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• io/OsmChangeReader.java (modified) (5 diffs)

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

@@ -3 +3 @@
 
 import java.util.concurrent.Future;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.Main;
@@ -49 +47 @@
         currentBounds = null;
         // Extract .osm.bz/bz2 filename from URL to set the new layer name
-        Matcher matcher = Pattern.compile("http://.*/(.*\\.osm.bz2?)").matcher(url);
-        newLayerName = matcher.matches() ? matcher.group(1) : null;
+        extractOsmFilename("http://.*/(.*\\.osm.bz2?)", url);
         return Main.worker.submit(downloadTask);
     }

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

@@ -36 +36 @@
     @Override
     public boolean acceptsUrl(String url) {
-        return url != null && url.matches("http://.*/api/0.6/changeset/\\p{Digit}+/download");
+        return url != null && (
+                url.matches("http://.*/api/0.6/changeset/\\p{Digit}+/download") // OSM API 0.6 changesets
+             || url.matches("http://.*/.*\\.osc")                               // Remote .osc files
+                );
     }
 
@@ -57 +60 @@
                 new OsmServerLocationReader(url),
                 progressMonitor);
+        // Extract .osc filename from URL to set the new layer name
+        extractOsmFilename("http://.*/(.*\\.osc)", url);
         return Main.worker.submit(downloadTask);
     }

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

@@ -76 +76 @@
         currentBounds = null;
         // Extract .osm filename from URL to set the new layer name
-        Matcher matcher = Pattern.compile("http://.*/(.*\\.osm)").matcher(url);
+        extractOsmFilename("http://.*/(.*\\.osm)", url);
+        return Main.worker.submit(downloadTask);
+    }
+    
+    protected final void extractOsmFilename(String pattern, String url) {
+        Matcher matcher = Pattern.compile(pattern).matcher(url);
         newLayerName = matcher.matches() ? matcher.group(1) : null;
-        return Main.worker.submit(downloadTask);
     }
     

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

@@ -4 +4 @@
 
 import java.io.InputStream;
+import java.util.Arrays;
 
 import javax.xml.stream.XMLStreamConstants;
@@ -14 +15 @@
 public class OsmChangeReader extends OsmReader {
 
+    public static final String[] ACTIONS = {"create", "modify", "delete"};
+    
     /**
      * constructor (for private and subclasses use only)
@@ -46 +49 @@
             int event = parser.next();
             if (event == XMLStreamConstants.START_ELEMENT) {
-                if (parser.getLocalName().equals("create")) {
-                    parseCreate();
-                } else if (parser.getLocalName().equals("modify")) {
-                    parseModify();
-                } else if (parser.getLocalName().equals("delete")) {
-                    parseDelete();
+                if (Arrays.asList(ACTIONS).contains(parser.getLocalName())) {
+                    parseCommon(parser.getLocalName());
                 } else {
                     parseUnknown();
@@ -61 +60 @@
     }
 
-    private void parseDelete() throws XMLStreamException {
-        parseCommon(true);
-    }
-
-    private void parseModify() throws XMLStreamException {
-        parseCommon(false);
-    }
-
-    private void parseCreate() throws XMLStreamException {
-        parseCommon(false);
-    }
-
-    private void parseCommon(boolean deletePrimitive) throws XMLStreamException {
+    private void parseCommon(String action) throws XMLStreamException {
         while (parser.hasNext()) {
             int event = parser.next();
@@ -87 +74 @@
                     parseUnknown();
                 }
-                if (p != null && deletePrimitive) {
-                    p.setDeleted(true);
+                if (p != null && action != null) {
+                    if (action.equals("modify")) {
+                        p.setModified(true);
+                    } else if (action.equals("delete")) {
+                        p.setDeleted(true);
+                    }
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {