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

Timestamp:

2009-11-12T23:17:52+01:00 (14 years ago)

Author:

hansendc

Message:

This should fix #3909

We created empty branches when we attempted to split a QB node
with ways in it and none of the ways could fit into a child.
The children were allocated before we knew that we had something
to put in them, and we ended up with an empty array of children.
That triggered this check.

So, defer child array allocation until we really need it.

File:

• trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified) (5 diffs)

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

@@ -281 +281 @@
                         + this.bbox.width()+", "+this.bbox.height()+")");
             }
-            if (children != null) {
-                abort("overwrote children");
-            }
-            children = newChildren();
             // deferring allocation of children until use
             // seems a bit faster
@@ -298 +294 @@
                     continue;
                 }
+                if (children == null)
+                    children = newChildren();
                 if (children[new_index] == null) {
                     children[new_index] = new QBLevel(this, new_index);
@@ -357 +355 @@
         boolean matches(T o, BBox search_bbox)
         {
+            // This can be optimized when o is a node
+            //return search_bbox.bounds(coor));
             return o.getBBox().intersects(search_bbox);
         }
@@ -490 +490 @@
                 }
                 if (child == null) {
-                    abort("branch node had no children");
+                    abort("branch node ("+this+" "+next.isLeaf()+") had no children (content: "+next.content+") this: " + this);
                 }
                 next = child;
@@ -568 +568 @@
                     debug = true;
                     get_index(n, level);
-                    abort("object " + n + " does not belong in node at level: " + level + " bbox: " + this.bbox());
+                    get_index(n, level-1);
+                    int nr = 0;
+                    for (QBLevel sibling : parent.children) {
+                        out("sibling["+ (nr++) +"]: " + sibling.bbox() + " this: " + (this==sibling));
+                    }
+                    abort("\nobject " + n + " does not belong in node at level: " + level + " bbox: " + this.bbox());
                 }
             }