Changeset 4530 in josm

Timestamp:

20.10.2011 04:45:57 (7 months ago)

Author:

Don-vip

Message:

see #6653 and #6960 - Allow JOSM to download osmChange files again

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenLocationAction.java (modified) (2 diffs)
• actions/downloadtasks/DownloadOsmChangeTask.java (added)
• actions/downloadtasks/DownloadOsmTask.java (modified) (5 diffs)
• io/OsmChangeReader.java (added)
• io/OsmReader.java (modified) (18 diffs)
• io/OsmServerLocationReader.java (modified) (1 diff)
• io/OsmServerReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -23 +23 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmChangeTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
@@ -51 +52 @@
         addDownloadTaskClass(DownloadOsmTask.class);
         addDownloadTaskClass(DownloadGpsTask.class);
+        addDownloadTaskClass(DownloadOsmChangeTask.class);
     }
 

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

@@ -33 +33 @@
     protected DataSet downloadedData;
     protected DownloadTask downloadTask;
+    
+    protected OsmDataLayer targetLayer;
 
     protected void rememberDownloadedData(DataSet ds) {
@@ -79 +81 @@
     }
 
-     protected  class DownloadTask extends PleaseWaitRunnable {
+    protected class DownloadTask extends PleaseWaitRunnable {
         protected OsmServerReader reader;
         protected DataSet dataSet;
@@ -89 +91 @@
             this.newLayer = newLayer;
         }
+        
+        protected DataSet parseDataSet() throws OsmTransferException {
+            return reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+        }
 
         @Override public void realRun() throws IOException, SAXException, OsmTransferException {
@@ -94 +100 @@
                 if (isCanceled())
                     return;
-                dataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+                dataSet = parseDataSet();
             } catch(Exception e) {
                 if (isCanceled()) {
@@ -161 +167 @@
                 // or it is not clear which layer to merge to
                 //
-                OsmDataLayer layer = createNewLayer();
+                targetLayer = createNewLayer();
                 final boolean isDisplayingMapView = Main.isDisplayingMapView();
 
-                Main.main.addLayer(layer);
+                Main.main.addLayer(targetLayer);
 
                 // If the mapView is not there yet, we cannot calculate the bounds (see constructor of MapView).
                 // Otherwise jump to the current download.
                 if (isDisplayingMapView) {
-                    BoundingXYVisitor v = new BoundingXYVisitor();
-                    if (currentBounds != null) {
-                        v.visit(currentBounds);
-                    } else {
-                        v.computeBoundingBox(dataSet.getNodes());
-                    }
-                    Main.map.mapView.recalculateCenterScale(v);
+                    computeBboxAndCenterScale();
                 }
             } else {
-                OsmDataLayer target;
-                target = getEditLayer();
-                if (target == null) {
-                    target = getFirstDataLayer();
-                }
-                target.mergeFrom(dataSet);
-                BoundingXYVisitor v = new BoundingXYVisitor();
-                if (currentBounds != null) {
-                    v.visit(currentBounds);
-                } else {
-                    v.computeBoundingBox(dataSet.getNodes());
-                }
-                Main.map.mapView.recalculateCenterScale(v);
-                target.onPostDownloadFromServer();
-            }
+                targetLayer = getEditLayer();
+                if (targetLayer == null) {
+                    targetLayer = getFirstDataLayer();
+                }
+                targetLayer.mergeFrom(dataSet);
+                computeBboxAndCenterScale();
+                targetLayer.onPostDownloadFromServer();
+            }
+        }
+        
+        protected void computeBboxAndCenterScale() {
+            BoundingXYVisitor v = new BoundingXYVisitor();
+            if (currentBounds != null) {
+                v.visit(currentBounds);
+            } else {
+                v.computeBoundingBox(dataSet.getNodes());
+            }
+            Main.map.mapView.recalculateCenterScale(v);
         }
 

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

@@ -12 +12 @@
 import java.util.regex.Pattern;
 
+import javax.xml.stream.Location;
 import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.Location;
+import javax.xml.stream.XMLStreamReader;
 
 import org.openstreetmap.josm.data.Bounds;
@@ -48 +48 @@
 public class OsmReader extends AbstractReader {
 
-    private XMLStreamReader parser;
+    protected XMLStreamReader parser;
 
     /**
-     * constructor (for private use only)
+     * constructor (for private and subclasses use only)
      *
      * @see #parseDataSet(InputStream, DataSet, ProgressMonitor)
      */
-    private OsmReader() {
-    }
-
-    public void setParser(XMLStreamReader parser) {
+    protected OsmReader() {
+    }
+
+    protected void setParser(XMLStreamReader parser) {
         this.parser = parser;
     }
@@ -66 +66 @@
     }
 
-    public void parse() throws XMLStreamException {
+    protected void parse() throws XMLStreamException {
         int event = parser.getEventType();
         while (true) {
             if (event == XMLStreamConstants.START_ELEMENT) {
-                if (parser.getLocalName().equals("osm") || parser.getLocalName().equals("osmChange")) {
-                    parseOsm();
-                } else {
-                    parseUnkown();
-                }
+                parseRoot();
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 return;
@@ -85 +81 @@
         }
         parser.close();
+    }
+    
+    protected void parseRoot() throws XMLStreamException {
+        if (parser.getLocalName().equals("osm")) {
+            parseOsm();
+        } else {
+            parseUnknown();
+        }
     }
 
@@ -115 +119 @@
                     parseChangeset(uploadChangesetId);
                 } else {
-                    parseUnkown();
+                    parseUnknown();
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
@@ -152 +156 @@
     }
 
-    private void parseNode() throws XMLStreamException {
+    protected void parseNode() throws XMLStreamException {
         NodeData nd = new NodeData();
         nd.setCoor(new LatLon(Double.parseDouble(parser.getAttributeValue(null, "lat")), Double.parseDouble(parser.getAttributeValue(null, "lon"))));
@@ -166 +170 @@
                     parseTag(n);
                 } else {
-                    parseUnkown();
+                    parseUnknown();
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
@@ -174 +178 @@
     }
 
-    private void parseWay() throws XMLStreamException {
+    protected void parseWay() throws XMLStreamException {
         WayData wd = new WayData();
         readCommon(wd);
@@ -191 +195 @@
                     parseTag(w);
                 } else {
-                    parseUnkown();
+                    parseUnknown();
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
@@ -220 +224 @@
     }
 
-    private void parseRelation() throws XMLStreamException {
+    protected void parseRelation() throws XMLStreamException {
         RelationData rd = new RelationData();
         readCommon(rd);
@@ -237 +241 @@
                     parseTag(r);
                 } else {
-                    parseUnkown();
+                    parseUnknown();
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
@@ -293 +297 @@
                         parseTag(uploadChangeset);
                     } else {
-                        parseUnkown();
+                        parseUnknown();
                     }
                 } else if (event == XMLStreamConstants.END_ELEMENT) {
@@ -314 +318 @@
     }
 
-    private void parseUnkown(boolean printWarning) throws XMLStreamException {
+    protected void parseUnknown(boolean printWarning) throws XMLStreamException {
         if (printWarning) {
             System.out.println(tr("Undefined element ''{0}'' found in input stream. Skipping.", parser.getLocalName()));
@@ -321 +325 @@
             int event = parser.next();
             if (event == XMLStreamConstants.START_ELEMENT) {
-                parseUnkown(false); /* no more warning for inner elements */
+                parseUnknown(false); /* no more warning for inner elements */
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 return;
@@ -328 +332 @@
     }
 
-    private void parseUnkown() throws XMLStreamException {
-        parseUnkown(true);
+    protected void parseUnknown() throws XMLStreamException {
+        parseUnknown(true);
     }
 
@@ -343 +347 @@
             int event = parser.next();
             if (event == XMLStreamConstants.START_ELEMENT) {
-                parseUnkown(printWarning);
+                parseUnknown(printWarning);
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 return;
@@ -531 +535 @@
     }
 
+    protected DataSet doParseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
+        if (progressMonitor == null) {
+            progressMonitor = NullProgressMonitor.INSTANCE;
+        }
+        CheckParameterUtil.ensureParameterNotNull(source, "source");
+        try {
+            progressMonitor.beginTask(tr("Prepare OSM data...", 2));
+            progressMonitor.indeterminateSubTask(tr("Parsing OSM data..."));
+
+            InputStreamReader ir = UTFInputStreamReader.create(source, "UTF-8");
+            XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(ir);
+            setParser(parser);
+            parse();
+            progressMonitor.worked(1);
+
+            progressMonitor.indeterminateSubTask(tr("Preparing data set..."));
+            prepareDataSet();
+            progressMonitor.worked(1);
+            return getDataSet();
+        } catch(IllegalDataException e) {
+            throw e;
+        } catch(OsmParsingException e) {
+            throw new IllegalDataException(e.getMessage(), e);
+        } catch(XMLStreamException e) {
+            String msg = e.getMessage();
+            Pattern p = Pattern.compile("Message: (.+)");
+            Matcher m = p.matcher(msg);
+            if (m.find()) {
+                msg = m.group(1);
+            }
+            if (e.getLocation() != null) {
+                throw new IllegalDataException(tr("Line {0} column {1}: ", e.getLocation().getLineNumber(), e.getLocation().getColumnNumber()) + msg, e);
+            } else {
+                throw new IllegalDataException(msg, e);
+            }
+        } catch(Exception e) {
+            throw new IllegalDataException(e);
+        } finally {
+            progressMonitor.finishTask();
+        }
+    }
+    
     /**
      * Parse the given input source and return the dataset.
@@ -542 +588 @@
      */
     public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
-        if (progressMonitor == null) {
-            progressMonitor = NullProgressMonitor.INSTANCE;
-        }
-        CheckParameterUtil.ensureParameterNotNull(source, "source");
-        OsmReader reader = new OsmReader();
-        try {
-            progressMonitor.beginTask(tr("Prepare OSM data...", 2));
-            progressMonitor.indeterminateSubTask(tr("Parsing OSM data..."));
-
-            InputStreamReader ir = UTFInputStreamReader.create(source, "UTF-8");
-            XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(ir);
-            reader.setParser(parser);
-            reader.parse();
-            progressMonitor.worked(1);
-
-            progressMonitor.indeterminateSubTask(tr("Preparing data set..."));
-            reader.prepareDataSet();
-            progressMonitor.worked(1);
-            return reader.getDataSet();
-        } catch(IllegalDataException e) {
-            throw e;
-        } catch(OsmParsingException e) {
-            throw new IllegalDataException(e.getMessage(), e);
-        } catch(XMLStreamException e) {
-            String msg = e.getMessage();
-            Pattern p = Pattern.compile("Message: (.+)");
-            Matcher m = p.matcher(msg);
-            if (m.find()) {
-                msg = m.group(1);
-            }
-            if (e.getLocation() != null) {
-                throw new IllegalDataException(tr("Line {0} column {1}: ", e.getLocation().getLineNumber(), e.getLocation().getColumnNumber()) + msg, e);
-            } else {
-                throw new IllegalDataException(msg, e);
-            }
-        } catch(Exception e) {
-            throw new IllegalDataException(e);
-        } finally {
-            progressMonitor.finishTask();
-        }
+        return new OsmReader().doParseDataSet(source, progressMonitor);
     }
 }

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

@@ -48 +48 @@
     }
 
+    /* (non-Javadoc)
+     * @see org.openstreetmap.josm.io.OsmServerReader#parseOsmChange(org.openstreetmap.josm.gui.progress.ProgressMonitor)
+     */
+    @Override
+    public DataSet parseOsmChange(ProgressMonitor progressMonitor)
+            throws OsmTransferException {
+        InputStream in = null;
+        progressMonitor.beginTask(tr("Contacting Server...", 10));
+        try {
+            in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
+            if (in == null)
+                return null;
+            progressMonitor.subTask(tr("Downloading OSM data..."));
+            return OsmChangeReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
+        } catch(OsmTransferException e) {
+            throw e;
+        } catch (Exception e) {
+            if (cancel)
+                return null;
+            throw new OsmTransferException(e);
+        } finally {
+            progressMonitor.finishTask();
+            try {
+                activeConnection = null;
+                if (in != null) {
+                    in.close();
+                }
+            } catch(Exception e) {/* ignore it */}
+        }
+    }
+
     @Override
     public GpxData parseRawGps(ProgressMonitor progressMonitor) throws OsmTransferException {

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

@@ -142 +142 @@
     public abstract DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException;
 
+    public DataSet parseOsmChange(ProgressMonitor progressMonitor) throws OsmTransferException {
+        return null;
+    }
+    
     public GpxData parseRawGps(ProgressMonitor progressMonitor) throws OsmTransferException {
         return null;