Separate tertiary and white roads to fix bridges in night view (avoid nested case nightview issue)

This commit is contained in:
sonora 2011-07-05 17:25:54 -07:00
parent f8ad578f6a
commit 5906ec6a44

View file

@ -852,34 +852,49 @@
<switch> <switch>
<case tag="highway" value="tertiary" /> <case tag="highway" value="tertiary" />
<case tag="highway" value="tertiary_link" /> <case tag="highway" value="tertiary_link" />
<filter color="#fefeb3" shadowColor="#bababa" shadowRadius="1"> <filter color="#fefeb3" color_2="#fefeb3" shadowColor="#bababa" shadowRadius="1">
<filter minzoom="10" maxzoom="10" strokeWidth="3" /> <filter minzoom="10" maxzoom="10" strokeWidth="3" />
<filter minzoom="11" maxzoom="11" strokeWidth="4" /> <filter minzoom="11" maxzoom="11" strokeWidth="4" />
<filter minzoom="12" maxzoom="12" strokeWidth="5" /> <filter minzoom="12" maxzoom="12" strokeWidth="5" />
<filter minzoom="13" maxzoom="13" strokeWidth="6" /> <filter minzoom="13" maxzoom="13" strokeWidth="6" />
<switch>
<case layer="-1" pathEffect="4_4" />
<case /> <!-- all other cases -->
<filter>
<filter minzoom="14" maxzoom="14" strokeWidth="6" shadowRadius="1"/>
<filter minzoom="15" maxzoom="15" strokeWidth="8" shadowRadius="1"/>
<filter minzoom="16" maxzoom="16" strokeWidth="10" />
<!-- radius 0 to avoid showing many black lines -->
<filter minzoom="17" maxzoom="17" strokeWidth="13" />
<filter minzoom="18" strokeWidth="18" />
</filter>
</switch>
<!-- bridge -->
<switch>
<case nightMode="false" color="#000000" />
<case nightMode="true" color="#ffffff" />
<filter layer="1" cap_2="SQUARE" >
<filter minzoom="13" maxzoom="14" strokeWidth="8" strokeWidth_2="6" />
<filter minzoom="15" maxzoom="15" strokeWidth="10" strokeWidth_2="8" />
<filter minzoom="16" maxzoom="16" strokeWidth="12" strokeWidth_2="10" />
<filter minzoom="17" maxzoom="17" strokeWidth="15" strokeWidth_2="13" />
<filter minzoom="18" strokeWidth="20" strokeWidth_2="18" />
</filter>
</switch>
</filter> </filter>
</switch> </switch>
<switch> <switch>
<case nightMode="true" color="#9F9F9F" color_2="#9F9F9F" shadowColor="#666666"/> <case tag="highway" value="road" />
<case nightMode="false" color="#ffffff" color_2="#ffffff" shadowColor="#464646"/> <case tag="highway" value="unclassified" />
<case tag="highway" value="residential" />
<filter>
<switch> <switch>
<case tag="highway" value="road" /> <case nightMode="true" color="#9F9F9F" color_2="#9F9F9F" shadowColor="#666666"/>
<case tag="highway" value="unclassified" /> <case nightMode="false" color="#ffffff" color_2="#ffffff" shadowColor="#464646"/>
<case tag="highway" value="residential" /> <filter shadowRadius="1">
<filter shadowRadius="1"> <!-- ZM <filter minzoom="12" maxzoom="12" strokeWidth="3" /> --> <filter minzoom="13" maxzoom="13" strokeWidth="4" />
<!-- ZM <filter minzoom="12" maxzoom="12" strokeWidth="3" /> --> <switch>
<filter minzoom="13" maxzoom="13" strokeWidth="4" />
</filter>
</switch>
<switch>
<case tag="highway" value="tertiary" color="#fefeb3" color_2="#fefeb3" shadowColor="#bababa" />
<case tag="highway" value="tertiary_link" color="#fefeb3" color_2="#fefeb3" shadowColor="#bababa" />
<case tag="highway" value="road"/>
<case tag="highway" value="unclassified" />
<case tag="highway" value="residential" />
<filter>
<switch>
<case layer="-1" pathEffect="4_4" /> <case layer="-1" pathEffect="4_4" />
<case /> <!-- all other cases --> <case /> <!-- all other cases -->
<filter> <filter>
@ -890,11 +905,13 @@
<filter minzoom="17" maxzoom="17" strokeWidth="13" /> <filter minzoom="17" maxzoom="17" strokeWidth="13" />
<filter minzoom="18" strokeWidth="18" /> <filter minzoom="18" strokeWidth="18" />
</filter> </filter>
</switch> </switch>
<!-- bridge --> </filter>
<switch> </switch>
<case nightMode="false" color="#000000" /> <!-- bridge -->
<case nightMode="true" color="#ffffff" /> <switch>
<case nightMode="false" color="#000000" color_2="#ffffff" shadowColor="#464646" />
<case nightMode="true" color="#ffffff" color_2="#9F9F9F" shadowColor="#666666" />
<filter layer="1" cap_2="SQUARE" > <filter layer="1" cap_2="SQUARE" >
<filter minzoom="13" maxzoom="14" strokeWidth="8" strokeWidth_2="6" /> <filter minzoom="13" maxzoom="14" strokeWidth="8" strokeWidth_2="6" />
<filter minzoom="15" maxzoom="15" strokeWidth="10" strokeWidth_2="8" /> <filter minzoom="15" maxzoom="15" strokeWidth="10" strokeWidth_2="8" />
@ -902,9 +919,8 @@
<filter minzoom="17" maxzoom="17" strokeWidth="15" strokeWidth_2="13" /> <filter minzoom="17" maxzoom="17" strokeWidth="15" strokeWidth_2="13" />
<filter minzoom="18" strokeWidth="20" strokeWidth_2="18" /> <filter minzoom="18" strokeWidth="20" strokeWidth_2="18" />
</filter> </filter>
</switch> </switch>
</filter> </filter>
</switch>
</switch> </switch>
<switch> <switch>