Changeset 18019 in josm

Timestamp:

2021-07-14T19:16:41+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20955 - restrict "Overlapping Areas" test to completely downloaded primitives

Location:

trunk

Files:

• resources/data/validator/geometry.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/IWay.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/Way.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java (modified) (1 diff)

trunk/resources/data/validator/geometry.mapcss

@@ -211 +211 @@
 }
 
-area:closed:areaStyle ⧉ area:closed:areaStyle {
+area:completely_downloaded:closed:areaStyle ⧉ area:completely_downloaded:closed:areaStyle {
   throwOther: tr("Overlapping Areas");
 }

trunk/src/org/openstreetmap/josm/data/osm/IWay.java

@@ -133 +133 @@
      */
     boolean isInnerNode(INode n);
+
+    /**
+     * Replies true if this way has incomplete nodes, false otherwise.
+     * @return true if this way has incomplete nodes, false otherwise.
+     * @since 18019
+     */
+    default boolean hasIncompleteNodes() {
+        return false;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -606 +606 @@
     }
 
-    /**
-     * Replies true if this way has incomplete nodes, false otherwise.
-     * @return true if this way has incomplete nodes, false otherwise.
-     * @since 2587
-     */
+    @Override
     public boolean hasIncompleteNodes() {
         return Arrays.stream(nodes).anyMatch(Node::isIncomplete);

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

@@ -850 +850 @@
             if (e.osm instanceof IRelation<?>) {
                 return !((IRelation<?>) e.osm).hasIncompleteMembers();
+            } else if (e.osm instanceof IWay<?>) {
+                return !((IWay<?>) e.osm).hasIncompleteNodes();
+            } else if (e.osm instanceof INode) {
+                return ((INode) e.osm).isLatLonKnown();
             } else {
                 return true;