Changeset 3879 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2011-02-09T19:13:04+01:00 (14 years ago)

Author:

bastiK

Message:

mapcss: improve shape & area style generation

File:

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

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

@@ -211 +211 @@
     }
 
-    public void drawNodeSymbol(Node n, Symbol s, boolean selected, boolean member, TextElement text) {
+    public void drawNodeSymbol(Node n, Symbol s, Color fillColor, Color strokeColor, TextElement text) {
         Point p = nc.getPoint(n);
         if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
         int radius = s.size / 2;
 
-        if (s.fillColor != null) {
-            if (inactive || n.isDisabled()) {
-                g.setColor(inactiveColor);
-            } else {
-                g.setColor(s.fillColor);
-            }
+        if (fillColor != null) {
+            g.setColor(fillColor);
             switch (s.symbol) {
                 case SQUARE:
@@ -235 +231 @@
         if (s.stroke != null) {
             g.setStroke(s.stroke);
-            if (inactive || n.isDisabled()) {
-                g.setColor(inactiveColor);
-            } else {
-                g.setColor(s.strokeColor);
-            }
+            g.setColor(strokeColor);
             switch (s.symbol) {
                 case SQUARE:
@@ -353 +345 @@
     }
 
-    public void drawArea(Way w, Color color, BufferedImage fillImage, String name) {
+    public void drawArea(Way w, Color color, BufferedImage fillImage, float fillImageAlpha, String name) {
         Polygon polygon = getPolygon(w);
-        drawArea(polygon, color, fillImage, name);
-    }
-
-    protected void drawArea(Polygon polygon, Color color, BufferedImage fillImage, String name) {
+        drawArea(polygon, color, fillImage, fillImageAlpha, name);
+    }
+
+    protected void drawArea(Polygon polygon, Color color, BufferedImage fillImage, float fillImageAlpha, String name) {
 
         if (fillImage == null) {
@@ -367 +359 @@
                     new Rectangle(polygon.xpoints[0], polygon.ypoints[0], fillImage.getWidth(), fillImage.getHeight()));
             g.setPaint(texture);
-            if (color.getAlpha() != 255) {
-                g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, Utils.color_int2float(color.getAlpha())));
+            if (fillImageAlpha != 1f) {
+                g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, fillImageAlpha));
             }
             g.fill(polygon);
@@ -411 +403 @@
     }
 
-    public void drawArea(Relation r, Color color, BufferedImage fillImage, String name) {
+    public void drawArea(Relation r, Color color, BufferedImage fillImage, float fillImageAlpha, String name) {
         Multipolygon multipolygon = new Multipolygon(nc);
         multipolygon.load(r);
@@ -420 +412 @@
                     continue;
                 }
-                drawArea(p, color, fillImage, getAreaName(r));
+                drawArea(p, color, fillImage, fillImageAlpha, getAreaName(r));
             }
         }