Add route=funicular to rendering (tramTrainRoutes)

osmandapp · Nov 24, 2014 · 8069e6ddf4575ba372ddd8a2bb688935acedf6d3 · 8069e6d
1 parent 74cbc85
commit 8069e6ddf4575ba372ddd8a2bb688935acedf6d3
Show file tree

Hide file tree

Showing 3 changed files with 14,637 additions and 14,612 deletions.
diff --git a/obf_creation/rendering_types.xml b/obf_creation/rendering_types.xml
@@ -275,6 +275,8 @@
 		<type tag="route" value="light_rail" target_tag="route_light_rail" target_value="" nameTags="ref" namePrefix="lightrail_" minzoom="11" relation="true"/>
 		<type tag="route_monorail" value="" nameTags="ref" namePrefix="monorail_" minzoom="11" relation="true"/>
 		<type tag="route" value="monorail" target_tag="route_monorail" target_value="" nameTags="ref" namePrefix="monorail_" minzoom="11" relation="true"/>
+		<type tag="route_funicular" value="" nameTags="ref" namePrefix="funicular_" minzoom="11" relation="true"/>
+		<type tag="route" value="funicular" target_tag="route_funicular" target_value="" nameTags="ref" namePrefix="funicular_" minzoom="11" relation="true"/>
 		<type tag="route" value="subway" additional="true" minzoom="11" relation="true"/> <!-- used only to distinguish subway stations from regular railway stations -->
 		<type tag="route" value="ski" minzoom="11" relation="true"/>
 

diff --git a/rendering_styles/default.render.xml b/rendering_styles/default.render.xml
@@ -736,6 +736,8 @@
 	<renderingConstant name="routeTrainColorNight" value="#cb6e23"/>
 	<renderingConstant name="routeLightrailColor" value="#009100"/>
 	<renderingConstant name="routeLightrailColorNight" value="#009100"/>
+	<renderingConstant name="routeFunicularColor" value="#3880a9"/>
+	<renderingConstant name="routeFunicularColorNight" value="#3880a9"/>
 
 	<renderingConstant name="publicTransportModeStopTextColor" value="#1a39d7"/>
 	<renderingConstant name="publicTransportModeStopTextHaloColor" value="#ffebe6"/>
@@ -1013,6 +1015,7 @@
 					<case tag="railway" value="tram"/>
 					<case tag="railway" value="light_rail"/>
 					<case tag="railway" value="monorail"/>
+					<case tag="railway" value="funicular"/>
 				</switch>
 				<apply_if subwayMode="false" layer="-1" minzoom="9" maxzoom="16">
 					<apply_if appMode="car" order="-1"/>
@@ -1023,6 +1026,7 @@
 			<case tag="route_bus" value="" order="105"/>
 			<case tag="route_share_taxi" value="" order="104"/>
 			<case tag="route_monorail" value="" order="103"/>
+			<case tag="route_funicular" value="" order="103"/>
 			<case tag="route_light_rail" value="" order="102"/>
 			<case tag="route_train" value="" order="101"/>
 			<case tag="route_tram" value="" order="100"/>
@@ -1554,6 +1558,7 @@
 				</case>
 				<case tag="route_light_rail" value="" nameTag="lightrail_ref" textHaloColor="$routeLightrailColor"/>
 				<case tag="route_monorail" value="" nameTag="monorail_ref" textHaloColor="$routeLightrailColor"/>
+				<case tag="route_funicular" value="" nameTag="funicular_ref" textHaloColor="$routeFunicularColor"/>
 			</switch>
 			<apply_if minzoom="13" maxzoom="14" textSize="6"/>
 			<apply_if minzoom="15" maxzoom="15" textSize="9"/>
@@ -4796,6 +4801,9 @@
 				<case tag="route_light_rail" value="" color="$routeLightrailColor">
 					<apply_if nightMode="true" color="$routeLightrailColorNight"/>
 				</case>
+				<case tag="route_funicular" value="" color="$routeFunicularColor">
+					<apply_if nightMode="true" color="$routeFunicularColorNight"/>
+				</case>
 				<case tag="route_monorail" value="" color="$routeLightrailColor" cap="ROUND">
 					<apply_if minzoom="11" maxzoom="11" pathEffect="1_1"/>
 					<apply_if minzoom="12" maxzoom="12" pathEffect="1_3"/>