Changeset 13810 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-05-21T20:42:27+02:00 (6 years ago)

Author:

Don-vip

Message:

support rendering of IPrimitive

Location:

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

Files:

• ElemStyles.java (modified) (11 diffs)
• Environment.java (modified) (10 diffs)
• StyleSource.java (modified) (2 diffs)
• mapcss/ConditionFactory.java (modified) (3 diffs)
• mapcss/ExpressionFactory.java (modified) (2 diffs)
• mapcss/MapCSSStyleSource.java (modified) (3 diffs)
• mapcss/Selector.java (modified) (21 diffs)

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

@@ -12 +12 @@
 import java.util.Optional;
 
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -45 +45 @@
  * There are several steps to derive the list of elements for display:
  * <ol>
- * <li>{@link #generateStyles(OsmPrimitive, double, boolean)} applies the
+ * <li>{@link #generateStyles(IPrimitive, double, boolean)} applies the
  * {@link StyleSource}s one after another to get a key-value map of MapCSS
  * properties. Then a preliminary set of StyleElements is derived from the
  * properties map.</li>
- * <li>{@link #getImpl(OsmPrimitive, double, NavigatableComponent)} handles the
+ * <li>{@link #getImpl(IPrimitive, double, NavigatableComponent)} handles the
  * different forms of multipolygon tagging.</li>
- * <li>{@link #getStyleCacheWithRange(OsmPrimitive, double, NavigatableComponent)}
+ * <li>{@link #getStyleCacheWithRange(IPrimitive, double, NavigatableComponent)}
  * adds a default StyleElement for primitives that would be invisible otherwise.
  * (For example untagged nodes and ways.)</li>
@@ -131 +131 @@
      * @param nc display component
      * @return list of styles
-     */
-    public StyleElementList get(OsmPrimitive osm, double scale, NavigatableComponent nc) {
+     * @since 13810 (signature)
+     */
+    public StyleElementList get(IPrimitive osm, double scale, NavigatableComponent nc) {
         return getStyleCacheWithRange(osm, scale, nc).a;
     }
@@ -145 +146 @@
      * @param nc navigatable component
      * @return pair containing style list and range
-     */
-    public Pair<StyleElementList, Range> getStyleCacheWithRange(OsmPrimitive osm, double scale, NavigatableComponent nc) {
+     * @since 13810 (signature)
+     */
+    public Pair<StyleElementList, Range> getStyleCacheWithRange(IPrimitive osm, double scale, NavigatableComponent nc) {
         if (!osm.isCachedStyleUpToDate() || scale <= 0) {
             osm.setCachedStyle(StyleCache.EMPTY_STYLECACHE);
@@ -232 +234 @@
      * @return pair containing style list and range
      */
-    private Pair<StyleElementList, Range> getImpl(OsmPrimitive osm, double scale, NavigatableComponent nc) {
+    private Pair<StyleElementList, Range> getImpl(IPrimitive osm, double scale, NavigatableComponent nc) {
         if (osm instanceof Node)
             return generateStyles(osm, scale, false);
@@ -242 +244 @@
 
             // FIXME: Maybe in the future outer way styles apply to outers ignoring the multipolygon?
-            for (OsmPrimitive referrer : osm.getReferrers()) {
+            for (IPrimitive referrer : osm.getReferrers()) {
                 Relation r = (Relation) referrer;
                 if (!drawMultipolygon || !r.isMultipolygon() || !r.isUsable()) {
@@ -310 +312 @@
             if (!isDefaultLines()) return p;
 
-            for (OsmPrimitive referrer : osm.getReferrers()) {
+            for (IPrimitive referrer : osm.getReferrers()) {
                 Relation ref = (Relation) referrer;
                 if (!drawMultipolygon || !ref.isMultipolygon() || !ref.isUsable()) {
@@ -362 +364 @@
      * outer ways of a multipolygon.
      * @return the generated styles and the valid range as a pair
-     */
-    public Pair<StyleElementList, Range> generateStyles(OsmPrimitive osm, double scale, boolean pretendWayIsClosed) {
+     * @since 13810 (signature)
+     */
+    public Pair<StyleElementList, Range> generateStyles(IPrimitive osm, double scale, boolean pretendWayIsClosed) {
 
         List<StyleElement> sl = new ArrayList<>();
@@ -522 +525 @@
      * outer ways of a multipolygon.
      * @return first AreaElement found or {@code null}.
-     */
-    public static AreaElement getAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
+     * @since 13810 (signature)
+     */
+    public static AreaElement getAreaElemStyle(IPrimitive p, boolean pretendWayIsClosed) {
         MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
         try {
@@ -545 +549 @@
      * outer ways of a multipolygon.
      * @return {@code true} if primitive has an AreaElement
-     */
-    public static boolean hasAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
+     * @since 13810 (signature)
+     */
+    public static boolean hasAreaElemStyle(IPrimitive p, boolean pretendWayIsClosed) {
         return getAreaElemStyle(p, pretendWayIsClosed) != null;
     }
@@ -558 +563 @@
      * @return {@code true} if primitive has area elements, but no line elements
      * @since 12700
-     */
-    public static boolean hasOnlyAreaElements(OsmPrimitive p) {
+     * @since 13810 (signature)
+     */
+    public static boolean hasOnlyAreaElements(IPrimitive p) {
         MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
         try {

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context;
@@ -18 +18 @@
      * The primitive that is currently evaluated
      */
-    public OsmPrimitive osm;
+    public IPrimitive osm;
 
     /**
@@ -43 +43 @@
      * is evaluated in a {@link LinkSelector} (within a child selector)
      */
-    public OsmPrimitive parent;
+    public IPrimitive parent;
 
     /**
      * The same for parent selector. Only one of the 2 fields (parent or child) is not null in any environment.
      */
-    public OsmPrimitive child;
+    public IPrimitive child;
 
     /**
@@ -71 +71 @@
      * @param osm OSM primitive
      * @since 8415
-     */
-    public Environment(OsmPrimitive osm) {
+     * @since 13810 (signature)
+     */
+    public Environment(IPrimitive osm) {
         this.osm = osm;
     }
@@ -82 +83 @@
      * @param layer layer
      * @param source style source
-     */
-    public Environment(OsmPrimitive osm, MultiCascade mc, String layer, StyleSource source) {
+     * @since 13810 (signature)
+     */
+    public Environment(IPrimitive osm, MultiCascade mc, String layer, StyleSource source) {
         this.osm = osm;
         this.mc = mc;
@@ -114 +116 @@
      * @return A clone of this environment, with the specified primitive
      * @see #osm
-     */
-    public Environment withPrimitive(OsmPrimitive osm) {
+     * @since 13810 (signature)
+     */
+    public Environment withPrimitive(IPrimitive osm) {
         Environment e = new Environment(this);
         e.osm = osm;
@@ -126 +129 @@
      * @return A clone of this environment, with the specified parent
      * @see #parent
-     */
-    public Environment withParent(OsmPrimitive parent) {
+     * @since 13810 (signature)
+     */
+    public Environment withParent(IPrimitive parent) {
         Environment e = new Environment(this);
         e.parent = parent;
@@ -142 +146 @@
      * @see #index
      * @since 6175
-     */
-    public Environment withParentAndIndexAndLinkContext(OsmPrimitive parent, int index, int count) {
+     * @since 13810 (signature)
+     */
+    public Environment withParentAndIndexAndLinkContext(IPrimitive parent, int index, int count) {
         Environment e = new Environment(this);
         e.parent = parent;
@@ -157 +162 @@
      * @return A clone of this environment, with the specified child
      * @see #child
-     */
-    public Environment withChild(OsmPrimitive child) {
+     * @since 13810 (signature)
+     */
+    public Environment withChild(IPrimitive child) {
         Environment e = new Environment(this);
         e.child = child;
@@ -173 +179 @@
      * @see #index
      * @since 6175
-     */
-    public Environment withChildAndIndexAndLinkContext(OsmPrimitive child, int index, int count) {
+     * @since 13810 (signature)
+     */
+    public Environment withChildAndIndexAndLinkContext(IPrimitive child, int index, int count) {
         Environment e = new Environment(this);
         e.child = child;

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

@@ -20 +20 @@
 import javax.swing.ImageIcon;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
 import org.openstreetmap.josm.data.preferences.sources.SourceType;
@@ -94 +94 @@
      * we pretend it is. This is useful for generating area styles from the (segmented)
      * outer ways of a multipolygon.
-     */
-    public abstract void apply(MultiCascade mc, OsmPrimitive osm, double scale, boolean pretendWayIsClosed);
+     * @since 13810 (signature)
+     */
+    public abstract void apply(MultiCascade mc, IPrimitive osm, double scale, boolean pretendWayIsClosed);
 
     /**

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

@@ -15 +15 @@
 import java.util.regex.PatternSyntaxException;
 
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -681 +682 @@
          * @param e MapCSS environment
          * @return {@code true} if the object has an area style
-         * @see ElemStyles#hasAreaElemStyle(OsmPrimitive, boolean)
+         * @see ElemStyles#hasAreaElemStyle(IPrimitive, boolean)
          */
         static boolean areaStyle(Environment e) { // NO_UCD (unused code)
@@ -749 +750 @@
          */
         static boolean inDownloadedArea(Environment e) { // NO_UCD (unused code)
-            return IN_DOWNLOADED_AREA.test(e.osm);
+            return e.osm instanceof OsmPrimitive && IN_DOWNLOADED_AREA.test((OsmPrimitive) e.osm);
         }
 

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

@@ -460 +460 @@
                 if (env.osm != null) {
                     // we don't have a matched parent, so just search all referrers
-                    for (OsmPrimitive parent : env.osm.getReferrers()) {
+                    for (IPrimitive parent : env.osm.getReferrers()) {
                         String value = parent.get(key);
                         if (value != null) {
@@ -485 +485 @@
                     final Collection<String> tags = new TreeSet<>(AlphanumComparator.getInstance());
                     // we don't have a matched parent, so just search all referrers
-                    for (OsmPrimitive parent : env.osm.getReferrers()) {
+                    for (IPrimitive parent : env.osm.getReferrers()) {
                         String value = parent.get(key);
                         if (value != null) {

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

@@ -30 +30 @@
 
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.KeyValueVisitor;
 import org.openstreetmap.josm.data.osm.Node;
@@ -357 +358 @@
          * @param osm the primitive to match
          * @return An iterator over possible rules in the right order.
-         */
-        public Iterator<MapCSSRule> getRuleCandidates(OsmPrimitive osm) {
+         * @since 13810 (signature)
+         */
+        public Iterator<MapCSSRule> getRuleCandidates(IPrimitive osm) {
             final BitSet ruleCandidates = new BitSet(rules.size());
             ruleCandidates.or(remaining);
@@ -638 +640 @@
 
     @Override
-    public void apply(MultiCascade mc, OsmPrimitive osm, double scale, boolean pretendWayIsClosed) {
+    public void apply(MultiCascade mc, IPrimitive osm, double scale, boolean pretendWayIsClosed) {
         MapCSSRuleIndex matchingRuleIndex;
         if (osm instanceof Node) {

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

@@ -14 +14 @@
 import java.util.regex.PatternSyntaxException;
 
+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.IRelationMember;
+import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -19 +24 @@
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
+import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.gui.mappaint.Environment;
@@ -145 +149 @@
          *
          */
-        private class MatchingReferrerFinder implements OsmPrimitiveVisitor {
+        private class MatchingReferrerFinder implements PrimitiveVisitor {
             private final Environment e;
 
@@ -157 +161 @@
 
             @Override
-            public void visit(Node n) {
+            public void visit(INode n) {
                 // node should never be a referrer
                 throw new AssertionError();
             }
 
-            private <T extends OsmPrimitive> void doVisit(T parent, IntSupplier counter, IntFunction<OsmPrimitive> getter) {
+            private <T extends IPrimitive> void doVisit(T parent, IntSupplier counter, IntFunction<IPrimitive> getter) {
                 // If e.parent is already set to the first matching referrer.
                 // We skip any following referrer injected into the visitor.
@@ -187 +191 @@
 
             @Override
-            public void visit(Way w) {
+            public void visit(IWay<?> w) {
                 doVisit(w, w::getNodesCount, w::getNode);
             }
 
             @Override
-            public void visit(Relation r) {
+            public void visit(IRelation<?> r) {
                 doVisit(r, r::getMembersCount, i -> r.getMember(i).getMember());
             }
         }
 
-        private abstract static class AbstractFinder implements OsmPrimitiveVisitor {
+        private abstract static class AbstractFinder implements PrimitiveVisitor {
             protected final Environment e;
 
@@ -205 +209 @@
 
             @Override
-            public void visit(Node n) {
-            }
-
-            @Override
-            public void visit(Way w) {
-            }
-
-            @Override
-            public void visit(Relation r) {
-            }
-
-            public void visit(Collection<? extends OsmPrimitive> primitives) {
-                for (OsmPrimitive p : primitives) {
+            public void visit(INode n) {
+            }
+
+            @Override
+            public void visit(IWay<?> w) {
+            }
+
+            @Override
+            public void visit(IRelation<?> r) {
+            }
+
+            public void visit(Collection<? extends IPrimitive> primitives) {
+                for (IPrimitive p : primitives) {
                     if (e.child != null) {
                         // abort if first match has been found
@@ -227 +231 @@
             }
 
-            public boolean isPrimitiveUsable(OsmPrimitive p) {
+            public boolean isPrimitiveUsable(IPrimitive p) {
                 return !e.osm.equals(p) && p.isUsable();
             }
@@ -235 +239 @@
 
             @Override
-            public void visit(Way w) {
+            public void visit(IWay<?> w) {
                 w.visitReferrers(innerVisitor);
             }
@@ -243 +247 @@
             }
 
-            private final OsmPrimitiveVisitor innerVisitor = new AbstractFinder(e) {
+            private final PrimitiveVisitor innerVisitor = new AbstractFinder(e) {
                 @Override
-                public void visit(Relation r) {
-                    if (left.matches(e.withPrimitive(r))) {
-                        final List<Node> openEnds = MultipolygonCache.getInstance().get(r).getOpenEnds();
+                public void visit(IRelation<?> r) {
+                    if (r instanceof Relation && left.matches(e.withPrimitive(r))) {
+                        final List<Node> openEnds = MultipolygonCache.getInstance().get((Relation) r).getOpenEnds();
                         final int openEndIndex = openEnds.indexOf(e.osm);
                         if (openEndIndex >= 0) {
@@ -265 +269 @@
             private CrossingFinder(Environment e) {
                 super(e);
-                CheckParameterUtil.ensureThat(e.osm instanceof Way, "Only ways are supported");
+                CheckParameterUtil.ensureThat(e.osm instanceof IWay, "Only ways are supported");
                 layer = OsmUtils.getLayer(e.osm);
             }
 
             @Override
-            public void visit(Way w) {
+            public void visit(IWay<?> w) {
                 if (e.child == null && Objects.equals(layer, OsmUtils.getLayer(w))
                     && left.matches(new Environment(w).withParent(e.osm))
-                    && e.osm instanceof Way && Geometry.PolygonIntersection.CROSSING.equals(
+                    && e.osm instanceof IWay && Geometry.PolygonIntersection.CROSSING.equals(
                             Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))) {
                     e.child = w;
@@ -283 +287 @@
             protected ContainsFinder(Environment e) {
                 super(e);
-                CheckParameterUtil.ensureThat(!(e.osm instanceof Node), "Nodes not supported");
-            }
-
-            @Override
-            public void visit(Node n) {
+                CheckParameterUtil.ensureThat(!(e.osm instanceof INode), "Nodes not supported");
+            }
+
+            @Override
+            public void visit(INode n) {
                 if (e.child == null && left.matches(new Environment(n).withParent(e.osm))
-                    && ((e.osm instanceof Way && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes()))
+                    && ((e.osm instanceof IWay && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes()))
                             || (e.osm instanceof Relation && (
                                     (Relation) e.osm).isMultipolygon() && Geometry.isNodeInsideMultiPolygon(n, (Relation) e.osm, null)))) {
@@ -297 +301 @@
 
             @Override
-            public void visit(Way w) {
+            public void visit(IWay<?> w) {
                 if (e.child == null && left.matches(new Environment(w).withParent(e.osm))
-                    && ((e.osm instanceof Way && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(
+                    && ((e.osm instanceof IWay && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(
                             Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes())))
                             || (e.osm instanceof Relation && (
@@ -317 +321 @@
             if (ChildOrParentSelectorType.ELEMENT_OF.equals(type)) {
 
-                if (e.osm instanceof Node || e.osm.getDataSet() == null) {
+                if (e.osm instanceof INode || e.osm.getDataSet() == null) {
                     // nodes cannot contain elements
                     return false;
@@ -326 +330 @@
                     // if right selector also matches relations and if matched primitive is a way which is part of a multipolygon,
                     // use the multipolygon for further analysis
-                    if (!(e.osm instanceof Way)
+                    if (!(e.osm instanceof IWay)
                             || (right instanceof OptimizedGeneralSelector
                             && !((OptimizedGeneralSelector) right).matchesBase(OsmPrimitiveType.RELATION))) {
@@ -338 +342 @@
                     containsFinder = new ContainsFinder(new Environment(multipolygon)) {
                         @Override
-                        public boolean isPrimitiveUsable(OsmPrimitive p) {
+                        public boolean isPrimitiveUsable(IPrimitive p) {
                             return super.isPrimitiveUsable(p) && !members.contains(p);
                         }
@@ -362 +366 @@
                 return e.child != null;
 
-            } else if (ChildOrParentSelectorType.CROSSING.equals(type) && e.osm instanceof Way) {
+            } else if (ChildOrParentSelectorType.CROSSING.equals(type) && e.osm instanceof IWay) {
                 e.parent = e.osm;
                 final CrossingFinder crossingFinder = new CrossingFinder(e);
@@ -371 +375 @@
                 return e.child != null;
             } else if (ChildOrParentSelectorType.SIBLING.equals(type)) {
-                if (e.osm instanceof Node) {
-                    for (Way w : Utils.filteredCollection(e.osm.getReferrers(true), Way.class)) {
-                        final int i = w.getNodes().indexOf(e.osm);
-                        if (i - 1 >= 0) {
-                            final Node n = w.getNode(i - 1);
-                            final Environment e2 = e.withPrimitive(n).withParent(w).withChild(e.osm);
-                            if (left.matches(e2) && link.matches(e2.withLinkContext())) {
-                                e.child = n;
-                                e.index = i;
-                                e.count = w.getNodesCount();
-                                e.parent = w;
-                                return true;
+                if (e.osm instanceof INode) {
+                    for (IPrimitive ref : e.osm.getReferrers(true)) {
+                        if (ref instanceof IWay) {
+                            IWay<?> w = (IWay<?>) ref;
+                            final int i = w.getNodes().indexOf(e.osm);
+                            if (i - 1 >= 0) {
+                                final INode n = w.getNode(i - 1);
+                                final Environment e2 = e.withPrimitive(n).withParent(w).withChild(e.osm);
+                                if (left.matches(e2) && link.matches(e2.withLinkContext())) {
+                                    e.child = n;
+                                    e.index = i;
+                                    e.count = w.getNodesCount();
+                                    e.parent = w;
+                                    return true;
+                                }
                             }
                         }
@@ -390 +397 @@
                     && link.conds != null && !link.conds.isEmpty()
                     && link.conds.get(0) instanceof OpenEndPseudoClassCondition) {
-                if (e.osm instanceof Node) {
+                if (e.osm instanceof INode) {
                     e.osm.visitReferrers(new MultipolygonOpenEndFinder(e));
                     return e.parent != null;
@@ -400 +407 @@
                     return true;
             } else if (ChildOrParentSelectorType.PARENT.equals(type)) {
-                if (e.osm instanceof Way) {
-                    List<Node> wayNodes = ((Way) e.osm).getNodes();
+                if (e.osm instanceof IWay) {
+                    List<? extends INode> wayNodes = ((IWay<?>) e.osm).getNodes();
                     for (int i = 0; i < wayNodes.size(); i++) {
-                        Node n = wayNodes.get(i);
+                        INode n = wayNodes.get(i);
                         if (left.matches(e.withPrimitive(n))
                             && link.matches(e.withChildAndIndexAndLinkContext(n, i, wayNodes.size()))) {
@@ -412 +419 @@
                         }
                     }
-                } else if (e.osm instanceof Relation) {
-                    List<RelationMember> members = ((Relation) e.osm).getMembers();
+                } else if (e.osm instanceof IRelation) {
+                    List<? extends IRelationMember<?>> members = ((IRelation<?>) e.osm).getMembers();
                     for (int i = 0; i < members.size(); i++) {
-                        OsmPrimitive member = members.get(i).getMember();
+                        IPrimitive member = members.get(i).getMember();
                         if (left.matches(e.withPrimitive(member))
                             && link.matches(e.withChildAndIndexAndLinkContext(member, i, members.size()))) {
@@ -624 +631 @@
         }
 
-        public boolean matchesBase(OsmPrimitive p) {
+        public boolean matchesBase(IPrimitive p) {
             if (!matchesBase(p.getType())) {
                 return false;
             } else {
-                if (p instanceof Relation) {
+                if (p instanceof IRelation) {
                     if ("area".equals(base)) {
-                        return ((Relation) p).isMultipolygon();
+                        return ((IRelation<?>) p).isMultipolygon();
                     } else if ("canvas".equals(base)) {
                         return p.get("#canvas") != null;