Changeset 6215 in josm for trunk/src/org

Timestamp:

2013-09-04T00:37:59+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9042 - Robustness to invalid .osm files containing null coordinates

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (2 diffs)
• command/MoveCommand.java (modified) (2 diffs)
• data/osm/AbstractPrimitive.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -37 +37 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -698 +699 @@
             }
             for (Node n : affectedNodes) {
-                if (n.getCoor().isOutSideWorld()) {
+                LatLon ll = n.getCoor();
+                if (ll != null && ll.isOutSideWorld()) {
                     // Revert move
                     ((MoveCommand) c).resetToCheckpoint();

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -151 +151 @@
         for (Node n : nodes) {
             OldNodeState os = it.next();
-            n.setEastNorth(os.eastNorth.add(x, y));
+            if (os.eastNorth != null) {
+                n.setEastNorth(os.eastNorth.add(x, y));
+            }
         }
     }
@@ -160 +162 @@
             if (n == null)
                 throw new AssertionError("null detected in node list");
-            if (n.getEastNorth() == null)
-                throw new AssertionError("null coordinates detected in node list");
-
-            n.setEastNorth(n.getEastNorth().add(x, y));
-            n.setModified(true);
+            EastNorth en = n.getEastNorth();
+            if (en != null) {
+                n.setEastNorth(en.add(x, y));
+                n.setModified(true);
+            }
         }
         return true;

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

@@ -267 +267 @@
             throw new IllegalStateException(tr("Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is {0}", changesetId));
 
-        int old = this.changesetId;
         this.changesetId = changesetId;
     }
@@ -716 +715 @@
      * @param key the key forming the tag.
      * @param values one or many values forming the tag.
-     * @return true iff primitive contains a tag consisting of {@code key} and any of {@code values}.
+     * @return true if primitive contains a tag consisting of {@code key} and any of {@code values}.
      */
     public boolean hasTag(String key, String... values) {