Changeset 5381 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2012-07-30T02:38:20+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7910 - Wrong suggested imagery layer providers (use of shapes when defined)

File:

• trunk/src/org/openstreetmap/josm/data/imagery/Shape.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/Shape.java

@@ -10 +10 @@
 import org.openstreetmap.gui.jmapviewer.Coordinate;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Geometry;
 
 /**
@@ -24 +26 @@
         String[] components = asString.split(separator);
         if (components.length % 2 != 0)
-            throw new IllegalArgumentException(MessageFormat.format("Even number of doubles excpected in string, got {0}: {1}", components.length, asString));
+            throw new IllegalArgumentException(MessageFormat.format("Even number of doubles expected in string, got {0}: {1}", components.length, asString));
         for (int i=0; i<components.length; i+=2) {
             addPoint(components[i], components[i+1]);
@@ -46 +48 @@
     public List<Coordinate> getPoints() {
         return coords;
+    }
+    
+    public boolean contains(LatLon latlon) {
+        if (latlon == null)
+            return false;
+        List<Node> nodes = new ArrayList<Node>(coords.size());
+        for (Coordinate c : coords) {
+            nodes.add(new Node(new LatLon(c.getLat(), c.getLon())));
+        }
+        return Geometry.nodeInsidePolygon(new Node(latlon), nodes);
     }