Changeset 4682 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

Timestamp:

2011-12-21T10:37:23+01:00 (12 years ago)

Author:

simon04

Message:

fix #2746 - add validation: Way connected to Area

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (1 diff)

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

@@ -410 +410 @@
         styleSources.addAll(sources);
     }
+
+    /**
+     * Returns the first AreaElemStyle for a given primitive.
+     * @param p the OSM primitive
+     * @param pretendWayIsClosed For styles that require the way to be closed,
+     * we pretend it is. This is useful for generating area styles from the (segmented)
+     * outer ways of a multipolygon.
+     * @return first AreaElemStyle found or {@code null}.
+     */
+    public static AreaElemStyle getAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
+        if (MapPaintStyles.getStyles() == null) {
+            return null;
+        }
+        for (ElemStyle s : MapPaintStyles.getStyles().generateStyles(p, 1.0, null, pretendWayIsClosed).a) {
+            if (s instanceof AreaElemStyle) {
+                return (AreaElemStyle) s;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Determines whether primitive has an AreaElemStyle.
+     * @param p the OSM primitive
+     * @param pretendWayIsClosed For styles that require the way to be closed,
+     * we pretend it is. This is useful for generating area styles from the (segmented)
+     * outer ways of a multipolygon.
+     * @return {@code true} iff primitive has an AreaElemStyle
+     */
+    public static boolean hasAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
+        return getAreaElemStyle(p, pretendWayIsClosed) != null;
+    }
 }