Index: src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java =================================================================== --- src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 11158) +++ src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (working copy) @@ -5,7 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr; import static org.openstreetmap.josm.tools.I18n.trn; -import java.awt.geom.GeneralPath; +import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -21,15 +21,15 @@ import org.openstreetmap.josm.actions.CreateMultipolygonAction; import org.openstreetmap.josm.command.ChangeCommand; import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.data.coor.EastNorth; 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.RelationMember; import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.WaySegment; import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon; import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData; -import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData.Intersection; -import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache; import org.openstreetmap.josm.data.validation.OsmValidator; import org.openstreetmap.josm.data.validation.Severity; import org.openstreetmap.josm.data.validation.Test; @@ -55,8 +55,6 @@ public static final int NON_CLOSED_WAY = 1603; /** No outer way for multipolygon */ public static final int MISSING_OUTER_WAY = 1604; - /** Multipolygon inner way is outside */ - public static final int INNER_WAY_OUTSIDE = 1605; /** Intersection between multipolygon ways */ public static final int CROSSING_WAYS = 1606; /** Style for outer way mismatches / With the currently used mappaint style(s) the style for outer way mismatches the area style */ @@ -111,40 +109,6 @@ super.endTest(); } - private static GeneralPath createPath(List nodes) { - GeneralPath result = new GeneralPath(); - result.moveTo((float) nodes.get(0).getCoor().lat(), (float) nodes.get(0).getCoor().lon()); - for (int i = 1; i < nodes.size(); i++) { - Node n = nodes.get(i); - result.lineTo((float) n.getCoor().lat(), (float) n.getCoor().lon()); - } - return result; - } - - private static List createPolygons(List joinedWays) { - List result = new ArrayList<>(); - for (Multipolygon.PolyData way : joinedWays) { - result.add(createPath(way.getNodes())); - } - return result; - } - - private static Intersection getPolygonIntersection(GeneralPath outer, List inner) { - boolean inside = false; - boolean outside = false; - - for (Node n : inner) { - boolean contains = outer.contains(n.getCoor().lat(), n.getCoor().lon()); - inside = inside | contains; - outside = outside | !contains; - if (inside & outside) { - return Intersection.CROSSING; - } - } - - return inside ? Intersection.INSIDE : Intersection.OUTSIDE; - } - @Override public void visit(Way w) { if (!w.isArea() && ElemStyles.hasOnlyAreaElemStyle(w)) { @@ -169,15 +133,16 @@ checkMembersAndRoles(r); checkOuterWay(r); checkRepeatedWayMembers(r); - - // Rest of checks is only for complete multipolygons - if (!r.hasIncompleteMembers()) { - Multipolygon polygon = new Multipolygon(r); - - // Create new multipolygon using the logics from CreateMultipolygonAction and see if roles match. - checkMemberRoleCorrectness(r); - checkStyleConsistency(r, polygon); - checkGeometry(r, polygon); + boolean hasRepeatedMembers = checkRepeatedWayMembers(r); + if (!hasRepeatedMembers) { + List intersectionNodes = checkIntersectionAtNodes(r); + // Rest of checks is only for complete multipolygons + if (!r.hasIncompleteMembers()) { + checkMemberRoleCorrectness(r); + Multipolygon polygon = new Multipolygon(r); + checkStyleConsistency(r, polygon); + checkGeometry(r, polygon, intersectionNodes); + } } } } @@ -205,13 +170,16 @@ } /** - * Create new multipolygon using the logics from CreateMultipolygonAction and see if roles match:
    + * If simple joining of ways doesn't work, create new multipolygon using the logics from + * CreateMultipolygonAction and see if roles match:
      *
    • {@link #WRONG_MEMBER_ROLE}: Role for ''{0}'' should be ''{1}''
      • *
    * @param r relation + * @return true if member roles were checked */ - private void checkMemberRoleCorrectness(Relation r) { + private boolean checkMemberRoleCorrectness(Relation r) { final Pair newMP = CreateMultipolygonAction.createMultipolygonRelation(r.getMemberPrimitives(Way.class), false); + if (newMP != null) { for (RelationMember member : r.getMembers()) { final Collection memberInNewMP = newMP.b.getMembersFor(Collections.singleton(member.getMember())); @@ -229,6 +197,7 @@ } } } + return newMP != null; } /** @@ -308,13 +277,13 @@ /** * Various geometry-related checks:
      *
    • {@link #NON_CLOSED_WAY}: Multipolygon is not closed
      • - *
    • {@link #INNER_WAY_OUTSIDE}: Multipolygon inner way is outside
      • *
    • {@link #CROSSING_WAYS}: Intersection between multipolygon ways
      • *
    * @param r relation * @param polygon multipolygon + * @param intersectionNodes known nodes where ways of this multipolygon intersect or touch */ - private void checkGeometry(Relation r, Multipolygon polygon) { + private void checkGeometry(Relation r, Multipolygon polygon, List intersectionNodes) { List openNodes = polygon.getOpenEnds(); if (!openNodes.isEmpty()) { errors.add(TestError.builder(this, Severity.WARNING, NON_CLOSED_WAY) @@ -324,52 +293,146 @@ .build()); } - // For painting is used Polygon class which works with ints only. For validation we need more precision List innerPolygons = polygon.getInnerPolygons(); List outerPolygons = polygon.getOuterPolygons(); - List innerPolygonsPaths = innerPolygons.isEmpty() ? Collections.emptyList() : createPolygons(innerPolygons); - List outerPolygonsPaths = createPolygons(outerPolygons); - for (int i = 0; i < outerPolygons.size(); i++) { - PolyData pdOuter = outerPolygons.get(i); - // Check for intersection between outer members - for (int j = i+1; j < outerPolygons.size(); j++) { - checkCrossingWays(r, outerPolygons, outerPolygonsPaths, pdOuter, j); - } + checkCrossingWays(r, innerPolygons, outerPolygons); + + } + + /** + * Determine multipolygon ways which are intersecting (crossing without a common node). This is not allowed. + * See {@link CrossingWays} + * @param r the relation (for error reporting) + * @param innerPolygons list of inner polygons + * @param outerPolygons list of outer polygons + */ + private void checkCrossingWays(Relation r, List innerPolygons, + List outerPolygons) { + /** All way segments, grouped by cells */ + final Map> cellSegments = new HashMap<>(1000); + /** The already detected ways in error */ + final Map, List> crossingWays = new HashMap<>(50); + + for (Way w : r.getMemberPrimitives(Way.class)) { + checkCrossingWay(w, r, cellSegments, crossingWays); } - for (int i = 0; i < innerPolygons.size(); i++) { - PolyData pdInner = innerPolygons.get(i); - // Check for intersection between inner members - for (int j = i+1; j < innerPolygons.size(); j++) { - checkCrossingWays(r, innerPolygons, innerPolygonsPaths, pdInner, j); + } + + /** + * Find ways which are crossing without sharing a node. + * @param w way that is member of the relation + * @param r the relation (used for error messages) + * @param crossingWays + * @param cellSegments + */ + private void checkCrossingWay(Way w, Relation r, Map> cellSegments, Map, List> crossingWays) { + int nodesSize = w.getNodesCount(); + for (int i = 0; i < nodesSize - 1; i++) { + final WaySegment es1 = new WaySegment(w, i); + final EastNorth en1 = es1.getFirstNode().getEastNorth(); + final EastNorth en2 = es1.getSecondNode().getEastNorth(); + if (en1 == null || en2 == null) { + Main.warn("Crossing ways test skipped " + es1); + continue; } - // Check for intersection between inner and outer members - boolean outside = true; - for (int o = 0; o < outerPolygons.size(); o++) { - outside &= checkCrossingWays(r, outerPolygons, outerPolygonsPaths, pdInner, o) == Intersection.OUTSIDE; + for (List segments : CrossingWays.getSegments(cellSegments, en1, en2)) { + for (WaySegment es2 : segments) { + + List highlight; + if (es2.way == w) + continue; // reported by CrossingWays.SelfIntersection + if (!es1.intersects(es2)) + continue; + + List prims = Arrays.asList(es1.way, es2.way); + if ((highlight = crossingWays.get(prims)) == null) { + highlight = new ArrayList<>(); + highlight.add(es1); + highlight.add(es2); + errors.add(TestError.builder(this, Severity.WARNING, CROSSING_WAYS) + .message(tr("Intersection between multipolygon ways")) + .primitives(Arrays.asList(r, es1.way, es2.way)) + .highlightWaySegments(highlight) + .build()); + crossingWays.put(prims, highlight); + } else { + highlight.add(es1); + highlight.add(es2); + } + } + segments.add(es1); } - if (outside) { - errors.add(TestError.builder(this, Severity.WARNING, INNER_WAY_OUTSIDE) - .message(tr("Multipolygon inner way is outside")) - .primitives(r) - .highlightNodePairs(Collections.singletonList(pdInner.getNodes())) - .build()); - } } } - private Intersection checkCrossingWays(Relation r, List polygons, List polygonsPaths, PolyData pd, int idx) { - Intersection intersection = getPolygonIntersection(polygonsPaths.get(idx), pd.getNodes()); - if (intersection == Intersection.CROSSING) { - PolyData pdOther = polygons.get(idx); - if (pdOther != null) { + /** + * Detect intersections of multipolygon ways at nodes. If any way node is used by more than two ways + * or two times in one way and at least once in another way we found an intersection. + * @param r the relation + * @return List of nodes were ways intersect + */ + private List checkIntersectionAtNodes(Relation r) { + List intersectionNodes = new ArrayList<>(); + List,List>> intersectionErrors = new ArrayList<>(); + HashMap wayRoleMap = new HashMap<>(); + for (RelationMember rm : r.getMembers()) { + if (rm.isWay()) + wayRoleMap.put(rm.getWay(), rm.getRole()); + } + Map> nodeMap = new HashMap<>(); + for (RelationMember rm : r.getMembers()) { + if (!rm.isWay()) + continue; + int numNodes = rm.getWay().getNodesCount(); + for (int i = 0; i < numNodes; i++) { + Node n = rm.getWay().getNode(i); + if (n.getReferrers().size() <= 1) { + continue; // cannot be a problem node + } + List ways = nodeMap.get(n); + if (ways == null) { + ways = new ArrayList<>(); + nodeMap.put(n, ways); + } + ways.add(rm.getWay()); + if (ways.size() > 2 || (ways.size() == 2 && i != 0 && i + 1 != numNodes)) { + intersectionNodes.add(n); + boolean allInner = true; + for (Way w : ways) { + String role = wayRoleMap.get(w); + if (!"inner".equals(role)) + allInner = false; + } + if (!allInner) { + Set errorWays = new HashSet<>(ways); + boolean addNew = true; + for (Pair, List> pair : intersectionErrors) { + if (pair.a.size() == errorWays.size() && pair.a.containsAll(errorWays)) { + pair.b.add(n); + addNew = false; + break; + } + } + if (addNew) { + List errNodes = new ArrayList<>(); + errNodes.add(n); + intersectionErrors.add(new Pair<>(errorWays, errNodes)); + } + } + } + } + } + for (Pair,List> pair : intersectionErrors) { + // A single shared node between two ways ("touching ways") is considered okay. + if (pair.b.size() > 1) { errors.add(TestError.builder(this, Severity.WARNING, CROSSING_WAYS) - .message(tr("Intersection between multipolygon ways")) - .primitives(r) - .highlightNodePairs(Arrays.asList(pd.getNodes(), pdOther.getNodes())) + .message(tr("Multipolygon ways share multiple nodes")) + .primitives(pair.a) + .highlight(pair.b) .build()); } } - return intersection; + return intersectionNodes; } /**