Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTRouteDataManager.java =================================================================== --- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTRouteDataManager.java (revision 32655) +++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTRouteDataManager.java (revision 32656) @@ -182,3 +182,39 @@ } + /** + * Returns a PTStop that matches the given id. Returns null if not found + * + * @param id + * @return + */ + public PTStop getPTStop(long id) { + for (PTStop stop : this.ptstops) { + if (stop.getStopPosition() != null && stop.getStopPosition().getId() == id) { + return stop; + } + + if (stop.getPlatform() != null && stop.getPlatform().getId() == id) { + return stop; + } + } + + return null; + } + + /** + * Returns a PTWay that matches the given id. Returns null if not found + * + * @param id + * @return + */ + public PTWay getPTWay(long id) { + for (PTWay ptway : this.ptways) { + for (Way way : ptway.getWays()) { + if (way.getId() == id) { + return ptway; + } + } + } + return null; + } } Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTStop.java =================================================================== --- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTStop.java (revision 32655) +++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTStop.java (revision 32656) @@ -5,5 +5,4 @@ import java.util.List; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.BBox; @@ -147,5 +146,6 @@ BBox platformBBox = new BBox(ax, ay, bx, by); - Collection allNodes = Main.getLayerManager().getEditDataSet().getNodes(); +// Collection allNodes = Main.getLayerManager().getEditDataSet().getNodes(); + Collection allNodes = platform.getDataSet().getNodes(); for (Node currentNode : allNodes) { if (platformBBox.bounds(currentNode.getBBox()) && currentNode.hasTag("public_transport", "stop_position")) { Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java =================================================================== --- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java (revision 32655) +++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java (revision 32656) @@ -239,6 +239,6 @@ if (isWaySuitableForBuses(way) || way.hasTag("railway", "tram") || way.hasTag("railway", "subway") - || way.hasTag("raiilway", "subway") || way.hasTag("railway", "light_rail") - || way.hasTag("railway", "train")) { + || way.hasTag("railway", "subway") || way.hasTag("railway", "light_rail") + || way.hasTag("railway", "rail")) { return true; } Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/StopToWayAssigner.java =================================================================== --- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/StopToWayAssigner.java (revision 32655) +++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/StopToWayAssigner.java (revision 32656) @@ -1,13 +1,21 @@ package org.openstreetmap.josm.plugins.pt_assistant.utils; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; - +import java.util.Set; + +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.BBox; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; +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.plugins.pt_assistant.data.PTStop; import org.openstreetmap.josm.plugins.pt_assistant.data.PTWay; +import org.openstreetmap.josm.tools.Pair; /** @@ -23,55 +31,227 @@ /* contains assigned stops */ private static HashMap stopToWay = new HashMap<>(); - - /* contains all PTWays of the route relation for which this assigner was created */ + + /* + * contains all PTWays of the route relation for which this assigner was + * created + */ private List ptways; - + public StopToWayAssigner(List ptways) { this.ptways = ptways; } + /** + * Returns the PTWay for the given PTStop + * + * @param stop + * @return + */ public PTWay get(PTStop stop) { - + // 1) Search if this stop has already been assigned: if (stopToWay.containsKey(stop)) { return stopToWay.get(stop); } - + // 2) Search if the stop has a stop position: - Node stopPosition = stop.getStopPosition(); - if (stopPosition != null) { - - // search in the referrers: - List referrers = stopPosition.getReferrers(); - for (OsmPrimitive referredPrimitive: referrers) { - if (referredPrimitive.getType().equals(OsmPrimitiveType.WAY)) { - Way referredWay = (Way) referredPrimitive; - for (PTWay ptway: ptways) { - if (ptway.getWays().contains(referredWay)) { - stopToWay.put(stop, ptway); - return ptway; + PTWay ptwayOfStopPosition = findPtwayForNode(stop.getStopPosition()); + if (ptwayOfStopPosition != null) { + stopToWay.put(stop, ptwayOfStopPosition); + return ptwayOfStopPosition; + } + + // 3) Search if the stop has a stop_area: + List stopElements = new ArrayList<>(2); + if (stop.getStopPosition() != null) { + stopElements.add(stop.getStopPosition()); + } + if (stop.getPlatform() != null) { + stopElements.add(stop.getPlatform()); + } + Set parents = Node.getParentRelations(stopElements); + for (Relation parentRelation : parents) { + if (parentRelation.hasTag("public_transport", "stop_area")) { + for (RelationMember rm : parentRelation.getMembers()) { + if (rm.getMember().hasTag("public_transport", "stop_position")) { + PTWay rmPtway = this.findPtwayForNode(rm.getNode()); + if (rmPtway != null) { + stopToWay.put(stop, rmPtway); + return rmPtway; } } } } - + } + + // 4) Run the growing-bounding-boxes algorithm: + double searchRadius = 0.001; + while (searchRadius < 0.005) { + + PTWay foundWay = this.findNearestWayInRadius(stop.getPlatform(), searchRadius); + if (foundWay != null) { + stopToWay.put(stop, foundWay); + return foundWay; + } + + foundWay = this.findNearestWayInRadius(stop.getStopPosition(), searchRadius); + if (foundWay != null) { + stopToWay.put(stop, foundWay); + return foundWay; + } + + searchRadius = searchRadius + 0.001; + } + + return null; + } + + /** + * Finds the PTWay of the given stop_position by looking at its referrers + * + * @param stopPosition + * @return + */ + private PTWay findPtwayForNode(Node stopPosition) { + + if (stopPosition == null) { + return null; + } + + // search in the referrers: + List referrers = stopPosition.getReferrers(); + for (OsmPrimitive referredPrimitive : referrers) { + if (referredPrimitive.getType().equals(OsmPrimitiveType.WAY)) { + Way referredWay = (Way) referredPrimitive; + for (PTWay ptway : ptways) { + if (ptway.getWays().contains(referredWay)) { + return ptway; + } + } + } + } + + return null; + } + + /** + * Finds the PTWay in the given radius of the OsmPrimitive. The PTWay has to + * belong to the route relation for which this StopToWayAssigner was + * created. If multiple PTWays were found, the closest one is chosen. + * + * @param platform + * @param searchRadius + * @return + */ + private PTWay findNearestWayInRadius(OsmPrimitive platform, double searchRadius) { + + if (platform == null) { + return null; + } + + LatLon platformCenter = platform.getBBox().getCenter(); + Double ax = platformCenter.getX() - searchRadius; + Double bx = platformCenter.getX() + searchRadius; + Double ay = platformCenter.getY() - searchRadius; + Double by = platformCenter.getY() + searchRadius; + BBox platformBBox = new BBox(ax, ay, bx, by); + + List potentialWays = new ArrayList<>(); + + Collection allNodes = platform.getDataSet().getNodes(); + for (Node currentNode : allNodes) { + if (platformBBox.bounds(currentNode.getBBox())) { + List referrers = currentNode.getReferrers(); + for (OsmPrimitive referrer : referrers) { + if (referrer.getType().equals(OsmPrimitiveType.WAY)) { + Way referrerWay = (Way) referrer; + for (PTWay ptway : this.ptways) { + if (ptway.getWays().contains(referrerWay)) { + potentialWays.add(referrerWay); + } + } + } + } + + } } - // 3) Run the growing-bounding-boxes algorithm: - // TODO - + Node platformNode = null; + if (platform.getType().equals(OsmPrimitiveType.NODE)) { + platformNode = (Node) platform; + } else { + platformNode = new Node(platform.getBBox().getCenter()); + } + Way nearestWay = null; + Double minDistance = Double.MAX_VALUE; + for (Way potentialWay: potentialWays) { + double distance = this.calculateMinDistance(platformNode, potentialWay); + if (distance < minDistance) { + minDistance = distance; + nearestWay = potentialWay; + } + } + + for (PTWay ptway: this.ptways) { + if (ptway.getWays().contains(nearestWay)) { + return ptway; + } + } + return null; } /** - * Remove a map entry - * FIXME: keys should be PTStop - * @param stopId - */ - public static void removeStopKey(Long stopId) { - Long id = new Long(stopId); - if (stopToWay.containsKey(id)) { - stopToWay.remove(id); - } + * Calculates the minimum distance between a node and a way + * @param node + * @param way + * @return + */ + private double calculateMinDistance(Node node, Way way) { + + double minDistance = Double.MAX_VALUE; + + List> waySegments = way.getNodePairs(false); + for (Pair waySegment : waySegments) { + if (waySegment.a != node && waySegment.b != node) { + double distanceToLine = this.calculateDistance(node, waySegment); + if (distanceToLine < minDistance) { + minDistance = distanceToLine; + } + } + } + + return minDistance; + + } + + /** + * // * Calculates the distance from point to segment using formulas for + * triangle area. + * + * @param node + * @param waySegment + * @return + */ + private double calculateDistance(Node node, Pair segment) { + + /* + * Let a be the triangle edge between the point and the first node of + * the segment. Let b be the triangle edge between the point and the + * second node of the segment. Let c be the triangle edge which is the + * segment. + */ + + double lengthA = node.getCoor().distance(segment.a.getCoor()); + double lengthB = node.getCoor().distance(segment.b.getCoor()); + double lengthC = segment.a.getCoor().distance(segment.b.getCoor()); + + // calculate triangle area using Feron's formula: + double p = (lengthA + lengthB + lengthC) / 2.0; + double triangleArea = Math.sqrt(p * (p - lengthA) * (p - lengthB) * (p - lengthC)); + + // calculate the distance from point to segment using the 0.5*c*h + // formula for triangle area: + return triangleArea * 2.0 / lengthC; } Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java =================================================================== --- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java (revision 32655) +++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java (revision 32656) @@ -87,5 +87,5 @@ } } else if (relation.hasTag("route", "subway")) { - if (!relation.hasTag("railway", "subway")) { + if (!way.hasTag("railway", "subway")) { isCorrectRoadType = false; } @@ -94,5 +94,5 @@ } } else if (relation.hasTag("route", "light_rail")) { - if (!relation.hasTag("raiilway", "subway")) { + if (!way.hasTag("railway", "subway")) { isCorrectRoadType = false; } @@ -101,5 +101,5 @@ } } else if (relation.hasTag("route", "light_rail")) { - if (!relation.hasTag("railway", "light_rail")) { + if (!way.hasTag("railway", "light_rail")) { isCorrectRoadType = false; } @@ -108,5 +108,5 @@ } } else if (relation.hasTag("route", "train")) { - if (!relation.hasTag("railway", "train")) { + if (!way.hasTag("railway", "rail")) { isCorrectRoadType = false; } Index: /applications/editors/josm/plugins/pt_assistant/test/data/oneway-bad-member-sorting.osm =================================================================== --- /applications/editors/josm/plugins/pt_assistant/test/data/oneway-bad-member-sorting.osm (revision 32656) +++ /applications/editors/josm/plugins/pt_assistant/test/data/oneway-bad-member-sorting.osm (revision 32656) @@ -0,0 +1,3568 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/StopToWayAssignerTest.java =================================================================== --- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/StopToWayAssignerTest.java (revision 32656) +++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/StopToWayAssignerTest.java (revision 32656) @@ -0,0 +1,63 @@ +package org.openstreetmap.josm.plugins.pt_assistant.data; + +import static org.junit.Assert.assertEquals; + +import java.io.File; + +import org.junit.Test; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.plugins.pt_assistant.AbstractTest; +import org.openstreetmap.josm.plugins.pt_assistant.ImportUtils; +import org.openstreetmap.josm.plugins.pt_assistant.utils.StopToWayAssigner; + +public class StopToWayAssignerTest extends AbstractTest { + + @Test + public void test() { + + File file = new File(AbstractTest.PATH_TO_ONEWAY_BAD_MEMBER_SORTING); + DataSet ds = ImportUtils.importOsmFile(file, "testLayer"); + + Relation route = null; + for (Relation r: ds.getRelations()) { + if (r.getId() == 4552871) { + route = r; + break; + } + } + + PTRouteDataManager manager = new PTRouteDataManager(route); + StopToWayAssigner assigner = new StopToWayAssigner(manager.getPTWays()); + + // test with a [correct] stop_position: + PTStop ptstop1 = manager.getPTStop(447358573l); + PTWay ptway1 = assigner.get(ptstop1); + Way way1 = ptway1.getWays().get(0); + assertEquals(way1.getId(), 26956744l); + + // test with a [wrong] stop_position: + PTStop ptstop2 = manager.getPTStop(427562058l); + PTWay ptway2 = assigner.get(ptstop2); + Way way2 = ptway2.getWays().get(0); + assertEquals(way2.getId(), 46349880l); + + // test with a stop_area: + PTStop ptstop3 = manager.getPTStop(2987217064l); + PTWay ptway3 = assigner.get(ptstop3); + Way way3 = ptway3.getWays().get(0); + assertEquals(way3.getId(), 7045925l); + + // test with a platform without a stop_area: + PTStop ptstop4 = manager.getPTStop(3327206909l); + PTWay ptway4 = assigner.get(ptstop4); + Way way4 = ptway4.getWays().get(0); + assertEquals(way4.getId(), 120277227l); + + + } + + + +}