Changeset 13917 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-06-11T03:14:29+02:00 (6 years ago)

Author:

Don-vip

Message:

rendering of IPrimitives

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• ElemStyles.java (modified) (10 diffs)
• mapcss/MapCSSStyleSource.java (modified) (3 diffs)

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

@@ -12 +12 @@
 import java.util.Optional;
 
+import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.IPrimitive;
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.IRelation;
+import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
@@ -157 +158 @@
         }
         Pair<StyleElementList, Range> p = getImpl(osm, scale, nc);
-        if (osm instanceof Node && isDefaultNodes()) {
+        if (osm instanceof INode && isDefaultNodes()) {
             if (p.a.isEmpty()) {
                 if (TextLabel.AUTO_LABEL_COMPOSITION_STRATEGY.compose(osm) != null) {
@@ -183 +184 @@
                 }
             }
-        } else if (osm instanceof Way && isDefaultLines()) {
+        } else if (osm instanceof IWay && isDefaultLines()) {
             boolean hasProperLineStyle = false;
             for (StyleElement s : p.a) {
@@ -235 +236 @@
      */
     private Pair<StyleElementList, Range> getImpl(IPrimitive osm, double scale, NavigatableComponent nc) {
-        if (osm instanceof Node)
+        if (osm instanceof INode)
             return generateStyles(osm, scale, false);
-        else if (osm instanceof Way) {
+        else if (osm instanceof IWay) {
             Pair<StyleElementList, Range> p = generateStyles(osm, scale, false);
 
@@ -245 +246 @@
             // FIXME: Maybe in the future outer way styles apply to outers ignoring the multipolygon?
             for (IPrimitive referrer : osm.getReferrers()) {
-                Relation r = (Relation) referrer;
-                if (!drawMultipolygon || !r.isMultipolygon() || !r.isUsable()) {
+                IRelation<?> r = (IRelation<?>) referrer;
+                if (!drawMultipolygon || !r.isMultipolygon() || !r.isUsable() || !(r instanceof Relation)) {
                     continue;
                 }
-                Multipolygon multipolygon = MultipolygonCache.getInstance().get(r);
+                Multipolygon multipolygon = MultipolygonCache.getInstance().get((Relation) r);
 
                 if (multipolygon.getOuterWays().contains(osm)) {
@@ -313 +314 @@
 
             for (IPrimitive referrer : osm.getReferrers()) {
-                Relation ref = (Relation) referrer;
-                if (!drawMultipolygon || !ref.isMultipolygon() || !ref.isUsable()) {
+                IRelation<?> ref = (IRelation<?>) referrer;
+                if (!drawMultipolygon || !ref.isMultipolygon() || !ref.isUsable() || !(ref instanceof Relation)) {
                     continue;
                 }
-                final Multipolygon multipolygon = MultipolygonCache.getInstance().get(ref);
+                final Multipolygon multipolygon = MultipolygonCache.getInstance().get((Relation) ref);
 
                 if (multipolygon.getInnerWays().contains(osm)) {
@@ -346 +347 @@
             }
             return p;
-        } else if (osm instanceof Relation) {
+        } else if (osm instanceof IRelation) {
             return generateStyles(osm, scale, true);
         }
@@ -383 +384 @@
             }
             env.layer = e.getKey();
-            if (osm instanceof Way) {
+            if (osm instanceof IWay) {
                 AreaElement areaStyle = AreaElement.create(env);
                 addIfNotNull(sl, areaStyle);
@@ -397 +398 @@
                     addIfNotNull(sl, TextElement.createForContent(env));
                 }
-            } else if (osm instanceof Node) {
+            } else if (osm instanceof INode) {
                 NodeElement nodeStyle = NodeElement.create(env);
                 if (nodeStyle != null) {
@@ -405 +406 @@
                     addIfNotNull(sl, BoxTextElement.create(env, NodeElement.SIMPLE_NODE_ELEMSTYLE_BOXPROVIDER));
                 }
-            } else if (osm instanceof Relation) {
-                if (((Relation) osm).isMultipolygon()) {
+            } else if (osm instanceof IRelation) {
+                if (((IRelation<?>) osm).isMultipolygon()) {
                     AreaElement areaStyle = AreaElement.create(env);
                     addIfNotNull(sl, areaStyle);

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

@@ -30 +30 @@
 
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.IRelation;
+import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.data.osm.KeyValueVisitor;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmUtils;
-import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Tagged;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
@@ -647 +648 @@
     public void apply(MultiCascade mc, IPrimitive osm, double scale, boolean pretendWayIsClosed) {
         MapCSSRuleIndex matchingRuleIndex;
-        if (osm instanceof Node) {
+        if (osm instanceof INode) {
             matchingRuleIndex = nodeRules;
-        } else if (osm instanceof Way) {
+        } else if (osm instanceof IWay) {
             if (OsmUtils.isFalse(osm.get("area"))) {
                 matchingRuleIndex = wayNoAreaRules;
@@ -655 +656 @@
                 matchingRuleIndex = wayRules;
             }
-        } else if (osm instanceof Relation) {
-            if (((Relation) osm).isMultipolygon()) {
+        } else if (osm instanceof IRelation) {
+            if (((IRelation<?>) osm).isMultipolygon()) {
                 matchingRuleIndex = multipolygonRules;
             } else if (osm.hasKey("#canvas")) {