Changeset 12161 in josm for trunk/src/org/openstreetmap/josm/data/osm/BBox.java

Timestamp:

2017-05-15T15:43:30+02:00 (7 years ago)

Author:

michael2402

Message:

See #13415: Add the ILatLon interface, unify handling of Nodes and CachedLatLon

File:

• trunk/src/org/openstreetmap/josm/data/osm/BBox.java (modified) (4 diffs)

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.QuadTiling;
@@ -85 +86 @@
      */
     public BBox(Way w) {
-        w.getNodes().forEach(n -> add(n.getCoor()));
+        w.getNodes().forEach(this::add);
     }
 
@@ -93 +94 @@
      */
     public BBox(Node n) {
-        if (n.isLatLonKnown()) {
-            add(n.getCoor());
-        }
+        this((ILatLon) n);
+    }
+
+    /**
+     * Create BBox for a given latlon. An invalid BBox is returned if the coordinates are not known.
+     * @param ll The lat lon position
+     */
+    public BBox(ILatLon ll) {
+        add(ll);
+    }
+
+    /**
+     * Add a point to an existing BBox. Extends this bbox if necessary so that this.bounds(c) will return true
+     * if c is a valid LatLon instance.
+     * Kept for binary compatibility
+     * @param c a LatLon point
+     */
+    public final void add(LatLon c) {
+        add((ILatLon) c);
     }
 
@@ -103 +120 @@
      * @param c a LatLon point
      */
-    public final void add(LatLon c) {
-        if (c != null && c.isValid()) {
-            add(c.lon(), c.lat());
-        }
+    public final void add(ILatLon c) {
+        add(c.lon(), c.lat());
     }