Changeset 3107 in josm

Timestamp:

Mar 10, 2010 7:11:58 PM (3 years ago)

Author:

jttt

Message:

Fix #4624 Relations not rendered right away

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/Relation.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (modified) (1 diff)

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

@@ -334 +334 @@
     @Override
     public BBox getBBox() {
-        if (bbox == null) {
-            calculateBBox(new HashSet<PrimitiveId>());
+        if (getDataSet() == null)
+            return calculateBBox(new HashSet<PrimitiveId>());
+        else {
             if (bbox == null) {
-                bbox = new BBox(0, 0, 0, 0); // No members
-            }
-        }
-        return  bbox;
+                bbox = calculateBBox(new HashSet<PrimitiveId>());
+                if (bbox == null) {
+                    bbox = new BBox(0, 0, 0, 0); // No members
+                }
+            }
+            return  bbox;
+        }
     }
 
@@ -374 +378 @@
         super.setDataset(dataSet);
         checkMembers();
+        bbox = null; // bbox might have changed if relation was in ds, was removed, modified, added back to dataset
     }
 
@@ -401 +406 @@
     /**
      * Replies true if at least one child primitive is incomplete
-     * 
+     *
      * @return true if at least one child primitive is incomplete
      */
@@ -414 +419 @@
      * Replies a collection with the incomplete children this relation
      * refers to
-     * 
+     *
      * @return the incomplete children. Empty collection if no children are incomplete.
      */

trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java

@@ -65 +65 @@
     }
 
+    @Test
+    public void testBBoxNotInDataset() {
+        Node n1 = new Node(new LatLon(10, 10));
+        Node n2 = new Node(new LatLon(20, 20));
+        Way w1 = new Way();
+        w1.addNode(n1);
+        w1.addNode(n2);
+        Relation r1 = new Relation();
+        r1.getBBox();
+        r1.addMember(new RelationMember("", w1));
+
+        Assert.assertEquals(new BBox(w1), r1.getBBox());
+
+        DataSet ds = new DataSet();
+        ds.addPrimitive(n1);
+        ds.addPrimitive(n2);
+        ds.addPrimitive(w1);
+        ds.addPrimitive(r1);
+
+        Assert.assertEquals(new BBox(w1), r1.getBBox());
+
+        ds.removePrimitive(r1);
+
+        n1.setCoor(new LatLon(30, 40));
+        Assert.assertEquals(new BBox(w1), r1.getBBox());
+
+        ds.addPrimitive(r1);
+        Assert.assertEquals(new BBox(w1), r1.getBBox());
+    }
+
 }