Changeset 11264 in josm for trunk

Timestamp:

2016-11-16T17:07:03+01:00 (8 years ago)

Author:

bastiK

Message:

refactor GeoProperty implementation of RightAndLefthandTraffic to generic separate class DefaultGeoProperty (see #10387)

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• DefaultGeoProperty.java (added)
• GeoProperty.java (added)
• GeoPropertyIndex.java (modified) (1 diff)
• RightAndLefthandTraffic.java (modified) (6 diffs)

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

@@ -19 +19 @@
  */
 public class GeoPropertyIndex<T> {
-
-    /**
-     * A method to look up a property of the earth surface.
-     * (User input for the index.)
-     * @param <T> the property
-     */
-    public interface GeoProperty<T> {
-        /**
-         * Look up the property for a point.
-         * @param ll the point coordinates
-         * @return property value at that point. Must not be null.
-         */
-        T get(LatLon ll);
-
-        /**
-         * Look up the property for a coordinate rectangle.
-         * @param box the rectangle
-         * @return the property, if it is the same in the entire rectangle;
-         * null otherwise
-         */
-        T get(BBox box);
-    }
 
     private final int maxLevel;

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import java.awt.geom.Area;
 import java.io.File;
 import java.io.FileInputStream;
@@ -24 +23 @@
 import org.openstreetmap.josm.actions.PurgeAction;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -34 +32 @@
 import org.openstreetmap.josm.io.OsmWriter;
 import org.openstreetmap.josm.io.OsmWriterFactory;
-import org.openstreetmap.josm.tools.GeoPropertyIndex.GeoProperty;
-import org.openstreetmap.josm.tools.Geometry.PolygonIntersection;
 
 /**
@@ -46 +42 @@
     private static final String RIGHT = "right";
 
-    private static class RLTrafficGeoProperty implements GeoProperty<Boolean> {
-
-        @Override
-        public Boolean get(LatLon ll) {
-            for (Area a : leftHandTrafficPolygons) {
-                if (a.contains(ll.lon(), ll.lat()))
-                    return Boolean.TRUE;
-            }
-            return Boolean.FALSE;
-        }
-
-        @Override
-        public Boolean get(BBox box) {
-            Area abox = new Area(box.toRectangle());
-            for (Area a : leftHandTrafficPolygons) {
-                PolygonIntersection is = Geometry.polygonIntersection(abox, a, 1e-10 /* using deg and not meters */);
-                if (is == PolygonIntersection.FIRST_INSIDE_SECOND)
-                    return Boolean.TRUE;
-                if (is != PolygonIntersection.OUTSIDE)
-                    return null;
-            }
-            return Boolean.FALSE;
-        }
-    }
-
-    static volatile Collection<Area> leftHandTrafficPolygons;
-    static volatile GeoPropertyIndex<Boolean> rlCache;
+    private static volatile GeoPropertyIndex<Boolean> rlCache;
 
     private RightAndLefthandTraffic() {
@@ -93 +63 @@
      */
     public static synchronized void initialize() {
-        leftHandTrafficPolygons = new ArrayList<>();
         Collection<Way> optimizedWays = loadOptimizedBoundaries();
         if (optimizedWays.isEmpty()) {
@@ -99 +68 @@
             saveOptimizedBoundaries(optimizedWays);
         }
-        for (Way w : optimizedWays) {
-            leftHandTrafficPolygons.add(Geometry.getAreaLatLon(w.getNodes()));
-        }
-        rlCache = new GeoPropertyIndex<>(new RLTrafficGeoProperty(), 24);
+        rlCache = new GeoPropertyIndex<>(new DefaultGeoProperty(optimizedWays), 24);
     }