Changeset 9076 in josm for trunk

Timestamp:

2015-12-01T00:17:33+01:00 (9 years ago)

Author:

bastiK

Message:

mapcss: partial fill - fix for [9063] - use scale instead of circum (otherwise it would depend on latitude)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/MapPaintSettings.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (4 diffs)
• gui/NavigatableComponent.java (modified) (2 diffs)

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

@@ -117 +117 @@
         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", 50);
+        partialFillThreshold = Main.pref.getDouble("draw.area.partial_fill_threshold", 70);
     }
 

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

@@ -288 +288 @@
 
     private double circum;
+    private double scale;
 
     private MapPaintSettings paintSettings;
@@ -630 +631 @@
                         AreaAndPerimeter ap = pd.getAreaAndPerimeter();
                         // if partial fill would only leave a small gap in the center ...
-                        if (ap.getPerimeter() * extent * circum / 100 > partialFillThreshold / 100 * ap.getArea()) {
+                        if (ap.getPerimeter() * extent * scale > partialFillThreshold / 100 * ap.getArea()) {
                             // ... turn it off and fill completely
                             extent = null;
@@ -660 +661 @@
             AreaAndPerimeter ap = Geometry.getAreaAndPerimeter(w.getNodes());
             // if partial fill would only leave a small gap in the center ...
-            if (ap.getPerimeter() * extent * circum / 100 > partialFillThreshold / 100 * ap.getArea()) {
+            if (ap.getPerimeter() * extent * scale > partialFillThreshold / 100 * ap.getArea()) {
                 // ... turn it off and fill completely
                 extent = null;
@@ -1513 +1514 @@
 
         circum = nc.getDist100Pixel();
+        scale = nc.getScale();
 
         leftHandTraffic = Main.pref.getBoolean("mappaint.lefthandtraffic", false);

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -215 +215 @@
 
     /**
-     * @return Returns the center point. A copy is returned, so users cannot
-     *      change the center by accessing the return value. Use zoomTo instead.
+     * Returns the current center of the viewport.
+     * 
+     * (Use {@link #zoomTo(EastNorth)} to the change the center.)
+     * 
+     * @return the current center of the viewport
      */
     public EastNorth getCenter() {
@@ -222 +225 @@
     }
 
+    /**
+     * Returns the current scale.
+     * 
+     * In east/north units per pixel.
+     * 
+     * @return the current scale
+     */
     public double getScale() {
         return scale;