Changeset 7353 in josm for trunk

Timestamp:

2014-07-31T19:40:30+02:00 (10 years ago)

Author:

bastiK

Message:

fixed #10328 - AssertionError when adding tag (is_right_hand_traffic)

File:

• trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java

@@ -97 +97 @@
 
         public T get(LatLon ll) {
-            if (bbox.bounds(ll))
+            if (isInside(ll))
                 return getBounded(ll);
             if (DEBUG) System.err.print("up["+level+"]");
@@ -105 +105 @@
         private T getBounded(LatLon ll) {
             if (DEBUG) System.err.print("GPLevel["+level+"]"+bbox+" ");
-            if (!bbox.bounds(ll)) {
+            if (!isInside(ll)) {
                 throw new AssertionError("Point "+ll+" should be inside "+bbox);
             }
@@ -154 +154 @@
             return children[idx].getBounded(ll);
         }
+        
+        /**
+         * Checks, if a point is inside this tile.
+         * Makes sure, that neighboring tiles do not overlap, i.e. a point exactly
+         * on the border of two tiles must be inside exactly one of the tiles.
+         * @param ll the coordinates of the point
+         * @return true, if it is inside of the box
+         */
+        boolean isInside(LatLon ll) {
+            return bbox.getTopLeftLon() <= ll.lon() && 
+                    (ll.lon() < bbox.getBottomRightLon() || (ll.lon() == 180.0 && bbox.getBottomRightLon() == 180.0)) && 
+                    bbox.getBottomRightLat() <= ll.lat() && 
+                    (ll.lat() < bbox.getTopLeftLat() || (ll.lat() == 90.0 && bbox.getTopLeftLat() == 90.0));
+        }
 
     }