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

Timestamp:

2011-02-06T15:48:58+01:00 (13 years ago)

Author:

bastiK

Message:

mapcss: fill-image

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• MapPaintSettings.java (modified) (1 diff)
• MapPaintVisitor.java (modified) (2 diffs)
• MapPainter.java (modified) (6 diffs)

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

@@ -81 +81 @@
 
         outlineOnly = Main.pref.getBoolean("draw.data.area_outline_only", false);
-
+        
     }
 

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

@@ -101 +101 @@
         styles = MapPaintStyles.getStyles();
 
+        this.paintSettings = MapPaintSettings.INSTANCE;
+
         circum = nc.getDist100Pixel();
-        boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10000000);
+        boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10000000) && !paintSettings.isOutlineOnly();
         boolean drawMultipolygon = drawArea && Main.pref.getBoolean("mappaint.multipolygon", true);
         styles.setDrawMultipolygon(drawMultipolygon);
@@ -112 +114 @@
                         RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
 
-        this.paintSettings = MapPaintSettings.INSTANCE;
         this.painter = new MapPainter(paintSettings, g, inactive, nc, virtual, circum, leftHandTraffic);
 

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

@@ -11 +11 @@
 import java.awt.Polygon;
 import java.awt.Rectangle;
+import java.awt.TexturePaint;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
 import java.util.Arrays;
 import java.util.Collection;
@@ -42 +44 @@
     private final boolean showNames;
     private final boolean showIcons;
-    private final boolean outlineOnly;
 
     private final Color inactiveColor;
@@ -78 +79 @@
         this.showNames = settings.getShowNamesDistance() > circum;
         this.showIcons = settings.getShowIconsDistance() > circum;
-        this.outlineOnly = settings.isOutlineOnly();
 
         this.inactiveColor = PaintColors.INACTIVE.get();
@@ -258 +258 @@
     }
 
-    public void drawArea(Way w, Color color, String name) {
+    public void drawArea(Way w, Color color, BufferedImage fillImage, String name) {
         Polygon polygon = getPolygon(w);
-        drawArea(polygon, color, name);
-    }
-
-    protected void drawArea(Polygon polygon, Color color, String name) {
-
-        g.setColor(color);
-
-        if (outlineOnly) {
-            g.drawPolygon(polygon);
+        drawArea(polygon, color, fillImage, name);
+    }
+
+    protected void drawArea(Polygon polygon, Color color, BufferedImage fillImage, String name) {
+
+        if (fillImage == null) {
+            g.setColor(color);
+            g.fillPolygon(polygon);
         } else {
-            g.fillPolygon(polygon);
-        }
-
+            TexturePaint texture = new TexturePaint(fillImage, 
+                    new Rectangle(polygon.xpoints[0], polygon.ypoints[0], fillImage.getWidth(), fillImage.getHeight()));
+
+            g.setPaint(texture);
+            g.fill(polygon);
+        }
 
         if (name != null) {
@@ -311 +313 @@
     }
 
-    public void drawArea(Relation r, Color color, String name) {
+    public void drawArea(Relation r, Color color, BufferedImage fillImage, String name) {
         Multipolygon multipolygon = new Multipolygon(nc);
         multipolygon.load(r);
@@ -320 +322 @@
                     continue;
                 }
-                drawArea(p, color, getAreaName(r));
+                drawArea(p, color, fillImage, getAreaName(r));
             }
         }