Changeset 12026 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

Timestamp:

2017-04-29T22:43:41+02:00 (7 years ago)

Author:

stoecker

Message:

see #10529 - drop code completely

File:

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

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

@@ -184 +184 @@
      * 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 (deprecated)
-     *
      * If the primitive is a way, look for multipolygon parents. In case it
      * is indeed member of some multipolygon as role "outer", all area styles
@@ -217 +213 @@
             Color wayColor = null;
 
+            // FIXME: Maybe in the future outer way styles apply to outers ignoring the multipolygon?
             for (OsmPrimitive referrer : osm.getReferrers()) {
                 Relation r = (Relation) referrer;
@@ -320 +317 @@
             return p;
         } else if (osm instanceof Relation) {
-            Pair<StyleElementList, Range> p = generateStyles(osm, scale, true);
-            if (drawMultipolygon && ((Relation) osm).isMultipolygon()
-                    && !Utils.exists(p.a, AreaElement.class) && Main.pref.getBoolean("multipolygon.deprecated.outerstyle", false)) {
-                // look at outer ways to find area style
-                Multipolygon multipolygon = MultipolygonCache.getInstance().get((Relation) osm);
-                for (Way w : multipolygon.getOuterWays()) {
-                    Pair<StyleElementList, Range> wayStyles = generateStyles(w, scale, false);
-                    p.b = Range.cut(p.b, wayStyles.b);
-                    StyleElement area = Utils.find(wayStyles.a, AreaElement.class);
-                    if (area != null) {
-                        p.a = new StyleElementList(p.a, area);
-                        break;
-                    }
-                }
-            }
-            return p;
+            return generateStyles(osm, scale, true);
         }
         return null;