Changeset 11761 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

Timestamp:

2017-03-21T15:47:29+01:00 (7 years ago)

Author:

michael2402

Message:

See #10176: Allow icons in multipolygons, use even/odd winding rule for icon placement position in multipolygons

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (4 diffs)

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

@@ -74 +74 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.AreaIconElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.HorizontalTextAlignment;
@@ -1133 +1134 @@
                     MapViewPath path = new MapViewPath(mapState);
                     path.appendFromEastNorth(pd.get());
+                    path.setWindingRule(MapViewPath.WIND_EVEN_ODD);
                     consumer.accept(path);
                 }
@@ -1602 +1604 @@
             StyleElementList sl = styles.get(osm, circum, nc);
             for (StyleElement s : sl) {
-                if (drawMultipolygon && drawArea && s instanceof AreaElement && (flags & FLAG_DISABLED) == 0) {
+                if (drawMultipolygon && drawArea && (s instanceof AreaElement || s instanceof AreaIconElement) && (flags & FLAG_DISABLED) == 0) {
                     output.add(new StyleRecord(s, osm, flags));
                 } else if (drawMultipolygon && drawArea && s instanceof TextElement) {
@@ -1615 +1617 @@
             StyleElementList sl = styles.get(osm, circum, nc);
             for (StyleElement s : sl) {
-                if (!(drawArea && (flags & FLAG_DISABLED) == 0) && s instanceof AreaElement) {
-                    continue;
-                }
-                output.add(new StyleRecord(s, osm, flags));
+                if ((drawArea && (flags & FLAG_DISABLED) == 0) || !(s instanceof AreaElement)) {
+                    output.add(new StyleRecord(s, osm, flags));
+                }
             }
         }