Changeset 1196 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2008-12-31T12:35:50+01:00 (15 years ago)

Author:

stoecker

Message:

partly fix #1720. Patch by Russ Nelson

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (4 diffs)

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

@@ -60 +60 @@
       */
      private DataSet ds = new DataSet();
+     public DataSet getDs() { return ds; }
+
+     /**
+      * Record warnings.  If there were any data inconsistencies, append
+      * a newline-terminated string.
+      */
+     private String parseNotes = new String();
+     public String getParseNotes() {
+         return parseNotes;
+     }
 
      /**
@@ -333 +343 @@
                     Node n = findNode(id);
                     if (n == null) {
+                         parseNotes += tr("Skipping a way because it includes a node that doesn't exist: {0}\n", id);
                          failed = true;
                          break;
@@ -435 +446 @@
       */
      public static DataSet parseDataSet(InputStream source, DataSet ref, PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
+          return parseDataSetOsm(source, ref, pleaseWaitDlg).ds;
+     }
+
+     public static OsmReader parseDataSetOsm(InputStream source, DataSet ref, PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
           OsmReader osm = new OsmReader();
           osm.references = ref == null ? new DataSet() : ref;
@@ -468 +483 @@
                     o.id = 0;
 
-          return osm.ds;
+          return osm;
      }
 }