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

Timestamp:

2015-05-22T21:28:34+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11447 - revert or r8384 for StyleCache and GeoPropertyIndex

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/mappaint/StyleCache.java (modified) (3 diffs)
• tools/GeoPropertyIndex.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.Storage;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -165 +164 @@
             ++i;
         }
-        if (Utils.equalsEpsilon(bd.get(i), lower)) {
+        if (bd.get(i) == lower) {
             if (upper > bd.get(i+1))
                 throw new RangeViolatedError();
@@ -171 +170 @@
                 throw new AssertionError("the new range must be within a subrange that has no data");
 
-            if (Utils.equalsEpsilon(bd.get(i+1), upper)) {
+            if (bd.get(i+1) == upper) {
                 //  --|-------|--------|--
                 //   i-1      i       i+1

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

@@ -164 +164 @@
         boolean isInside(LatLon ll) {
             return bbox.getTopLeftLon() <= ll.lon() &&
-                    (ll.lon() < bbox.getBottomRightLon() ||
-                            (Utils.equalsEpsilon(ll.lon(), 180.0) && Utils.equalsEpsilon(bbox.getBottomRightLon(), 180.0))) &&
+                    (ll.lon() < bbox.getBottomRightLon() || (ll.lon() == 180.0 && bbox.getBottomRightLon() == 180.0)) &&
                     bbox.getBottomRightLat() <= ll.lat() &&
-                    (ll.lat() < bbox.getTopLeftLat() ||
-                            (Utils.equalsEpsilon(ll.lat(), 90.0) && Utils.equalsEpsilon(bbox.getTopLeftLat(), 90.0)));
+                    (ll.lat() < bbox.getTopLeftLat() || (ll.lat() == 90.0 && bbox.getTopLeftLat() == 90.0));
         }