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

Timestamp:

2010-03-29T21:34:13+02:00 (15 years ago)

Author:

bastiK

Message:

fixed #4815 (after [3154] you cannot remove a node from quadbuckets if the coordinates have changed -> first remove the node from quadbuckets then change the coordinates then add it back)

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• BBox.java (modified) (1 diff)
• DataSet.java (modified) (1 diff)
• Node.java (modified) (2 diffs)

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

@@ -46 +46 @@
             }
             add(coor);
+        }
+    }
+
+    public BBox(Node n) {
+        LatLon coor = n.getCoor();
+        if (coor == null) {
+            xmin = xmax = ymin = ymax = 0;
+        } else {
+            xmin = xmax = coor.lon();
+            ymin = ymax = coor.lat();
         }
     }

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

@@ -767 +767 @@
     private void reindexNode(Node node) {
         nodes.remove(node);
+        node.updatePosition();
         nodes.add(node);
         for (OsmPrimitive primitive: node.getReferrers()) {

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

@@ -15 +15 @@
 
     private CachedLatLon coor;
+    private BBox bbox;
 
     public final void setCoor(LatLon coor) {
@@ -186 +187 @@
     @Override
     public BBox getBBox() {
-        if (coor == null)
-            return new BBox(0, 0, 0, 0);
-        else
-            return new BBox(coor, coor);
+        if (getDataSet() == null)
+            return new BBox(this);
+        if (bbox == null) {
+            bbox = new BBox(this);
+        }
+        return new BBox(bbox);
     }
 
     @Override
     public void updatePosition() {
-        // Do nothing for now, but in future replace CachedLatLon with simple doubles and update precalculated EastNorth value here
+        bbox = new BBox(this);
+        // TODO: replace CachedLatLon with simple doubles and update precalculated EastNorth value here
     }