Changeset 7563 in josm

Timestamp:

2014-09-19T18:29:23+02:00 (10 years ago)

Author:

bastiK

Message:

see #10529 - remove "very old" multipolygon style (area tags on both inner and outer ways)
(actually, this was never supported for MapCSS styles)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/InspectPrimitiveDialog.java (modified) (1 diff)
• mappaint/ElemStyles.java (modified) (9 diffs)
• mappaint/MapPaintStyles.java (modified) (1 diff)
• mappaint/StyleSource.java (modified) (1 diff)
• mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)
• mappaint/xml/XmlStyleSource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -347 +347 @@
                     if (s.active) {
                         txtMappaint.append(tr("\n\n> applying {0} style \"{1}\"\n", getSort(s), s.getDisplayString()));
-                        s.apply(mc, osm, scale, null, false);
+                        s.apply(mc, osm, scale, false);
                         txtMappaint.append(tr("\nRange:{0}", mc.range));
                         for (Entry<String, Cascade> e : mc.getLayers()) {

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

@@ -168 +168 @@
     private Pair<StyleList, Range> getImpl(OsmPrimitive osm, double scale, NavigatableComponent nc) {
         if (osm instanceof Node)
-            return generateStyles(osm, scale, null, false);
+            return generateStyles(osm, scale, false);
         else if (osm instanceof Way)
         {
-            Pair<StyleList, Range> p = generateStyles(osm, scale, null, false);
+            Pair<StyleList, Range> p = generateStyles(osm, scale, false);
 
             boolean isOuterWayOfSomeMP = false;
@@ -252 +252 @@
 
                 if (multipolygon.getInnerWays().contains(osm)) {
-                    Iterator<Way> it = multipolygon.getOuterWays().iterator();
-                    p = generateStyles(osm, scale, it.hasNext() ? it.next() : null, false);
+                    p = generateStyles(osm, scale, false);
                     boolean hasIndependentElemStyle = false;
                     for (ElemStyle s : p.a) {
@@ -282 +281 @@
         else if (osm instanceof Relation)
         {
-            Pair<StyleList, Range> p = generateStyles(osm, scale, null, true);
+            Pair<StyleList, Range> p = generateStyles(osm, scale, true);
             if (drawMultipolygon && ((Relation)osm).isMultipolygon()) {
                 if (!Utils.exists(p.a, AreaElemStyle.class)) {
@@ -288 +287 @@
                     Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, (Relation) osm);
                     for (Way w : multipolygon.getOuterWays()) {
-                        Pair<StyleList, Range> wayStyles = generateStyles(w, scale, null, false);
+                        Pair<StyleList, Range> wayStyles = generateStyles(w, scale, false);
                         p.b = Range.cut(p.b, wayStyles.b);
                         ElemStyle area = Utils.find(wayStyles.a, AreaElemStyle.class);
@@ -319 +318 @@
      * @return the generated styles and the valid range as a pair
      */
-    public Pair<StyleList, Range> generateStyles(OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed) {
+    public Pair<StyleList, Range> generateStyles(OsmPrimitive osm, double scale, boolean pretendWayIsClosed) {
 
         List<ElemStyle> sl = new ArrayList<>();
@@ -327 +326 @@
         for (StyleSource s : styleSources) {
             if (s.active) {
-                s.apply(mc, osm, scale, multipolyOuterWay, pretendWayIsClosed);
+                s.apply(mc, osm, scale, pretendWayIsClosed);
             }
         }
@@ -402 +401 @@
         for (StyleSource s : styleSources) {
             if (s.active) {
-                s.apply(mc, r, 1, null, false);
+                s.apply(mc, r, 1, false);
             }
         }
@@ -451 +450 @@
             if (MapPaintStyles.getStyles() == null)
                 return null;
-            for (ElemStyle s : MapPaintStyles.getStyles().generateStyles(p, 1.0, null, pretendWayIsClosed).a) {
+            for (ElemStyle s : MapPaintStyles.getStyles().generateStyles(p, 1.0, pretendWayIsClosed).a) {
                 if (s instanceof AreaElemStyle)
                     return (AreaElemStyle) s;
@@ -484 +483 @@
             if (MapPaintStyles.getStyles() == null)
                 return false;
-            StyleList styles = MapPaintStyles.getStyles().generateStyles(p, 1.0, null, false).a;
+            StyleList styles = MapPaintStyles.getStyles().generateStyles(p, 1.0, false).a;
             if (styles.isEmpty()) {
                 return false;

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

@@ -146 +146 @@
             MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
             try {
-                styleList = getStyles().generateStyles(virtualNode, 0.5, null, false).a;
+                styleList = getStyles().generateStyles(virtualNode, 0.5, false).a;
             } finally {
                 MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().unlock();

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

@@ -77 +77 @@
      * outer ways of a multipolygon.
      */
-    public abstract void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed);
+    public abstract void apply(MultiCascade mc, OsmPrimitive osm, double scale, boolean pretendWayIsClosed);
 
     /**

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -428 +428 @@
 
     @Override
-    public void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed) {
+    public void apply(MultiCascade mc, OsmPrimitive osm, double scale, boolean pretendWayIsClosed) {
         Environment env = new Environment(osm, mc, null, this);
         MapCSSRuleIndex matchingRuleIndex;

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -301 +301 @@
 
     @Override
-    public void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed) {
+    public void apply(MultiCascade mc, OsmPrimitive osm, double scale, boolean pretendWayIsClosed) {
         Cascade def = mc.getOrCreateCascade("default");
         boolean useMinMaxScale = Main.pref.getBoolean("mappaint.zoomLevelDisplay", false);
@@ -367 +367 @@
                 }
             }
-            if (multipolyOuterWay != null) {
-                WayPrototypesRecord p2 = new WayPrototypesRecord();
-                get(multipolyOuterWay, true, p2, (useMinMaxScale ? scale : null), mc);
-                if (Objects.equals(p.area, p2.area)) {
-                    p.area = null;
-                }
-            }
             if (p.area != null) {
                 def.putOrClear(FILL_COLOR, p.area.color);