Changeset 2441 in josm for trunk/src

Timestamp:

2009-11-12T22:09:45+01:00 (15 years ago)

Author:

jttt

Message:

Make sure primitive is returned only once by QuadBuckets.search (search_cache was changed during search call which sometimes caused QLevel to be scanned again)

File:

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

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

@@ -361 +361 @@
         private List<T> search_contents(BBox search_bbox)
         {
-            String size = "null";
-            if (content != null) {
-                size = ""+content.size();
-            }
-            if (debug) {
-                out("searching contents (size: "+size+") for " + search_bbox);
+            if (debug) {
+                out("searching contents (size: " + content == null?"<null>":content.size() + ") for " + search_bbox);
             }
             /*
@@ -441 +437 @@
         boolean hasContent()
         {
-            if (content == null)
-                return false;
-            return true;
+            return content != null;
         }
         QBLevel nextSibling()
@@ -469 +463 @@
             QBLevel ret = null;
             for (QBLevel child : this.children) {
-                if (child == null)
+                if (child == null) {
                     continue;
+                }
                 ret = child;
                 break;
@@ -494 +489 @@
                     out("["+next.level+"] next node ("+next+") is a branch (content: "+next.hasContent()+"), moving down...");
                 }
-                if (child == null)
+                if (child == null) {
                     abort("branch node had no children");
+                }
                 next = child;
             }
@@ -1105 +1101 @@
     {
         BBox bbox = new BBox(point.lon() - radius, point.lat() - radius,
-                             point.lon() + radius, point.lat() + radius);
+                point.lon() + radius, point.lat() + radius);
         if (debug) {
             out("search bbox before sanity: " +  bbox);
@@ -1169 +1165 @@
             search_cache = root;
         }
+
+        // Save parent because search_cache might change during search call
+        QBLevel tmp = search_cache.parent;
+
         ret = search_cache.search(search_bbox);
         if (ret == null) {
             ret = new ArrayList<T>();
         }
+
         // A way that spans this bucket may be stored in one
         // of the nodes which is a parent of the search cache
-        QBLevel tmp = search_cache.parent;
         while (tmp != null) {
             List<T> content_result = tmp.search_contents(search_bbox);
@@ -1188 +1188 @@
         return ret;
     }
+
+    public void printTree() {
+        printTreeRecursive(root, 0);
+    }
+
+    private void printTreeRecursive(QBLevel level, int indent) {
+        if (level == null) {
+            printIndented(indent, "<empty child>");
+            return;
+        }
+        printIndented(indent, level);
+        if (level.hasContent()) {
+            for (T o:level.content) {
+                printIndented(indent, o);
+            }
+        }
+        if (level.children != null) {
+            for (QBLevel child:level.children) {
+                printTreeRecursive(child, indent + 2);
+            }
+        }
+    }
+
+    private void printIndented(int indent, Object msg) {
+        for (int i=0; i<indent; i++) {
+            System.out.print(' ');
+        }
+        System.out.println(msg);
+    }
 }