Changeset 9099 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

Timestamp:

2015-12-11T17:36:59+01:00 (10 years ago)

Author:

bastiK

Message:

mapcss partial fill: move threshold parameter ([9063]) into the mapcss style
(new property fill-extent-threshold)

• add support for this parameter when area is unclosed
• smaller extent for unclosed areas

(see #12104)

File:

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

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

@@ -633 +633 @@
             return IN_DOWNLOADED_AREA.evaluate(e.osm);
         }
+
+        static boolean completely_downloaded(Environment e) {
+            if (e.osm instanceof Relation) {
+                return !((Relation) e.osm).hasIncompleteMembers();
+            } else {
+                return true;
+            }
+        }
+
+        static boolean closed2(Environment e) {
+            if (e.osm instanceof Way && ((Way) e.osm).isClosed())
+                return true;
+            if (e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon())
+                return MultipolygonCache.getInstance().get(Main.map.mapView, (Relation) e.osm).getOpenEnds().isEmpty();
+            return false;
+        }
     }