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

Timestamp:

2015-12-04T01:53:17+01:00 (8 years ago)

Author:

bastiK

Message:

mapcss partial fill: remove [9061] code & turn it on again (see #12104)

Location:

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

Files:

• MapPaintSettings.java (modified) (3 diffs)
• StyledMapRenderer.java (modified) (9 diffs)

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

@@ -49 +49 @@
     /** Preference: should only the data area outline be drawn */
     private boolean outlineOnly;
-    /** Preference: if unclosed areas should be drawn differently for partial fill */
-    private boolean unclosedAreaHighlight;
-    /** Preference: width of unclosed area highlight */
-    private double unclosedAreaHighlightWidth;
     /** Preference: parameter to avoid partial fill on small area objects:
      * If more than a certain percentage of the total area would be filled by 
@@ -115 +111 @@
 
         outlineOnly = Main.pref.getBoolean("draw.data.area_outline_only", false);
-        unclosedAreaHighlight = Main.pref.getBoolean("draw.unclosed_area_partial_fill_highlight", false);
-        unclosedAreaHighlightWidth = Main.pref.getDouble("draw.unclosed_area_partial_fill_highlight.width", 80);
         partialFillThreshold = Main.pref.getDouble("draw.area.partial_fill_threshold", 70);
     }
@@ -357 +351 @@
     public boolean isOutlineOnly() {
         return outlineOnly;
-    }
-
-    /**
-     * Determines if unclosed areas should be drawn differently for partial fill.
-     * 
-     * @return {@code true} if unclosed areas should be drawn differently for partial fill
-     */
-    public boolean isUnclosedAreaHighlight() {
-        return unclosedAreaHighlight;
-    }
-
-    /**
-     * Returns the width of unclosed area highlight.
-     * @return the width of unclosed area highlight
-     */
-    public double getUnclosedAreaHighlightWidth() {
-        return unclosedAreaHighlightWidth;
     }
 

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

@@ -336 +336 @@
     private boolean showIcons;
     private boolean isOutlineOnly;
-    private boolean isUnclosedAreaHighlight;
-    private double unclosedAreaHighlightWidth;
     private double partialFillThreshold;
 
@@ -470 +468 @@
      * if null, area will be filled completely
      * @param pfClip clipping area for partial fill
-     * @param unclosedHighlight true, if the fact that the way / multipolygon is not
-     * properly closed should be highlighted; this parameter is only used
-     * for partial fill ({@code extent != null}), otherwise it is ignored
      * @param disabled If this should be drawn with a special disabled style.
      * @param text The text to write on the area.
      */
-    protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, Float extent, Path2D.Double pfClip,
-            boolean unclosedHighlight, boolean disabled, TextElement text) {
+    protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color,
+            MapImage fillImage, Float extent, Path2D.Double pfClip, boolean disabled, TextElement text) {
 
         Shape area = path.createTransformedShape(nc.getAffineTransform());
@@ -491 +486 @@
                     g.fill(area);
                 } else {
-                    if (unclosedHighlight) {
-                        g.setStroke(new BasicStroke((int) (unclosedAreaHighlightWidth / 100 * extent),
-                                BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
-                        g.draw(area);
-                    } else {
-                        Shape oldClip = g.getClip();
-                        Shape clip = area;
-                        if (pfClip != null) {
-                            clip = pfClip.createTransformedShape(nc.getAffineTransform());
-                        }
-                        g.clip(clip);
-                        g.setStroke(new BasicStroke(2 * extent, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
-                        g.draw(area);
-                        g.setClip(oldClip);
+                    Shape oldClip = g.getClip();
+                    Shape clip = area;
+                    if (pfClip != null) {
+                        clip = pfClip.createTransformedShape(nc.getAffineTransform());
                     }
+                    g.clip(clip);
+                    g.setStroke(new BasicStroke(2 * extent, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
+                    g.draw(area);
+                    g.setClip(oldClip);
                 }
             } else {
@@ -518 +507 @@
                     g.fill(area);
                 } else {
-                    if (unclosedHighlight) {
-                        g.setStroke(new BasicStroke((int) (unclosedAreaHighlightWidth / 100 * extent),
-                                BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
-                        g.draw(area);
-                    } else {
-                        Shape oldClip = g.getClip();
-                        BasicStroke stroke = new BasicStroke(2 * extent, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
-                        g.clip(stroke.createStrokedShape(area));
-                        Shape fill = area;
-                        if (pfClip != null) {
-                            fill = pfClip.createTransformedShape(nc.getAffineTransform());
-                        }
-                        g.fill(fill);
-                        g.setClip(oldClip);
+                    Shape oldClip = g.getClip();
+                    BasicStroke stroke = new BasicStroke(2 * extent, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
+                    g.clip(stroke.createStrokedShape(area));
+                    Shape fill = area;
+                    if (pfClip != null) {
+                        fill = pfClip.createTransformedShape(nc.getAffineTransform());
                     }
+                    g.fill(fill);
+                    g.setClip(oldClip);
                 }
                 g.setPaintMode();
@@ -636 +619 @@
                     continue;
                 }
-                boolean unclosedHighlight = false;
                 if (extent != null) {
                     if (pd.isClosed()) {
@@ -646 +628 @@
                         }
                     } else {
-                        unclosedHighlight = isUnclosedAreaHighlight;
                         pfClip = getPFClip(pd, extent * scale);
                     }
@@ -652 +633 @@
                 drawArea(r, p,
                         pd.selected ? paintSettings.getRelationSelectedColor(color.getAlpha()) : color,
-                        fillImage, extent, pfClip, unclosedHighlight, disabled, text);
+                        fillImage, extent, pfClip, disabled, text);
             }
         }
@@ -682 +663 @@
             }
         }
-        drawArea(w, getPath(w), color, fillImage, extent, pfClip, isUnclosedAreaHighlight && !w.isClosed(), disabled, text);
+        drawArea(w, getPath(w), color, fillImage, extent, pfClip, disabled, text);
     }
 
@@ -1538 +1519 @@
         showIcons = paintSettings.getShowIconsDistance() > circum;
         isOutlineOnly = paintSettings.isOutlineOnly();
-        isUnclosedAreaHighlight = paintSettings.isUnclosedAreaHighlight();
-        unclosedAreaHighlightWidth = paintSettings.getUnclosedAreaHighlightWidth();
         partialFillThreshold = paintSettings.getPartialFillThreshold();
         orderFont = new Font(Main.pref.get("mappaint.font", "Droid Sans"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));