Index: trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6579) +++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6580) @@ -871,5 +871,5 @@ String colStr = specName != null ? get("color."+specName) : ""; if(colStr.isEmpty()) { - colStr = get("color."+colKey, ColorHelper.color2html(def)); + colStr = get("color." + colKey, ""); } return colStr.isEmpty() ? def : ColorHelper.html2color(colStr); Index: trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java (revision 6579) +++ trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java (revision 6580) @@ -1,4 +1,6 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.data.osm; + +import java.awt.geom.Line2D; /** @@ -63,3 +65,21 @@ return equals(o) ? 0 : toWay().compareTo(o.toWay()); } + + /** + * Checks whether this segment crosses other segment + * + * @param s2 The other segment + * @return true if both segments crosses + */ + public boolean intersects(WaySegment s2) { + if (getFirstNode().equals(s2.getFirstNode()) || getSecondNode().equals(s2.getSecondNode()) || + getFirstNode().equals(s2.getSecondNode()) || getSecondNode().equals(s2.getFirstNode())) + return false; + + return Line2D.linesIntersect( + getFirstNode().getEastNorth().east(), getFirstNode().getEastNorth().north(), + getSecondNode().getEastNorth().east(), getSecondNode().getEastNorth().north(), + s2.getFirstNode().getEastNorth().east(), s2.getFirstNode().getEastNorth().north(), + s2.getSecondNode().getEastNorth().east(), s2.getSecondNode().getEastNorth().north()); + } } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (revision 6579) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (revision 6580) @@ -4,5 +4,4 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.geom.Line2D; import java.awt.geom.Point2D; import java.util.ArrayList; @@ -24,4 +23,5 @@ import org.openstreetmap.josm.data.validation.util.ValUtil; import org.openstreetmap.josm.gui.progress.ProgressMonitor; +import org.openstreetmap.josm.tools.Utils; /** @@ -34,5 +34,5 @@ /** All way segments, grouped by cells */ - private Map> cellSegments; + private Map> cellSegments; /** The already detected errors */ private Set errorSegments; @@ -51,5 +51,5 @@ public void startTest(ProgressMonitor monitor) { super.startTest(monitor); - cellSegments = new HashMap>(1000); + cellSegments = new HashMap>(1000); errorSegments = new HashSet(); seenWays = new HashMap, List>(50); @@ -64,5 +64,5 @@ } - private String getLayer(OsmPrimitive w) { + static String getLayer(OsmPrimitive w) { String layer1 = w.get("layer"); if ("0".equals(layer1)) { @@ -81,95 +81,88 @@ } + static boolean isCoastline(OsmPrimitive w) { + return w.hasTag("natural", "water", "coastline") || w.hasTag("landuse", "reservoir"); + } + + static boolean isSubwayOrTram(OsmPrimitive w) { + return w.hasTag("railway", "subway", "tram"); + } + + static boolean isProposedOrAbandoned(OsmPrimitive w) { + return w.hasTag("highway", "proposed") || w.hasTag("railway", "proposed", "abandoned"); + } + + boolean ignoreWaySegmentCombination(Way w1, Way w2) { + if (!Utils.equal(getLayer(w1), getLayer(w2))) { + return true; + } + if (w1.hasKey("highway") && w2.hasKey("highway") && !Utils.equal(w1.get("level"), w2.get("level"))) { + return true; + } + if (isSubwayOrTram(w2)) { + return true; + } + if (isCoastline(w1) != isCoastline(w2)) { + return true; + } + if ((w1.hasTag("waterway", "river") && w2.hasTag("waterway", "riverbank")) + || (w2.hasTag("waterway", "river") && w1.hasTag("waterway", "riverbank"))) { + return true; + } + if (isProposedOrAbandoned(w2)) { + return true; + } + return false; + } + + String createMessage(Way w1, Way w2) { + if (isBuilding(w1)) { + return ("Crossing buildings"); + } else if (w1.hasKey("waterway") && w2.hasKey("waterway")) { + return tr("Crossing waterways"); + } else if ((w1.hasKey("highway") && w2.hasKey("waterway")) + || (w2.hasKey("highway") && w1.hasKey("waterway"))) { + return tr("Crossing waterway/highway"); + } else { + return tr("Crossing ways"); + } + } + + @Override + public boolean isPrimitiveUsable(OsmPrimitive w) { + return super.isPrimitiveUsable(w) + && !isProposedOrAbandoned(w) + && (w.hasKey("highway") + || w.hasKey("waterway") + || (w.hasKey("railway") && !isSubwayOrTram(w)) + || isCoastline(w) + || isBuilding(w)); + } + + @Override public void visit(Way w) { - if(!w.isUsable()) - return; - - String natural1 = w.get("natural"); - String landuse1 = w.get("landuse"); - boolean isCoastline1 = "water".equals(natural1) || "coastline".equals(natural1) || "reservoir".equals(landuse1); - String highway1 = w.get("highway"); - String railway1 = w.get("railway"); - boolean isSubway1 = "subway".equals(railway1); - boolean isTram1 = "tram".equals(railway1); - boolean isBuilding = isBuilding(w); - String waterway1 = w.get("waterway"); - - if (w.get("highway") == null && w.get("waterway") == null - && (railway1 == null || isSubway1 || isTram1) - && !isCoastline1 && !isBuilding) - return; - - String level1 = w.get("level"); - String layer1 = getLayer(w); int nodesSize = w.getNodesCount(); for (int i = 0; i < nodesSize - 1; i++) { - WaySegment ws = new WaySegment(w, i); - ExtendedSegment es1 = new ExtendedSegment(ws, layer1, highway1, railway1, isCoastline1, waterway1, level1); - for (List segments : getSegments(es1.n1, es1.n2)) { - for (ExtendedSegment es2 : segments) { + final WaySegment es1 = new WaySegment(w, i); + for (List segments : getSegments(es1.getFirstNode(), es1.getSecondNode())) { + for (WaySegment es2 : segments) { List prims; List highlight; - if (errorSegments.contains(ws) && errorSegments.contains(es2.ws)) { + if (errorSegments.contains(es1) && errorSegments.contains(es2) + || !es1.intersects(es2) + || ignoreWaySegmentCombination(es1.way, es2.way)) { continue; } - String level2 = es2.level; - String layer2 = es2.layer; - String highway2 = es2.highway; - String railway2 = es2.railway; - boolean isCoastline2 = es2.coastline; - if (layer1 == null ? layer2 != null : !layer1.equals(layer2)) { - continue; - } - // Ignore indoor highways on different levels - if (highway1 != null && highway2 != null && level1 != null && level2 != null && !level1.equals(level2)) { - continue; - } - - if (!es1.intersects(es2) ) { - continue; - } - if (isSubway1 && "subway".equals(railway2)) { - continue; - } - if (isTram1 && "tram".equals(railway2)) { - continue; - } - - if (isCoastline1 != isCoastline2) { - continue; - } - if (("river".equals(waterway1) && "riverbank".equals(es2.waterway)) - || ("riverbank".equals(waterway1) && "river".equals(es2.waterway))) { - continue; - } - - if ("proposed".equals(es1.highway) || "proposed".equals(highway2) - || "proposed".equals(es1.railway) || "proposed".equals(railway2) - || "abandoned".equals(es1.railway) || "abandoned".equals(railway2)) { - continue; - } - - prims = Arrays.asList(es1.ws.way, es2.ws.way); + prims = Arrays.asList(es1.way, es2.way); if ((highlight = seenWays.get(prims)) == null) { highlight = new ArrayList(); - highlight.add(es1.ws); - highlight.add(es2.ws); - - String message; - if (isBuilding) { - message = tr("Crossing buildings"); - } else if ((es1.waterway != null && es2.waterway != null)) { - message = tr("Crossing waterways"); - } else if ((es1.waterway != null && es2.highway != null) - || (es2.waterway != null && es1.highway != null)) { - message = tr("Crossing waterway/highway"); - } else { - message = tr("Crossing ways"); - } - + highlight.add(es1); + highlight.add(es2); + + final String message = createMessage(es1.way, es2.way); errors.add(new TestError(this, Severity.WARNING, message, @@ -179,6 +172,6 @@ seenWays.put(prims, highlight); } else { - highlight.add(es1.ws); - highlight.add(es2.ws); + highlight.add(es1); + highlight.add(es2); } } @@ -196,11 +189,11 @@ * @return A list with all the cells the segment crosses */ - public List> getSegments(Node n1, Node n2) { - - List> cells = new ArrayList>(); - for(Point2D cell : ValUtil.getSegmentCells(n1, n2, OsmValidator.griddetail)) { - List segments = cellSegments.get(cell); + public List> getSegments(Node n1, Node n2) { + + List> cells = new ArrayList>(); + for (Point2D cell : ValUtil.getSegmentCells(n1, n2, OsmValidator.griddetail)) { + List segments = cellSegments.get(cell); if (segments == null) { - segments = new ArrayList(); + segments = new ArrayList(); cellSegments.put(cell, segments); } @@ -210,68 +203,3 @@ } - /** - * A way segment with some additional information - */ - public static class ExtendedSegment { - private final Node n1, n2; - - private final WaySegment ws; - - /** The layer */ - private final String layer; - - /** The highway type */ - private final String highway; - - /** The railway type */ - private final String railway; - - /** The waterway type */ - private final String waterway; - - /** The coastline type */ - private final boolean coastline; - - /** The level, only considered for indoor highways */ - private final String level; - - /** - * Constructor - * @param ws The way segment - * @param layer The layer of the way this segment is in - * @param highway The highway type of the way this segment is in - * @param railway The railway type of the way this segment is in - * @param coastline The coastline flag of the way the segment is in - * @param waterway The waterway type of the way this segment is in - * @param level The level of the way this segment is in - */ - public ExtendedSegment(WaySegment ws, String layer, String highway, String railway, boolean coastline, String waterway, String level) { - this.ws = ws; - this.n1 = ws.way.getNodes().get(ws.lowerIndex); - this.n2 = ws.way.getNodes().get(ws.lowerIndex + 1); - this.layer = layer; - this.highway = highway; - this.railway = railway; - this.coastline = coastline; - this.waterway = waterway; - this.level = level; - } - - /** - * Checks whether this segment crosses other segment - * @param s2 The other segment - * @return true if both segments crosses - */ - public boolean intersects(ExtendedSegment s2) { - if (n1.equals(s2.n1) || n2.equals(s2.n2) || - n1.equals(s2.n2) || n2.equals(s2.n1)) - return false; - - return Line2D.linesIntersect( - n1.getEastNorth().east(), n1.getEastNorth().north(), - n2.getEastNorth().east(), n2.getEastNorth().north(), - s2.n1.getEastNorth().east(), s2.n1.getEastNorth().north(), - s2.n2.getEastNorth().east(), s2.n2.getEastNorth().north()); - } - } }