Changes between Version 56 and Version 57 of Styles/Lane_and_Road_Attributes

Timestamp:

2015-02-10T11:24:54+01:00 (11 years ago)

Author:

imagic

Comment:

Safety check for gauge added

Styles/Lane_and_Road_Attributes

@@ -3232 +3232 @@
 way|z18-[railway=tram]::Railway_Way
 {
-        
+    /* Determine gauge (safety limits: 1 - 10000 mm) */
     rail_gauge_list: eval(has_tag_key("gauge")?split(";",tag("gauge")):list(1435));
     rail_gauge: eval(get(prop(rail_gauge_list),length(prop(rail_gauge_list))-1));
-    rail_gauge: eval(cond(prop(rail_gauge)<1,1435,prop(rail_gauge)));
+    rail_gauge: eval(min(10000,cond(prop(rail_gauge)<1,1435,prop(rail_gauge))));
  
     /* Ties should be rendered in case standard and miniature railways; this might be override by the key embedded */
-        rail_show_ties: eval(cond(((tag("railway")=="rail") || (tag("railway")=="miniature")),yes,no));
-        rail_show_ties: eval(cond(has_tag_key("embedded"),cond(tag("embedded")=="no",yes,no),prop(rail_show_ties)));
-
-        /* Type of electrification:  */
-        /*    * rail -> show a yellow border on one rail */
-        /*    * contact_line -> show a contact line near the middle of the track */
-        rail_show_contact_line: eval(cond(has_tag_key("electrified"),cond(tag("electrified")="contact_line",yes,no),no));
+    rail_show_ties: eval(cond(((tag("railway")=="rail") || (tag("railway")=="miniature")),yes,no));
+    rail_show_ties: eval(cond(has_tag_key("embedded"),cond(tag("embedded")=="no",yes,no),prop(rail_show_ties)));
+
+    /* Type of electrification:  */
+    /*    * rail -> show a yellow border on one rail */
+    /*    * contact_line -> show a contact line near the middle of the track */
+    rail_show_contact_line: eval(cond(has_tag_key("electrified"),cond(tag("electrified")="contact_line",yes,no),no));
     rail_electrified_rail: eval(cond(has_tag_key("electrified"),cond(tag("electrified")="rail",yes,no),no));
     
@@ -3252 +3252 @@
     /* Create image */
     rail_image: eval(concat(
-    cond(prop(rail_show_ties),"<rect x='0' y='0' width='8' height='80' style='stroke:#301004; fill:#90300C;'/>",""),
-    "<line x1='0' y1= '8' x2='32' y2= '8' style='stroke:",cond(prop(rail_electrified_rail),"#FFFF00","#301004"),";'/>",
-    "<line x1='0' y1='10' x2='32' y2='10' style='stroke:#602008;stroke-width:3px'/>",
-    "<line x1='0' y1='12' x2='32' y2='12' style='stroke:#301004;'/>",
-    "<line x1='0' y1='67' x2='32' y2='67' style='stroke:#301004;'/>",
-    "<line x1='0' y1='69' x2='32' y2='69' style='stroke:#602008;stroke-width:3px'/>",
-    "<line x1='0' y1='71' x2='32' y2='71' style='stroke:#301004;'/>",
-    cond(prop(rail_show_contact_line),"<line x1='0' y1='35' x2='32' y2='35' style='stroke:#060200;'/>","")
-    ));   
-        repeat-image: concat("data:image/svg+xml,<svg width='32px' height='80px'><g fill-opacity='",prop(rail_image_opacity),"' opacity='",prop(rail_image_opacity),"'>",prop(rail_image),"</g></svg>");
-        repeat-image-height: eval(max(2,ceil((prop(rail_gauge)*prop(pixel_per_metre,"default"))*0.0012)));
+                cond(prop(rail_show_ties),"<rect x='0' y='0' width='8' height='80' style='stroke:#301004; fill:#90300C;'/>",""),
+                "<line x1='0' y1= '8' x2='32' y2= '8' style='stroke:",cond(prop(rail_electrified_rail),"#FFFF00","#301004"),";'/>",
+                "<line x1='0' y1='10' x2='32' y2='10' style='stroke:#602008;stroke-width:3px'/>",
+                "<line x1='0' y1='12' x2='32' y2='12' style='stroke:#301004;'/>",
+                "<line x1='0' y1='67' x2='32' y2='67' style='stroke:#301004;'/>",
+                "<line x1='0' y1='69' x2='32' y2='69' style='stroke:#602008;stroke-width:3px'/>",
+                "<line x1='0' y1='71' x2='32' y2='71' style='stroke:#301004;'/>",
+                cond(prop(rail_show_contact_line),"<line x1='0' y1='35' x2='32' y2='35' style='stroke:#060200;'/>","")
+                ));   
+    repeat-image: concat("data:image/svg+xml,<svg width='32px' height='80px'><g fill-opacity='",prop(rail_image_opacity),"' opacity='",prop(rail_image_opacity),"'>",prop(rail_image),"</g></svg>");
+    repeat-image-height: eval(max(2,ceil((prop(rail_gauge)*prop(pixel_per_metre,"default"))*0.0012)));
 }