Changeset 19170 in josm

Timestamp:

2024-08-06T23:29:28+02:00 (4 months ago)

Author:

taylor.smock

Message:

Fix #23290: When an object is not in the appropriate region based off of the center of its bbox, check all the nodes.

This does not appear to have a significant performance impact; this may change as
more region specific presets are created.

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -39 +39 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.DataSet;
+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.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -806 +811 @@
     private void tagCheckReal(TaggingPreset preset, OsmPrimitive p, LatLon center, RegionSpecific data) {
         // First, check if we aren't in the region for the tag
-        if (latLonInRegions(center, data.regions()) == data.exclude_regions()) {
+        if (latLonInRegions(center, data.regions()) == data.exclude_regions()
+                // Check to ensure that no nodes are in the region if the center is not in the region
+                && !primitiveInRegions(p, data.regions(), data.exclude_regions())) {
             final String key;
             final String value;
@@ -840 +847 @@
 
     /**
+     * Check if a primitive is in the specified regions
+     * @param primitive The primitive to recursively check
+     * @param regions The regions to look for
+     * @param excludeRegions Whether or not we are looking to exclude the regions (see {@link RegionSpecific#exclude_regions()})
+     * @return {@code true} if the primitive is in a region that it should not be
+     */
+    private static boolean primitiveInRegions(IPrimitive primitive, Collection<String> regions, boolean excludeRegions) {
+        if (primitive instanceof INode) {
+            return latLonInRegions((INode) primitive, regions) == excludeRegions;
+        } else if (primitive instanceof IWay) {
+            return ((IWay<?>) primitive).getNodes().stream().anyMatch(n -> primitiveInRegions(n, regions, excludeRegions));
+        } else if (primitive instanceof IRelation) {
+            return ((IRelation<?>) primitive).getMemberPrimitivesList().stream().anyMatch(p -> primitiveInRegions(p, regions, excludeRegions));
+        }
+        throw new IllegalArgumentException("Unknown primitive type: " + primitive);
+    }
+
+    /**
      * Check if the specified latlon is inside any of the specified regions
      * @param latLon The {@link LatLon} to check
@@ -845 +870 @@
      * @return {@code true} if the coordinate is inside any of the regions
      */
-    private static boolean latLonInRegions(LatLon latLon, Collection<String> regions) {
+    private static boolean latLonInRegions(ILatLon latLon, Collection<String> regions) {
         if (regions != null) {
             for (String region : regions) {
-                if (Territories.isIso3166Code(region, latLon)) {
+                if (Territories.isIso3166Code(region, latLon instanceof LatLon ? (LatLon) latLon : new LatLon(latLon))) {
                     return true;
                 }