Changeset 2686 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

Timestamp:

2009-12-28T00:14:33+01:00 (14 years ago)

Author:

Gubaer

Message:

Partial commit due to issue described in #4137
Breaks the build

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.osm.visitor;
+
+import java.util.Collection;
 
 import org.openstreetmap.josm.Main;
@@ -29 +31 @@
     public void visit(Way w) {
         if (w.isIncomplete()) return;
-        for (Node n : w.getNodes())
+        for (Node n : w.getNodes()) {
             visit(n);
+        }
     }
 
@@ -61 +64 @@
         if(latlon != null)
         {
-            if(latlon instanceof CachedLatLon)
+            if(latlon instanceof CachedLatLon) {
                 visit(((CachedLatLon)latlon).getEastNorth());
-            else
+            } else {
                 visit(Main.proj.latlon2eastNorth(latlon));
+            }
         }
     }
@@ -70 +74 @@
     public void visit(EastNorth eastNorth) {
         if (eastNorth != null) {
-            if (bounds == null)
+            if (bounds == null) {
                 bounds = new ProjectionBounds(eastNorth);
-            else
+            } else {
                 bounds.extend(eastNorth);
+            }
         }
     }
@@ -111 +116 @@
         LatLon maxLatlon = Main.proj.eastNorth2latlon(bounds.max);
         bounds = new ProjectionBounds(
-        Main.proj.latlon2eastNorth(new LatLon(minLatlon.lat() - enlargeDegree, minLatlon.lon() - enlargeDegree)),
-        Main.proj.latlon2eastNorth(new LatLon(maxLatlon.lat() + enlargeDegree, maxLatlon.lon() + enlargeDegree)));
+                Main.proj.latlon2eastNorth(new LatLon(minLatlon.lat() - enlargeDegree, minLatlon.lon() - enlargeDegree)),
+                Main.proj.latlon2eastNorth(new LatLon(maxLatlon.lat() + enlargeDegree, maxLatlon.lon() + enlargeDegree)));
     }
 
@@ -118 +123 @@
         return "BoundingXYVisitor["+bounds+"]";
     }
+
+    public void computeBoundingBox(Collection<? extends OsmPrimitive> primitives) {
+        if (primitives == null) return;
+        for (OsmPrimitive p: primitives) {
+            if (p == null) {
+                continue;
+            }
+            p.visit(this);
+        }
+    }
 }