Changeset 30841 in osm for applications

Timestamp:

2014-12-11T15:17:30+01:00 (10 years ago)

Author:

bastik

Message:

applied #josm10682 - Added features to sorting route relation of public_transport version 2 scheme (patch by freeExec)

Location:

applications/editors/josm/plugins/reltoolbox/src/relcontext

Files:

• ChosenRelation.java (modified) (1 prop)
• ChosenRelationComponent.java (modified) (1 prop)
• ChosenRelationListener.java (modified) (1 prop)
• ExtraNameFormatHook.java (modified) (1 prop)
• RelContextDialog.java (modified) (3 diffs, 1 prop)
• RelContextPlugin.java (modified) (1 prop)
• StaticChosenRelation.java (modified) (1 prop)
• actions/PublicTransportHelper.java (added)
• actions/ReconstructRouteAction.java (added)
• actions/SortAndFixAction.java (modified) (2 diffs)
• possible_roles.txt (modified) (1 diff, 1 prop)
• relationfix/PublicTransportFixer.java (added)

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -89 +89 @@
 import relcontext.actions.FindRelationAction;
 import relcontext.actions.ReconstructPolygonAction;
+import relcontext.actions.ReconstructRouteAction;
 import relcontext.actions.RelationHelpAction;
 import relcontext.actions.SelectInRelationPanelAction;
@@ -424 +425 @@
     private static Map<String, List<String>> loadRoles() {
         Map<String, List<String>> result = new HashMap<>();
+
         ClassLoader classLoader = RelContextDialog.class.getClassLoader();
         try (
@@ -526 +528 @@
             add(new DownloadParentsAction(chosenRelation));
             add(new ReconstructPolygonAction(chosenRelation));
+            add(new ReconstructRouteAction(chosenRelation));
             addSeparator();
             add(new SelectInRelationPanelAction(chosenRelation));

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SortAndFixAction.java

@@ -22 +22 @@
 import relcontext.relationfix.MultipolygonFixer;
 import relcontext.relationfix.NothingFixer;
+import relcontext.relationfix.PublicTransportFixer;
 import relcontext.relationfix.RelationFixer;
 
@@ -44 +45 @@
         fixers.add(new MultipolygonFixer()); // multipolygon
         fixers.add(new AssociatedStreetFixer()); //associatedStreet
+        fixers.add(new PublicTransportFixer()); //public_transport
 
         for(RelationFixer fix : fixers) {

applications/editors/josm/plugins/reltoolbox/src/relcontext/possible_roles.txt

@@ -1 +1 @@
 boundary: admin_centre, label, subarea
-route: stop, platform, forward, backward, stop_exit_only, stop_entry_only, platform_exit_only, platform_entry_only
+route: forward, backward, stop, platform, stop_exit_only, stop_entry_only, platform_exit_only, platform_entry_only
+public_transport: stop, platform
 restriction: from, to, via, location_hint
 enforcement: device, from, to, force