all-purpose renderer: v015: Implement motorway_junction text. Separate tertiary and white roads to fix bridges in night view
This commit is contained in:
sonora
parent
9c5b0fe7d7
commit
3aef6dea25
1 changed files with 46 additions and 31 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
<renderer name="all-purpose" depends="" defaultColor="#f1eee8" defaultNightColor="#003333">
|
<renderer name="all-purpose" depends="" defaultColor="#f1eee8" defaultNightColor="#003333">
|
||||||
<!--
|
<!--
|
||||||
All Purpose Renderer (essentially more details than default) (by Hardy Mueller), v014d:
|
All Purpose Renderer (essentially more details than default) (by Hardy Mueller), v015:
|
||||||
Map rendering aligned to typical map use for all zoom levels/scales, hence always yields a complete and reliable map.
|
Map rendering aligned to typical map use for all zoom levels/scales, hence always yields a complete and reliable map.
|
||||||
All features displayed at each zoom level (zX) are those for its typical use:
|
All features displayed at each zoom level (zX) are those for its typical use:
|
||||||
- z7 = "Rough Country Level Overview": Shows motorways, trunks, primary roads and city names
|
- z7 = "Rough Country Level Overview": Shows motorways, trunks, primary roads and city names
|
||||||
|
|
@ -18,8 +18,7 @@
|
||||||
- v012: This is the one Victor produced from v011, with combining day/night renderer. Some optical deviations from former v011 contained. This one synced with default on master 2011-07-03.
|
- v012: This is the one Victor produced from v011, with combining day/night renderer. Some optical deviations from former v011 contained. This one synced with default on master 2011-07-03.
|
||||||
- v013: Fixed some bugs to re-instate functionality of v011: Fix night view for all shaders, cemetery, vineyard, nature_reserve, forest. Fixed night view for field, orchard, quarry, marsh, mud, wetland, scrub, zoo. Fixed night view for white roads. Also brightened motorway and trunk highway colors again to what was requested in forum. Fix night bridges.
|
- v013: Fixed some bugs to re-instate functionality of v011: Fix night view for all shaders, cemetery, vineyard, nature_reserve, forest. Fixed night view for field, orchard, quarry, marsh, mud, wetland, scrub, zoo. Fixed night view for white roads. Also brightened motorway and trunk highway colors again to what was requested in forum. Fix night bridges.
|
||||||
- v014: functionality of v011 restored, with combined day+night view. Trunk highways slightly darker, white tags on all dotted paths at night.
|
- v014: functionality of v011 restored, with combined day+night view. Trunk highways slightly darker, white tags on all dotted paths at night.
|
||||||
- v015: fix issue with white roads bridge in night view, color_2 statemant in night view switch seems problem
|
- v015: Implement motorway_junction text. Separate tertiary and white roads to fix bridges in night view -->
|
||||||
-->
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Main colors for night renderer:
|
Main colors for night renderer:
|
||||||
|
|
@ -228,8 +227,8 @@
|
||||||
</filter>
|
</filter>
|
||||||
</switch>
|
</switch>
|
||||||
</switch>
|
</switch>
|
||||||
|
<filter minzoom="15" textSize="14" textBold="true" textWrapWidth="12" textMinDistance="20" tag="highway" value="motorway_junction"/>
|
||||||
|
|
||||||
|
|
||||||
<!-- Natural -->
|
<!-- Natural -->
|
||||||
<filter minzoom="15" textSize="12" textColor="#09dd09" textHaloRadius="1" textWrapWidth="15" tag="natural" value="park" />
|
<filter minzoom="15" textSize="12" textColor="#09dd09" textHaloRadius="1" textWrapWidth="15" tag="natural" value="park" />
|
||||||
|
|
||||||
|
|
@ -846,34 +845,50 @@
|
||||||
<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">
|
|
||||||
<filter minzoom="12" maxzoom="12" strokeWidth="3" />
|
<filter minzoom="12" maxzoom="12" strokeWidth="3" />
|
||||||
<filter minzoom="13" maxzoom="13" strokeWidth="4" />
|
<filter minzoom="13" maxzoom="13" strokeWidth="4" />
|
||||||
</filter>
|
<switch>
|
||||||
</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>
|
||||||
|
|
@ -884,11 +899,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" />
|
||||||
|
|
@ -896,11 +913,9 @@
|
||||||
<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>
|
||||||
<case tag="highway" value="service" color="#ececec" color_2="#ececec" shadowColor="#b0b0b0" />
|
<case tag="highway" value="service" color="#ececec" color_2="#ececec" shadowColor="#b0b0b0" />
|
||||||
<case tag="highway" value="living_street" color="#ececec" color_2="#ececec" shadowColor="#b0b0b0" />
|
<case tag="highway" value="living_street" color="#ececec" color_2="#ececec" shadowColor="#b0b0b0" />
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue