Changeset 9008 in josm

Timestamp:

2015-11-15T13:25:47+01:00 (9 years ago)

Author:

bastiK

Message:

see #12104 - mapcss: partial filling of areas (fill-extent) for fill-image

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• gui/mappaint/AreaElemStyle.java (modified) (2 diffs)

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

@@ -479 +479 @@
                     g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
                 }
-                g.fill(area);
+                if (extent == null) {
+                    g.fill(area);
+                } else {
+                    Shape clip = g.getClip();
+                    BasicStroke stroke = new BasicStroke(2 * extent);
+                    g.clip(stroke.createStrokedShape(area));
+                    g.fill(area);
+                    g.setClip(clip);
+                }
                 g.setPaintMode();
             }

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

@@ -72 +72 @@
                 }
                 color = new Color(color.getRed(), color.getGreen(), color.getBlue(), alpha);
-                extent = c.get(FILL_EXTENT, null, float.class);
             }
         }
@@ -81 +80 @@
             text = TextElement.create(env, PaintColors.AREA_TEXT.get(), true);
         }
+
+        extent = c.get(FILL_EXTENT, null, float.class);
 
         if (color != null)