Changeset 7193 in josm for trunk

Timestamp:

2014-05-30T10:27:18+02:00 (10 years ago)

Author:

bastiK

Message:

added right- and left-hand traffic database
(new mapcss pseudo-class-condition :righthandtraffic)

Data file (data/left-right-hand-traffic.osm) license: CC0.
Loosely based on boundary lines data from naturalearthdata.com.
Traffic law info from wikipedia.
Boundaries generalized, especially in areas where there seem to be no roads.
Should be mostly correct, but some remote islands and atolls may be assigned wrongly.
Alway check before you start driving. :)

Added fast lookup index similar to QuadBuckets.

Location:

trunk

Files:

• data/left-right-hand-traffic.osm (added)
• src/org/openstreetmap/josm/data/osm/BBox.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (3 diffs)
• src/org/openstreetmap/josm/tools/GeoPropertyIndex.java (added)
• src/org/openstreetmap/josm/tools/Geometry.java (modified) (4 diffs)
• src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java (added)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.awt.geom.Rectangle2D;
 import java.util.Arrays;
 
@@ -259 +260 @@
         return idx1;
     }
+    
+    public Rectangle2D toRectangle() {
+        return new Rectangle2D.Double(xmin, ymin, xmax - xmin, ymax - ymin);
+    }
 
     @Override

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -403 +403 @@
             case "unconnected":
                 return e.osm instanceof Node && OsmPrimitive.getFilteredList(e.osm.getReferrers(), Way.class).isEmpty();
+            case "righthandtraffic":
+                return ExpressionFactory.Functions.is_right_hand_traffic(e);
             }
             return false;

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -26 +26 @@
 import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
 import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
@@ -32 +33 @@
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.Predicates;
+import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -621 +623 @@
             return cs.getValue();
         }
+        
+        public static boolean is_right_hand_traffic(Environment env) {
+            if (env.osm instanceof Node)
+                return RightAndLefthandTraffic.isRightHandTraffic(((Node) env.osm).getCoor());
+            return RightAndLefthandTraffic.isRightHandTraffic(env.osm.getBBox().getCenter());
+        }
     }
 

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

@@ -444 +444 @@
     /**
      * Returns the Area of a polygon, from its list of nodes.
-     * @param polygon List of nodes forming polygon
+     * @param polygon List of nodes forming polygon (EastNorth coordinates)
      * @return Area for the given list of nodes
      * @since 6841
@@ -469 +469 @@
         return new Area(path);
     }
+    
+    /**
+     * Returns the Area of a polygon, from its list of nodes.
+     * @param polygon List of nodes forming polygon (LatLon coordinates)
+     * @return Area for the given list of nodes
+     * @since 6841
+     */
+    public static Area getAreaLatLon(List<Node> polygon) {
+        Path2D path = new Path2D.Double();
+
+        boolean begin = true;
+        for (Node n : polygon) {
+            if (begin) {
+                path.moveTo(n.getCoor().lon(), n.getCoor().lat());
+                begin = false;
+            } else {
+                path.lineTo(n.getCoor().lon(), n.getCoor().lat());
+            }
+        }
+        if (!begin) {
+            path.closePath();
+        }
+
+        return new Area(path);
+    }
 
     /**
@@ -490 +515 @@
      */
     public static PolygonIntersection polygonIntersection(Area a1, Area a2) {
+        return polygonIntersection(a1, a2, 1.0);
+    }
+
+    /**
+     * Tests if two polygons intersect.
+     * @param a1 Area of first polygon
+     * @param a2 Area of second polygon
+     * @param eps an area threshold, everything below is considered an empty intersection
+     * @return intersection kind
+     */
+    public static PolygonIntersection polygonIntersection(Area a1, Area a2, double eps) {
 
         Area inter = new Area(a1);
@@ -496 +532 @@
         Rectangle bounds = inter.getBounds();
 
-        if (inter.isEmpty() || bounds.getHeight()*bounds.getWidth() <= 1.0) {
+        if (inter.isEmpty() || bounds.getHeight()*bounds.getWidth() <= eps) {
             return PolygonIntersection.OUTSIDE;
         } else if (inter.equals(a1)) {