Changeset 9099 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2015-12-11T17:36:59+01:00 (8 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)

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• AreaElemStyle.java (modified) (6 diffs)
• StyleKeys.java (modified) (1 diff)
• mapcss/Condition.java (modified) (1 diff)
• mapcss/MapCSSParser.jj (modified) (3 diffs)

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

@@ -26 +26 @@
     public TextElement text;
     public Float extent;
+    public Float extentThreshold;
 
-    protected AreaElemStyle(Cascade c, Color color, MapImage fillImage, Float extent, TextElement text) {
+    protected AreaElemStyle(Cascade c, Color color, MapImage fillImage, Float extent, Float extentThreshold, TextElement text) {
         super(c, 1f);
         CheckParameterUtil.ensureParameterNotNull(color);
         this.color = color;
+        this.fillImage = fillImage;
         this.extent = extent;
-        this.fillImage = fillImage;
+        this.extentThreshold = extentThreshold;
         this.text = text;
     }
@@ -39 +41 @@
         final Cascade c = env.mc.getCascade(env.layer);
         MapImage fillImage = null;
-        Color color = null;
-        Float extent = null;
+        Color color;
 
         IconReference iconRef = c.get(FILL_IMAGE, null, IconReference.class);
@@ -81 +82 @@
         }
 
-        extent = c.get(FILL_EXTENT, null, float.class);
+        Float extent = c.get(FILL_EXTENT, null, float.class);
+        Float extentThreshold = c.get(FILL_EXTENT_THRESHOLD, null, float.class);
 
         if (color != null)
-            return new AreaElemStyle(c, color, fillImage, extent, text);
+            return new AreaElemStyle(c, color, fillImage, extent, extentThreshold, text);
         else
             return null;
@@ -101 +103 @@
                 }
             }
-            painter.drawArea((Way) osm, myColor, fillImage, extent, painter.isInactiveMode() || osm.isDisabled(), text);
+            painter.drawArea((Way) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled(), text);
         } else if (osm instanceof Relation) {
             if (color != null && (selected || outermember)) {
                 myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
             }
-            painter.drawArea((Relation) osm, myColor, fillImage, extent, painter.isInactiveMode() || osm.isDisabled(), text);
+            painter.drawArea((Relation) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled(), text);
         }
     }
@@ -124 +126 @@
         if (extent != other.extent)
             return false;
+        if (extentThreshold != other.extentThreshold)
+            return false;
         if (!Objects.equals(text, other.text))
             return false;
@@ -134 +138 @@
         hash = 61 * hash + color.hashCode();
         hash = 61 * hash + (extent != null ? Float.floatToIntBits(extent) : 0);
+        hash = 61 * hash + (extentThreshold != null ? Float.floatToIntBits(extent) : 0);
         hash = 61 * hash + (fillImage != null ? fillImage.hashCode() : 0);
         hash = 61 * hash + (text != null ? text.hashCode() : 0);

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

@@ -11 +11 @@
     String FILL_COLOR = "fill-color";
     String FILL_EXTENT = "fill-extent";
+    String FILL_EXTENT_THRESHOLD = "fill-extent-threshold";
     String FILL_IMAGE = "fill-image";
     String FILL_OPACITY = "fill-opacity";

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;
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -204 +204 @@
 |   < ELEMENT_OF: "∈" >
 |   < CROSSING: "⧉" >
+|   < PERCENT: "%" >
 |   < COMMENT_START: "/*" > : COMMENT
 |   < UNEXPECTED_CHAR : ~[] > // avoid TokenMgrErrors because they are hard to recover from
@@ -1126 +1127 @@
 }
 {
-    f=ufloat() ( u=ident() | <DEG> { u = "°"; } )
+    f=ufloat() ( u=ident() | <DEG> { u = "°"; } | <PERCENT> { u = "%"; } )
     {
         Double m = unit_factor(u);
@@ -1143 +1144 @@
         case "grad": return Math.PI / 200;
         case "turn": return 2 * Math.PI;
+        case "%": return 0.01;
         case "px": return 1.;
         case "cm": return 96/2.54;