Changeset 9005 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2015-11-14T22:06:03+01:00 (8 years ago)

Author:

bastiK

Message:

see #12104 - mapcss: add option for partial filling of areas (inspired by iD)

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -451 +451 @@
     }
 
-    protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, boolean disabled, TextElement text) {
+    protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, Float extent, boolean disabled, TextElement text) {
 
         Shape area = path.createTransformedShape(nc.getAffineTransform());
@@ -462 +462 @@
                 }
                 g.setColor(color);
-                g.fill(area);
+                if (extent == null) {
+                    g.fill(area);
+                } else {
+                    Shape clip = g.getClip();
+                    g.clip(area);
+                    g.setStroke(new BasicStroke(2 * extent));
+                    g.draw(area);
+                    g.setClip(clip);
+                }
             } else {
                 TexturePaint texture = new TexturePaint(fillImage.getImage(disabled),
@@ -559 +567 @@
      * @param color The color to fill the area with.
      * @param fillImage The image to fill the area with. Overrides color.
+     * @param extent if not null, area will be filled partially; specifies, how
+     * far to fill from the boundary towards the center of the area;
+     * if null, area will be filled completely
      * @param disabled If this should be drawn with a special disabled style.
      * @param text The text to write on the area.
      */
-    public void drawArea(Relation r, Color color, MapImage fillImage, boolean disabled, TextElement text) {
+    public void drawArea(Relation r, Color color, MapImage fillImage, Float extent, boolean disabled, TextElement text) {
         Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, r);
         if (!r.isDisabled() && !multipolygon.getOuterWays().isEmpty()) {
@@ -572 +583 @@
                 drawArea(r, p,
                         pd.selected ? paintSettings.getRelationSelectedColor(color.getAlpha()) : color,
-                                fillImage, disabled, text);
+                        fillImage, extent, disabled, text);
             }
         }
@@ -582 +593 @@
      * @param color The color to fill the area with.
      * @param fillImage The image to fill the area with. Overrides color.
+     * @param extent if not null, area will be filled partially; specifies, how
+     * far to fill from the boundary towards the center of the area;
+     * if null, area will be filled completely
      * @param disabled If this should be drawn with a special disabled style.
      * @param text The text to write on the area.
      */
-    public void drawArea(Way w, Color color, MapImage fillImage, boolean disabled, TextElement text) {
-        drawArea(w, getPath(w), color, fillImage, disabled, text);
+    public void drawArea(Way w, Color color, MapImage fillImage, Float extent, boolean disabled, TextElement text) {
+        drawArea(w, getPath(w), color, fillImage, extent, disabled, text);
     }