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

Timestamp:

2012-07-12T08:45:22+02:00 (12 years ago)

Author:

framm

Message:

handle deleted nodes without lat/lon. apply patches from ticket; closes #7847

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Node.java (modified) (1 diff)
• io/OsmReader.java (modified) (1 diff)
• io/OsmWriter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -178 +178 @@
     void setDataset(DataSet dataSet) {
         super.setDataset(dataSet);
-        if (!isIncomplete() && (getCoor() == null || getEastNorth() == null))
+        if (!isIncomplete() && isVisible() && (getCoor() == null || getEastNorth() == null))
             throw new DataIntegrityProblemException("Complete node with null coordinates: " + toString() + get3892DebugInfo());
     }

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

@@ -178 +178 @@
     protected Node parseNode() throws XMLStreamException {
         NodeData nd = new NodeData();
-        nd.setCoor(new LatLon(Double.parseDouble(parser.getAttributeValue(null, "lat")), Double.parseDouble(parser.getAttributeValue(null, "lon"))));
+        String lat = parser.getAttributeValue(null, "lat");
+        String lon = parser.getAttributeValue(null, "lon");
+        if (lat != null && lon != null) {
+            nd.setCoor(new LatLon(Double.parseDouble(lat), Double.parseDouble(lon)));
+        }
         readCommon(nd);
         Node n = new Node(nd.getId(), nd.getVersion());

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

@@ -136 +136 @@
         if (n.isIncomplete()) return;
         addCommon(n, "node");
-        out.print(" lat='"+n.getCoor().lat()+"' lon='"+n.getCoor().lon()+"'");
+        if (n.getCoor() != null) { 
+            out.print(" lat='"+n.getCoor().lat()+"' lon='"+n.getCoor().lon()+"'");
+        } 
         if (!withBody) {
             out.println("/>");