Changeset 27952 in osm

Timestamp:

2012-02-27T14:49:04+01:00 (12 years ago)

Author:

franpd

Message:

added one-way support

Location:

applications/editors/josm/plugins/routing

Files:

• build.xml (modified) (1 diff)
• src/com/innovant/josm/jrt/core/RoutingGraph.java (modified) (2 diffs)

applications/editors/josm/plugins/routing/build.xml

@@ -26 +26 @@
 -->
 <project name="routing" default="dist" basedir=".">
-    <property name="commit.message" value="fixed NPE at startup"/>
+    <property name="commit.message" value="added one-way support in roundabouts"/>
     <property name="plugin.main.version" value="4980"/>
     <!-- Define some properties -->

applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java

@@ -185 +185 @@
             
                                 String oneway_val = way.get("oneway");   /*   get (oneway=?) tag for this way.   */
+                                String junction_val = way.get("junction");   /*   get (junction=?) tag for this way.   */
             
                                 from = nodes.get(0);                   /*   1st node A  */
@@ -198 +199 @@
                                     
                                     //this is where we link the vertices
-                                                if (oneway_val == null || oneway_val == "false" || oneway_val == "no" || oneway_val == "0") {
-                                                //Case 1 (bi-way): oneway=false OR oneway=unset OR oneway=0 OR oneway=no
+                                                if (oneway_val == null && junction_val == "roundabout") {
+                                    //Case (roundabout): oneway=implicit yes
+                                                  addEdgeNormalOneway(way, from, to);
+                                                
+                                                } else if (oneway_val == null || oneway_val == "false" || oneway_val == "no" || oneway_val == "0") {
+                                                //Case (bi-way): oneway=false OR oneway=unset OR oneway=0 OR oneway=no
                                                   addEdgeBidirectional(way, from, to);
                                                   
                                                 } else if (oneway_val == "-1") {
-                                                //Case 2 (oneway reverse): oneway=-1
+                                                //Case (oneway reverse): oneway=-1
                                                   addEdgeReverseOneway(way, from, to);
                                                 
                                                 } else if (oneway_val == "1" || oneway_val == "yes" || oneway_val == "true") {
-              //Case 3 (oneway normal): oneway=yes OR 1 OR true
+                                                //Case (oneway normal): oneway=yes OR 1 OR true
                                                   addEdgeNormalOneway(way, from, to);