Changeset 2437 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-11-11T08:34:56+01:00 (14 years ago)

Author:

jttt

Message:

Cache bbox for Way

Location:

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

Files:

• DataSet.java (modified) (1 diff)
• Node.java (modified) (4 diffs)
• OsmPrimitive.java (modified) (1 diff)
• QuadBuckets.java (modified) (2 diffs)
• Relation.java (modified) (1 diff)
• Way.java (modified) (7 diffs)

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

@@ -768 +768 @@
     }
 
-    void reindexNode(Node node) {
+    private void reindexNode(Node node) {
         nodes.remove(node);
         nodes.add(node);
         for (Way way:OsmPrimitive.getFilteredList(node.getReferrers(), Way.class)) {
             ways.remove(way);
+            way.updatePosition();
             ways.add(way);
         }
     }
 
-    void reindexWay(Way way) {
+    private void reindexWay(Way way) {
         ways.remove(way);
         ways.add(way);
+    }
+
+    public void fireNodeMoved(Node node) {
+        // TODO Fire event
+        reindexNode(node);
+    }
+
+    public void fireWayNodesChanged(Way way) {
+        // TODO Fire event
+        reindexWay(way);
     }
 

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

@@ -25 +25 @@
             }
             if (getDataSet() != null) {
-                getDataSet().reindexNode(this);
+                getDataSet().fireNodeMoved(this);
             }
         }
@@ -43 +43 @@
             }
             if (getDataSet() != null) {
-                getDataSet().reindexNode(this);
+                getDataSet().fireNodeMoved(this);
             }
         }
@@ -177 +177 @@
     }
 
+    @Override
     public BBox getBBox() {
         if (coor == null)
@@ -183 +184 @@
             return new BBox(coor, coor);
     }
+
+    @Override
+    public void updatePosition() {
+        // Do nothing for now, but in future replace CachedLatLon with simple doubles and update precalculated EastNorth value here
+    }
 }

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

@@ -1010 +1010 @@
     public abstract BBox getBBox();
 
+    /**
+     * Called by Dataset to update cached position information of primitive (bbox, cached EarthNorth, ...)
+     */
+    public abstract void updatePosition();
+
 }
 

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

@@ -206 +206 @@
         {
             init(parent);
-        }
-        String quads(T o)
-        {
-            if (o instanceof Node) {
-                LatLon coor = ((Node)o).getCoor();
-                if (coor == null)
-                    return "null node coordinates";
-                return Long.toHexString(QuadTiling.quadTile(coor));
-            }
-            return "Way??";
         }
         synchronized boolean remove_content(T o)
@@ -302 +292 @@
                 QBLevel child = children[new_index];
                 if (debug) {
-                    out("putting "+o+"(q:"+quads(o)+") into ["+new_index+"] " + child.bbox());
+                    out("putting "+o+"(q:"+Long.toHexString(QuadTiling.quadTile(o.getBBox().points().get(0)))+") into ["+new_index+"] " + child.bbox());
                 }
                 child.add(o);

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

@@ -330 +330 @@
         return new BBox(0, 0, 0, 0);
     }
+
+    @Override
+    public void updatePosition() {
+        // Do nothing for now
+    }
 }

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

@@ -26 +26 @@
      */
     private Node[] nodes = new Node[0];
+    private BBox bbox;
 
     /**
@@ -60 +61 @@
 
         clearCached();
-        reindex();
+        fireNodesChanged();
     }
 
@@ -289 +290 @@
         newNodes[nodes.length] = n;
         nodes = newNodes;
-        reindex();
+        fireNodesChanged();
     }
 
@@ -312 +313 @@
         newNodes[offs] = n;
         nodes = newNodes;
-        reindex();
+        fireNodesChanged();
     }
 
@@ -324 +325 @@
             }
         }
-        reindex();
+        fireNodesChanged();
         super.setDeleted(deleted);
     }
@@ -358 +359 @@
     }
 
-    private void reindex() {
+    private void fireNodesChanged() {
         if (getDataSet() != null) {
-            getDataSet().reindexWay(this);
+            getDataSet().fireWayNodesChanged(this);
         }
     }
@@ -366 +367 @@
     @Override
     public BBox getBBox() {
-        // TODO Precalculate way bbox (and update it every time nodes are moved or edited)
-        return new BBox(this);
+        if (getDataSet() == null)
+            return new BBox(this);
+        if (bbox == null) {
+            bbox = new BBox(this);
+        }
+        return bbox;
+    }
+
+    @Override
+    public void updatePosition() {
+        bbox = new BBox(this);
     }
 }