Changes between Version 9 and Version 10 of Styles/Lane_and_Road_Attributes

Timestamp:

2013-02-19T12:04:34+01:00 (13 years ago)

Author:

imagic

Comment:

The tag width was not considered properly (width:lanes was)

Styles/Lane_and_Road_Attributes

@@ -41 +41 @@
     description: "Visualization of lanes, width, turn lanes, changing the lane, lighting and street lamps, sidewalk, cycletracks, bicycle lanes, bus lanes, psv lanes.";
     author: "Martin Vonwald";
-    version: "0.99-beta6-[[revision]]_[[date]]";
+    version: "0.99-beta7-[[revision]]_[[date]]";
     license: "CC-BY-SA";
     min-josm-version: "5714";
@@ -777 +777 @@
 /* Determine the width of the lanes, road markings and the inner lane width                                                                        */
 /*-------------------------------------------------------------------------------------------------------------------------------------------------*/
-way|z1-16[is_prop_set(ok)]
-{
-    lane_width: 1;
-}
-
 way|z17[is_prop_set(ok)]
 {
-    lane_default_width: 4;
     lane_min_width: 4;
-
-    lane_width: eval(max(4,(has_tag_key(width)?((1.25*tag(width))/prop(lanes_all)):4))); 
+    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((1.25*tag(width))/prop(lanes_all)):4))); 
     change_allowed: 6,9;
     change_forbidden: 0;
@@ -796 +789 @@
 way|z18[is_prop_set(ok)]
 {
-    lane_default_width: 8;
     lane_min_width: 8;
-
-    lane_width: eval(max(8,(has_tag_key(width)?((2.5*tag(width))/prop(lanes_all)):8))); 
+    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((2.5*tag(width))/prop(lanes_all)):8))); 
     change_allowed: 12,18;
     change_forbidden: 0;
@@ -808 +799 @@
 way|z19[is_prop_set(ok)]
 {
-    lane_default_width: 16;
     lane_min_width: 8;
-
-    lane_width: eval(max(8,(has_tag_key(width)?((5*tag(width))/prop(lanes_all)):16))); 
+    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((5*tag(width))/prop(lanes_all)):16))); 
     change_allowed: 24,36;
     change_forbidden: 0;
@@ -820 +809 @@
 way|z20[is_prop_set(ok)]
 {
-    lane_default_width: 32;
     lane_min_width: 8;
-
-    lane_width: eval(max(8,(has_tag_key(width)?((10*tag(width))/prop(lanes_all)):32))); 
+    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((10*tag(width))/prop(lanes_all)):32))); 
     change_allowed: 48,72;
     change_forbidden: 0;
@@ -832 +819 @@
 way|z21-[is_prop_set(ok)]
 {
-    lane_default_width: 64;
     lane_min_width: 12;
-
-    lane_width: eval(max(12,(has_tag_key(width)?((20*tag(width))/prop(lanes_all)):64))); 
+    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((20*tag(width))/prop(lanes_all)):64))); 
     change_allowed: 96,144;
     change_forbidden: 0;
@@ -844 +829 @@
 way|z22-[is_prop_set(ok)]
 {
-    lane_default_width: 128;
     lane_min_width: 20;
-
-    lane_width: eval(max(20,(has_tag_key(width)?((40*tag(width))/prop(lanes_all)):128))); 
+    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((40*tag(width))/prop(lanes_all)):128))); 
     change_allowed: 192,288;
     change_forbidden: 0;
@@ -1351 +1334 @@
 
     left-casing-linecap: none;
-    left-casing-width: eval((prop(templ)>0)?(prop(lane_width,"default")/2):0);
+    left-casing-width: eval((prop(templ)>0)?(prop(lane_default_width,"default")/2):0);
     left-casing-color:  eval(get(prop(style_sidewalk_color,"default"),prop(templ)));
     left-casing-opacity: prop(style_ground_opacity,"default");
 
     right-casing-linecap: none;
-    right-casing-width: eval((prop(tempr)>0)?(prop(lane_width,"default")/2):0);
+    right-casing-width: eval((prop(tempr)>0)?(prop(lane_default_width,"default")/2):0);
     right-casing-color:  eval(get(prop(style_sidewalk_color,"default"),prop(tempr)));
     right-casing-opacity: prop(style_ground_opacity,"default");