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

Timestamp:

2010-03-12T21:23:58+01:00 (15 years ago)

Author:

jttt

Message:

Use QuadBuckets in SimplePaintVisitor

File:

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

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java

@@ -18 +18 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -121 +122 @@
     DataSet ds;
     public void visitAll(DataSet data, boolean virtual, Bounds bounds) {
+        BBox bbox = new BBox(bounds);
         this.ds = data;
         //boolean profiler = Main.pref.getBoolean("simplepaint.profiler",false);
@@ -141 +143 @@
            require changing the colour while painting... */
         //profilerN = 0;
-        for (final OsmPrimitive osm: data.getRelations()) {
+        for (final OsmPrimitive osm: data.searchRelations(bbox)) {
             if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered()) {
                 osm.visit(this);
@@ -155 +157 @@
 
         //profilerN = 0;
-        for (final OsmPrimitive osm:data.getWays()){
+        for (final OsmPrimitive osm:data.searchWays(bbox)){
             if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered() && osm.isTagged()) {
                 osm.visit(this);
@@ -163 +165 @@
         displaySegments();
 
-        for (final OsmPrimitive osm:data.getWays()){
+        for (final OsmPrimitive osm:data.searchWays(bbox)){
             if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered() && !osm.isTagged()) {
                 osm.visit(this);
@@ -193 +195 @@
 
         //profilerN = 0;
-        for (final OsmPrimitive osm: data.getNodes()) {
+        for (final OsmPrimitive osm: data.searchNodes(bbox)) {
             if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered())
             {
@@ -208 +210 @@
         //}
 
-        drawVirtualNodes(data.getWays());
+        drawVirtualNodes(data.searchWays(bbox));
 
         //if(profiler)