Ticket #22404: 22404.patch

src/org/openstreetmap/josm/data/osm/PrimitiveId.java

@@ -16 +16 @@
     long getUniqueId();
 
     /**
-     * Gets the type of object represented by this object.
+     * Gets the type of object represented by this object. Note that this should
+     * return the base primitive type ({@link OsmPrimitiveType#NODE},
+     * {@link OsmPrimitiveType#WAY}, and {@link OsmPrimitiveType#RELATION}).
      *
      * @return the object type
      * @see Node

src/org/openstreetmap/josm/data/vector/VectorDataStore.java

@@ -267 +267 @@
     private <T extends Tile & VectorTile> VectorRelation areaToRelation(T tile, Layer layer,
       Collection<VectorPrimitive> featureObjects, Area area) {
         VectorRelation vectorRelation = new VectorRelation(layer.getName());
-        for (VectorPrimitive member : pathIteratorToObjects(tile, layer, featureObjects, area.getPathIterator(null))) {
+        PathIterator pathIterator = area.getPathIterator(null);
+        int windingRule = pathIterator.getWindingRule();
+        for (VectorPrimitive member : pathIteratorToObjects(tile, layer, featureObjects, pathIterator)) {
             final String role;
             if (member instanceof VectorWay && ((VectorWay) member).isClosed()) {
+                // Area messes up the winding. See #22404.
+                if (windingRule == PathIterator.WIND_NON_ZERO) {
+                    VectorWay vectorWay = (VectorWay) member;
+                    List<VectorNode> nodes = new ArrayList<>(vectorWay.getNodes());
+                    Collections.reverse(nodes);
+                    vectorWay.setNodes(nodes);
+                }
                 role = Geometry.isClockwise(((VectorWay) member).getNodes()) ? "outer" : "inner";
             } else {
                 role = "";
@@ -374 +383 @@
         } else if (shape instanceof Path2D) {
             primitive = pathToWay(tile, layer, featureObjects, (Path2D) shape).stream().findFirst().orElse(null);
         } else if (shape instanceof Area) {
-            primitive = areaToRelation(tile, layer, featureObjects, (Area) shape);
-            primitive.put(RELATION_TYPE, MULTIPOLYGON_TYPE);
+            VectorRelation vectorRelation = areaToRelation(tile, layer, featureObjects, (Area) shape);
+            if (vectorRelation.getMembersCount() != 1) {
+                primitive = vectorRelation;
+                primitive.put(RELATION_TYPE, MULTIPOLYGON_TYPE);
+            } else {
+                primitive = vectorRelation.getMember(0).getMember();
+            }
         } else {
             // We shouldn't hit this, but just in case
             throw new UnsupportedOperationException(Objects.toString(shape));

src/org/openstreetmap/josm/data/vector/VectorWay.java

@@ -130 +130 @@
 
     @Override
     public OsmPrimitiveType getType() {
+        return OsmPrimitiveType.WAY;
+    }
+
+    @Override
+    public OsmPrimitiveType getDisplayType() {
         return this.isClosed() ? OsmPrimitiveType.CLOSEDWAY : OsmPrimitiveType.WAY;
     }
 }