Changes between Version 24 and Version 25 of Styles/Lane_and_Road_Attributes

Timestamp:

2013-03-06T11:51:36+01:00 (13 years ago)

Author:

imagic

Comment:

Now only one cycletrack will be displayed on a one-way, except if oneway:bicycle=no is specified

Styles/Lane_and_Road_Attributes

@@ -1464 +1464 @@
 way|z17-[is_prop_set(ok)][is_prop_set(lanes_all)]::Ground
 {
-    templ:  eval((has_tag_key(sidewalk) && ((tag(sidewalk)="both") || (tag(sidewalk)="left")))?1:0);
-    templ:  eval(prop(templ)+((((has_tag_key(cycleway) && ((tag(cycleway)="track") && (!(has_tag_key("cycleway:left") && (tag("cycleway:left")="no"))))) ||
+    /* Cycletrack in an one-way on the left side? */
+    temp_allow_cycleway_left: eval(!(
+                                      ((prop(oneway_type,"default")=1) && prop(style_right_hand_traffic,"default")) ||
+                                      ((prop(oneway_type,"default")=(-1)) && (!prop(style_right_hand_traffic,"default")))
+                                    ));
+
+    temp_allow_cycleway_left: eval(prop(temp_allow_cycleway_left) || (has_tag_key("oneway:bicycle") && (tag("oneway:bicycle")="no")));
+    /* Explicitely no cycletrack on the left side? */
+    temp_allow_cycleway_left: eval((has_tag_key("cycleway:left") && (tag("cycleway:left")="no"))?false:prop(temp_allow_cycleway_left));
+    /* Cycletrack on the left side */
+    temp_cycleway_left: eval(((has_tag_key(cycleway) && ((tag(cycleway)="track") && prop(temp_allow_cycleway_left))) ||
                                 (has_tag_key("cycleway:left") && (tag("cycleway:left")="track"))) ||
                                 (has_tag_key("cycleway:both") && (tag("cycleway:both")="track"))
-                              )?2:0));
-    tempr:  eval((has_tag_key(sidewalk) && ((tag(sidewalk)="both") || (tag(sidewalk)="right")))?1:0);
-    tempr:  eval(prop(tempr)+((((has_tag_key(cycleway) && ((tag(cycleway)="track") && (!(has_tag_key("cycleway:right") && (tag("cycleway:right")="no"))))) ||
+                            );
+
+    /* Sidewalk on the left side? */
+    templ:  eval((has_tag_key(sidewalk) && ((tag(sidewalk)="both") || (tag(sidewalk)="left")))?1:0);
+
+    /* Combine  sidewalk and cycletrack: 0=none; 1=sidewalk; 2=cycletrack; 3=sidewalk and cycletrack */
+    templ: eval(prop(templ)+(prop(temp_cycleway_left)?2:0));
+
+
+    /* Cycletrack in an one-way on the right side? */
+    temp_allow_cycleway_right: eval(!(
+                                      ((prop(oneway_type,"default")=(-1)) && prop(style_right_hand_traffic,"default")) ||
+                                      ((prop(oneway_type,"default")=1) && (!prop(style_right_hand_traffic,"default")))
+                                    ));
+
+    temp_allow_cycleway_right: eval(prop(temp_allow_cycleway_right) || (has_tag_key("oneway:bicycle") && (tag("oneway:bicycle")="no")));
+    /* Explicitely no cycletrack on the right side? */
+    temp_allow_cycleway_right: eval((has_tag_key("cycleway:right") && (tag("cycleway:right")="no"))?false:prop(temp_allow_cycleway_right));
+    /* Cycletrack on the right side */
+    temp_cycleway_right: eval(((has_tag_key(cycleway) && ((tag(cycleway)="track") && prop(temp_allow_cycleway_right))) ||
                                 (has_tag_key("cycleway:right") && (tag("cycleway:right")="track"))) ||
                                 (has_tag_key("cycleway:both") && (tag("cycleway:both")="track"))
-                              )?2:0));
+                            );
+
+    /* Sidewalk on the right side? */
+    tempr:  eval((has_tag_key(sidewalk) && ((tag(sidewalk)="both") || (tag(sidewalk)="right")))?1:0);
+
+    /* Combine  sidewalk and cycletrack: 0=none; 1=sidewalk; 2=cycletrack; 3=sidewalk and cycletrack */
+    tempr: eval(prop(tempr)+(prop(temp_cycleway_right)?2:0));
+
 
     left-casing-linecap: none;