Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/DownloadReferrersThread.java =================================================================== --- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/DownloadReferrersThread.java (revision 32616) +++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/DownloadReferrersThread.java (revision 32616) @@ -0,0 +1,51 @@ +package org.openstreetmap.josm.plugins.pt_assistant.actions; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.PrimitiveId; +import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask; + +public class DownloadReferrersThread extends Thread { + + private Node node; + + public DownloadReferrersThread(Node node) { + super(); + this.node = node; + + } + + @Override + public void run() { + + synchronized (this) { + + Collection allNodes = node.getDataSet().getNodes(); + List nodesToBeDownloaded = new ArrayList(); + for (Node currNode : allNodes) { + if (currNode.hasTag("public_transport", "stop_position") || currNode.hasTag("highway", "bus_stop") + || currNode.hasTag("public_transport", "platform") || currNode.hasTag("highway", "platform") + || currNode.hasTag("railway", "platform")) { + nodesToBeDownloaded.add(currNode); + } + } + + DownloadPrimitivesWithReferrersTask task = new DownloadPrimitivesWithReferrersTask(false, nodesToBeDownloaded, false, true, + null, null); + Thread t = new Thread(task); + t.start(); + try { + t.join(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + } + + + } + +} Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/DownloadReferrersDialog.java =================================================================== --- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/DownloadReferrersDialog.java (revision 32616) +++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/DownloadReferrersDialog.java (revision 32616) @@ -0,0 +1,72 @@ +package org.openstreetmap.josm.plugins.pt_assistant.gui; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import javax.swing.JCheckBox; +import javax.swing.JOptionPane; +import javax.swing.JPanel; + +public class DownloadReferrersDialog extends JPanel { + + private static final long serialVersionUID = 6112230984193215297L; + + // indicates if the user needs to be asked before fetching incomplete + // members of a relation. + private enum ASK_TO_FETCH { + DO_ASK, DONT_ASK_AND_FETCH, DONT_ASK_AND_DONT_FETCH + }; + + // by default, the user should be asked + private static ASK_TO_FETCH askToFetch = ASK_TO_FETCH.DO_ASK; + + String message; + private JCheckBox checkbox; + private String[] options; + private int selectedOption; + + public DownloadReferrersDialog() { + + selectedOption = Integer.MIN_VALUE; + message = tr("Do you want to download referres of platforms and stop positions?"); + checkbox = new JCheckBox(tr("Remember my choice and do not ask me again in this session")); + options = new String[2]; + options[0] = tr("Yes"); + options[1] = tr("No"); + + } + + /** + * Finds out whether the user wants to download referrers. In the + * default case, creates a JOptionPane to ask. + * + * @return JOptionPane.YES_OPTION if the referrers should be + * downloaded, JOptionPane.NO_OPTION otherwise. + */ + public int getUserSelection() { + + if (askToFetch == ASK_TO_FETCH.DONT_ASK_AND_FETCH) { + return JOptionPane.YES_OPTION; + } + + if (askToFetch == ASK_TO_FETCH.DONT_ASK_AND_DONT_FETCH) { + return JOptionPane.NO_OPTION; + } + + + Object[] params = {message, checkbox}; + selectedOption = JOptionPane.showOptionDialog(this, params, tr("PT_Assistant Fetch Request"), JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE, null, options, 0); + + if (checkbox.isSelected()) { + if (selectedOption == JOptionPane.YES_OPTION) { + askToFetch = ASK_TO_FETCH.DONT_ASK_AND_FETCH; + } else { + askToFetch = ASK_TO_FETCH.DONT_ASK_AND_DONT_FETCH; + } + } + + return selectedOption; + } + + +} 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 32615) +++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java (revision 32616) @@ -173,4 +173,33 @@ return false; } + + /** + * Checks if the type of the way is suitable for buses to go on it. The + * direction of the way (i.e. one-way roads) is irrelevant for this test. + * + * @param way + * to be checked + * @return true if the way is suitable for buses, false otherwise. + */ + public static boolean isWaySuitableForBuses(Way way) { + if (way.hasTag("highway", "motorway") || way.hasTag("highway", "trunk") || way.hasTag("highway", "primary") + || way.hasTag("highway", "secondary") || way.hasTag("highway", "tertiary") + || way.hasTag("highway", "unclassified") || way.hasTag("highway", "road") + || way.hasTag("highway", "residential") || way.hasTag("highway", "service") + || way.hasTag("highway", "motorway_link") || way.hasTag("highway", "trunk_link") + || way.hasTag("highway", "primary_link") || way.hasTag("highway", "secondary_link") + || way.hasTag("highway", "tertiary_link") || way.hasTag("highway", "living_street") + || way.hasTag("highway", "bus_guideway") || way.hasTag("highway", "road") + || way.hasTag("cycleway", "share_busway") || way.hasTag("cycleway", "shared_lane")) { + return true; + } + + if (way.hasTag("highway", "pedestrian") && (way.hasTag("bus", "yes") || way.hasTag("psv", "yes") + || way.hasTag("bus", "designated") || way.hasTag("psv", "designated"))) { + return true; + } + + return false; + } } Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/Checker.java =================================================================== --- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/Checker.java (revision 32615) +++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/Checker.java (revision 32616) @@ -4,4 +4,5 @@ import java.util.List; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.RelationMember; @@ -20,4 +21,7 @@ // test which created this WayChecker: protected final Test test; + + // node that is checked: + protected Node node; // relation that is checked: @@ -26,10 +30,13 @@ // stores all found errors: protected ArrayList errors = new ArrayList<>(); + + protected Checker(Node node, Test test) { + this.node = node; + this.test = test; + } protected Checker(Relation relation, Test test) { - this.relation = relation; this.test = test; - } Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/NodeChecker.java =================================================================== --- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/NodeChecker.java (revision 32616) +++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/NodeChecker.java (revision 32616) @@ -0,0 +1,76 @@ +package org.openstreetmap.josm.plugins.pt_assistant.validation; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.ArrayList; +import java.util.List; + +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.Way; +import org.openstreetmap.josm.data.validation.Severity; +import org.openstreetmap.josm.data.validation.Test; +import org.openstreetmap.josm.data.validation.TestError; +import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils; + +public class NodeChecker extends Checker { + + protected NodeChecker(Node node, Test test) { + super(node, test); + + } + + /** + * Checks if the given stop_position node belongs to any way + * + * @param n + */ + protected void performSolitaryStopPositionTest() { + + List referrers = node.getReferrers(); + + for (OsmPrimitive referrer : referrers) { + if (referrer.getType().equals(OsmPrimitiveType.WAY)) { + Way referrerWay = (Way) referrer; + if (RouteUtils.isWaySuitableForBuses(referrerWay) || referrerWay.hasTag("railway", "tram") + || referrerWay.hasTag("railway", "subway") || referrerWay.hasTag("raiilway", "subway") + || referrerWay.hasTag("railway", "light_rail") + || referrerWay.hasTag("railway", "construction")) { + return; + } + + } + } + + List primitives = new ArrayList<>(1); + primitives.add(node); + TestError e = new TestError(this.test, Severity.WARNING, tr("PT: Stop_position is not part of a way"), + PTAssistantValidatorTest.ERROR_CODE_SOLITARY_STOP_POSITION, primitives); + errors.add(e); + + } + + /** + * Checks if the given platform node belongs to any way + * + * @param n + */ + protected void performPlatformPartOfWayTest() { + + List referrers = node.getReferrers(); + + for (OsmPrimitive referrer : referrers) { + List primitives = new ArrayList<>(1); + primitives.add(node); + if (referrer.getType().equals(OsmPrimitiveType.WAY)) { + TestError e = new TestError(this.test, Severity.WARNING, + tr("PT: Platform should not be part of a way"), + PTAssistantValidatorTest.ERROR_CODE_PLATFORM_PART_OF_HIGHWAY, primitives); + errors.add(e); + return; + } + } + } + +} Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java =================================================================== --- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java (revision 32615) +++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java (revision 32616) @@ -13,10 +13,13 @@ import org.openstreetmap.josm.command.SequenceCommand; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.validation.Severity; import org.openstreetmap.josm.data.validation.Test; import org.openstreetmap.josm.data.validation.TestError; +import org.openstreetmap.josm.plugins.pt_assistant.actions.DownloadReferrersThread; import org.openstreetmap.josm.plugins.pt_assistant.actions.FixTask; import org.openstreetmap.josm.plugins.pt_assistant.actions.IncompleteMembersDownloadThread; +import org.openstreetmap.josm.plugins.pt_assistant.gui.DownloadReferrersDialog; import org.openstreetmap.josm.plugins.pt_assistant.gui.IncompleteMembersDownloadDialog; import org.openstreetmap.josm.plugins.pt_assistant.gui.PTAssistantLayer; @@ -30,9 +33,15 @@ public static final int ERROR_CODE_CONSTRUCTION = 3722; public static final int ERROR_CODE_DIRECTION = 3731; - public static final int ERROR_CODE_END_STOP = 3141; - public static final int ERROR_CODE_SPLIT_WAY = 3142; - public static final int ERROR_CODE_RELAITON_MEMBER_ROLES = 3143; + public static final int ERROR_CODE_END_STOP = 3741; + public static final int ERROR_CODE_SPLIT_WAY = 3742; + public static final int ERROR_CODE_RELAITON_MEMBER_ROLES = 3743; + public static final int ERROR_CODE_SOLITARY_STOP_POSITION = 3751; + public static final int ERROR_CODE_PLATFORM_PART_OF_HIGHWAY = 3752; private PTAssistantLayer layer; + private static boolean nodeReferrersDownloaded; + @SuppressWarnings("unused") + private static boolean incompleteRelationsDowloaded; + public PTAssistantValidatorTest() { @@ -42,4 +51,103 @@ layer = new PTAssistantLayer(); DataSet.addSelectionListener(layer); + nodeReferrersDownloaded = false; + incompleteRelationsDowloaded = false; + + } + + @Override + public void visit(Node n) { + + if (n.isIncomplete()) { + return; + } + + if (!nodeReferrersDownloaded) { + this.downloadReferrers(n); + nodeReferrersDownloaded = true; + } + + NodeChecker nodeChecker = new NodeChecker(n, this); + + // check for solitary stop positions: + if (n.hasTag("public_transport", "stop_position")) { + nodeChecker.performSolitaryStopPositionTest(); + } + + // check that platforms are not part of any way: + if (n.hasTag("highway", "bus_stop") || n.hasTag("public_transport", "platform") + || n.hasTag("highway", "platform") || n.hasTag("railway", "platform")) { + nodeChecker.performPlatformPartOfWayTest(); + } + + this.errors.addAll(nodeChecker.getErrors()); + + } + + + /** + * Downloads incomplete relation members in an extra thread (user input + * required) + * + * @return true if successful, false if not successful + */ + private boolean downloadReferrers(Node n) { + + final int[] userSelection = { 0 }; + + try { + + if (SwingUtilities.isEventDispatchThread()) { + + userSelection[0] = showDownloadReferrersDialog(); + + } else { + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + try { + userSelection[0] = showDownloadReferrersDialog(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + } + }); + + } + + } catch (InterruptedException | InvocationTargetException e) { + return false; + } + + if (userSelection[0] == JOptionPane.YES_OPTION) { + + Thread t = new DownloadReferrersThread(n); + t.start(); + synchronized (t) { + try { + t.wait(); + } catch (InterruptedException e) { + return false; + } + } + + } + + return true; + + } + + /** + * Shows the dialog asking the user about an incomplete member download + * + * @return user's selection + * @throws InterruptedException + */ + private int showDownloadReferrersDialog() throws InterruptedException { + + DownloadReferrersDialog downloadReferrersDialog = new DownloadReferrersDialog(); + return downloadReferrersDialog.getUserSelection(); } @@ -55,9 +163,10 @@ // and do not do any testing. if (r.hasIncompleteMembers()) { - + boolean downloadSuccessful = this.downloadIncompleteMembers(); if (!downloadSuccessful) { return; } + incompleteRelationsDowloaded = true; } @@ -313,4 +422,8 @@ } + if (testError.getCode() == ERROR_CODE_SOLITARY_STOP_POSITION) { + // TODO + } + if (commands.isEmpty()) { return null; @@ -357,4 +470,10 @@ new TestError(this, Severity.WARNING, tr("PT: dummy test warning"), ERROR_CODE_DIRECTION, primitives)); } + + public void endTest() { + super.endTest(); + nodeReferrersDownloaded = false; + incompleteRelationsDowloaded = false; + } } 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 32615) +++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java (revision 32616) @@ -62,16 +62,19 @@ boolean isCorrectRoadType = true; boolean isUnderConstruction = false; + if (way.hasKey("construction")) { + isUnderConstruction = true; + } if (relation.hasTag("route", "bus") || relation.hasTag("route", "share_taxi")) { - if (!isWaySuitableForBuses(way)) { - isCorrectRoadType = false; - } - if (way.hasTag("highway", "construction") && way.hasKey("construction")) { + if (!RouteUtils.isWaySuitableForBuses(way)) { + isCorrectRoadType = false; + } + if (way.hasTag("highway", "construction")) { isUnderConstruction = true; } } else if (relation.hasTag("route", "trolleybus")) { - if (!(isWaySuitableForBuses(way) && way.hasTag("trolley_wire", "yes"))) { - isCorrectRoadType = false; - } - if (way.hasTag("highway", "construction") && way.hasKey("construction")) { + if (!(RouteUtils.isWaySuitableForBuses(way) && way.hasTag("trolley_wire", "yes"))) { + isCorrectRoadType = false; + } + if (way.hasTag("highway", "construction")) { isUnderConstruction = true; } @@ -80,5 +83,5 @@ isCorrectRoadType = false; } - if (way.hasTag("railway", "construction") && way.hasKey("construction")) { + if (way.hasTag("railway", "construction")) { isUnderConstruction = true; } @@ -87,5 +90,5 @@ isCorrectRoadType = false; } - if (way.hasTag("railway", "construction") && way.hasKey("construction")) { + if (way.hasTag("railway", "construction")) { isUnderConstruction = true; } @@ -94,5 +97,5 @@ isCorrectRoadType = false; } - if (way.hasTag("railway", "construction") && way.hasKey("construction")) { + if (way.hasTag("railway", "construction")) { isUnderConstruction = true; } @@ -101,5 +104,5 @@ isCorrectRoadType = false; } - if (way.hasTag("railway", "construction") && way.hasKey("construction")) { + if (way.hasTag("railway", "construction")) { isUnderConstruction = true; } @@ -108,5 +111,5 @@ isCorrectRoadType = false; } - if (way.hasTag("railway", "construction") && way.hasKey("construction")) { + if (way.hasTag("railway", "construction")) { isUnderConstruction = true; } @@ -198,4 +201,6 @@ // highlighted.add(problematicWay); Set adjacentWays = checkAdjacentWays(problematicWay, new HashSet()); + adjacentWays.removeAll(problematicWays); + highlighted.add(problematicWay); highlighted.addAll(adjacentWays); TestError e = new TestError(this.test, Severity.WARNING, @@ -371,33 +376,4 @@ } - /** - * Checks if the type of the way is suitable for buses to go on it. The - * direction of the way (i.e. one-way roads) is irrelevant for this test. - * - * @param way - * to be checked - * @return true if the way is suitable for buses, false otherwise. - */ - private boolean isWaySuitableForBuses(Way way) { - if (way.hasTag("highway", "motorway") || way.hasTag("highway", "trunk") || way.hasTag("highway", "primary") - || way.hasTag("highway", "secondary") || way.hasTag("highway", "tertiary") - || way.hasTag("highway", "unclassified") || way.hasTag("highway", "road") - || way.hasTag("highway", "residential") || way.hasTag("highway", "service") - || way.hasTag("highway", "motorway_link") || way.hasTag("highway", "trunk_link") - || way.hasTag("highway", "primary_link") || way.hasTag("highway", "secondary_link") - || way.hasTag("highway", "tertiary_link") || way.hasTag("highway", "living_street") - || way.hasTag("highway", "bus_guideway") || way.hasTag("highway", "road") - || way.hasTag("cycleway", "share_busway") || way.hasTag("cycleway", "shared_lane")) { - return true; - } - - if (way.hasTag("highway", "pedestrian") && (way.hasTag("bus", "yes") || way.hasTag("psv", "yes") - || way.hasTag("bus", "designated") || way.hasTag("psv", "designated"))) { - return true; - } - - return false; - } - protected static Command fixErrorByRemovingWay(TestError testError) { Index: applications/editors/josm/plugins/pt_assistant/test/data/solitary-stop-position.osm =================================================================== --- applications/editors/josm/plugins/pt_assistant/test/data/solitary-stop-position.osm (revision 32616) +++ applications/editors/josm/plugins/pt_assistant/test/data/solitary-stop-position.osm (revision 32616) @@ -0,0 +1,1965 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java =================================================================== --- applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java (revision 32615) +++ applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java (revision 32616) @@ -44,4 +44,6 @@ public static final String PATH_TO_ONEWAY_WRONG_DIRECTION = "test/data/oneway-wrong-direction.osm"; public static final String PATH_TO_ONEWAY_WRONG_DIRECTION2 = "test/data/oneway-wrong-direction2.osm"; + + public static final String PATH_TO_SOLITARY_STOP_POSITION = "test/data/solitary-stop-position.osm"; /** Index: applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java =================================================================== --- applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java (revision 32615) +++ applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java (revision 32616) @@ -17,53 +17,45 @@ public class DirecionTestTest extends AbstractTest { - - @Test - public void testOnewayTrue() { - - File file = new File(AbstractTest.PATH_TO_ONEWAY_WRONG_DIRECTION); - DataSet ds = ImportUtils.importOsmFile(file, "testLayer"); - - PTAssistantValidatorTest test = new PTAssistantValidatorTest(); - - Relation route = null; - for (Relation r: ds.getRelations()) { - if (r.hasKey("route")) { - route = r; - } - } - - - List errors = new ArrayList<>(); - - for (Relation r: ds.getRelations()) { - WayChecker wayChecker = new WayChecker(r, test); - wayChecker.performDirectionTest(); - errors.addAll(wayChecker.getErrors()); - } - - assertEquals(errors.size(), 2); - int onewayErrorCaught = 0; - for (TestError e: errors ) { - if (e.getCode() == PTAssistantValidatorTest.ERROR_CODE_DIRECTION) { - onewayErrorCaught++; - } - } - - assertEquals(onewayErrorCaught, 2); - - // fix the direction errors: - - boolean detectedErrorsAreCorrect = true; - for (TestError e: errors) { - if (e.getCode() == PTAssistantValidatorTest.ERROR_CODE_DIRECTION) { - @SuppressWarnings("unchecked") - List highlighted = (List) e.getHighlighted(); - if (highlighted.get(0).getId() != 225732678 && highlighted.get(0).getId() != 24215210) { - detectedErrorsAreCorrect = false; - } - } - } - - assertTrue(detectedErrorsAreCorrect); - } + + @Test + public void testOnewayTrue() { + + File file = new File(AbstractTest.PATH_TO_ONEWAY_WRONG_DIRECTION); + DataSet ds = ImportUtils.importOsmFile(file, "testLayer"); + + PTAssistantValidatorTest test = new PTAssistantValidatorTest(); + + List errors = new ArrayList<>(); + + for (Relation r : ds.getRelations()) { + WayChecker wayChecker = new WayChecker(r, test); + wayChecker.performDirectionTest(); + errors.addAll(wayChecker.getErrors()); + } + + assertEquals(errors.size(), 2); + int onewayErrorCaught = 0; + for (TestError e : errors) { + if (e.getCode() == PTAssistantValidatorTest.ERROR_CODE_DIRECTION) { + onewayErrorCaught++; + } + } + + assertEquals(onewayErrorCaught, 2); + + // fix the direction errors: + + boolean detectedErrorsAreCorrect = true; + for (TestError e : errors) { + if (e.getCode() == PTAssistantValidatorTest.ERROR_CODE_DIRECTION) { + @SuppressWarnings("unchecked") + List highlighted = (List) e.getHighlighted(); + if (highlighted.get(0).getId() != 225732678 && highlighted.get(0).getId() != 24215210) { + detectedErrorsAreCorrect = false; + } + } + } + + assertTrue(detectedErrorsAreCorrect); + } } Index: applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SolitaryStopPositionTest.java =================================================================== --- applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SolitaryStopPositionTest.java (revision 32616) +++ applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SolitaryStopPositionTest.java (revision 32616) @@ -0,0 +1,45 @@ +package org.openstreetmap.josm.plugins.pt_assistant.validation; + +import java.io.File; + +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.plugins.pt_assistant.AbstractTest; +import org.openstreetmap.josm.plugins.pt_assistant.ImportUtils; + +public class SolitaryStopPositionTest extends AbstractTest { + + @Test + public void test1() { + + File file = new File(AbstractTest.PATH_TO_SOLITARY_STOP_POSITION); + DataSet ds = ImportUtils.importOsmFile(file, "testLayer"); + PTAssistantValidatorTest test = new PTAssistantValidatorTest(); + + Node platform = null; + Node stopPosition = null; + for (Node n : ds.getNodes()) { + if (n.hasTag("public_transport", "stop_position")) { + stopPosition = n; + } + if (n.hasTag("public_transport", "platform")) { + platform = n; + } + } + + NodeChecker checkerPlatform = new NodeChecker(platform, test); + checkerPlatform.performPlatformPartOfWayTest(); + assertEquals(checkerPlatform.getErrors().size(), 1); + assertEquals(checkerPlatform.getErrors().get(0).getCode(), + PTAssistantValidatorTest.ERROR_CODE_PLATFORM_PART_OF_HIGHWAY); + + NodeChecker checkerStopPosition = new NodeChecker(stopPosition, test); + checkerStopPosition.performSolitaryStopPositionTest(); + assertEquals(checkerStopPosition.getErrors().size(), 1); + assertEquals(checkerStopPosition.getErrors().get(0).getCode(), + PTAssistantValidatorTest.ERROR_CODE_SOLITARY_STOP_POSITION); + + } +}