Changeset 7567 in josm for trunk/src/org

Timestamp:

2014-09-20T14:47:48+02:00 (10 years ago)

Author:

stoecker

Message:

see #10529 - add parameter to disable outer-way styled multipolygons, defaults still to true

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (4 diffs)

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

@@ -10 +10 @@
 import java.util.Map.Entry;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -142 +143 @@
      * This method does multipolygon handling.
      *
-     *
      * There are different tagging styles for multipolygons, that have to be respected:
      * - tags on the relation
-     * - tags on the outer way
-     * - tags on both, the outer and the inner way (very old style)
+     * - tags on the outer way (deprecated)
      *
      * If the primitive is a way, look for multipolygon parents. In case it
@@ -159 +158 @@
      * Now consider the case that the way is not an outer way of any multipolygon,
      * but is member of a multipolygon as "inner".
-     * First, the style list is regenerated, considering only tags of this way
-     * minus the tags of outer way of the multipolygon (to care for the "very
-     * old style").
+     * First, the style list is regenerated, considering only tags of this way.
      * Then check, if the way describes something in its own right. (linear feature
      * or area) If not, add a default line style from the area color of the multipolygon.
@@ -283 +280 @@
             Pair<StyleList, Range> p = generateStyles(osm, scale, true);
             if (drawMultipolygon && ((Relation)osm).isMultipolygon()) {
-                if (!Utils.exists(p.a, AreaElemStyle.class)) {
+                if (!Utils.exists(p.a, AreaElemStyle.class) && Main.pref.getBoolean("multipolygon.deprecated.outerstyle", true)) {
                     // look at outer ways to find area style
                     Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, (Relation) osm);