xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

theming changes:

Browse Source 
- select="first" also add its renderstyles when no sub-rule matched
  ... before they where only added when one subrule matched

- use select="when-matched" as last subrule in select="first" rules
  instead.
This commit is contained in:
Hannes Janetzek 2014-03-09 21:50:02 +01:00
parent c7805c82c6
commit 0a23dc2c27
3 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vtm-themes/resources/assets/styles/default.xml
View File

@ -79,7 +79,7 @@
stipple-stroke="#be6253" /> stipple-stroke="#be6253" />
<style-line id="water:outline" stroke="#a4bbcc" width="1.0" fix="true" cap="butt" /> <style-line id="water:outline" stroke="#a4bbcc" width="1.0" fix="true" cap="butt" />
<style-line id="water" stroke="#a4bbcc" width="1.0" cap="butt" fix="true"/> <style-line id="water" stroke="#a4bbcc" width="1.0" cap="butt" fix="true" />
<style-line id="river" use="water" stroke="#a4bbcc" fix="false" /> <style-line id="river" use="water" stroke="#a4bbcc" fix="false" />
<!--<style-area id="water" fill="#97b7e5" afc5e3 /> --> <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
@ -1064,8 +1064,11 @@
<m k="amenity" v="cinema"> <m k="amenity" v="cinema">
<symbol src="cinema" /> <symbol src="cinema" />
</m> </m>
<m select="when-matched">
<text use="poi" /> <text use="poi" />
</m> </m>
</m>
<m zoom-min="16" select="first"> <m zoom-min="16" select="first">
<m v="atm" zoom-min="17"> <m v="atm" zoom-min="17">
@ -1089,8 +1092,10 @@
<m k="amenity" v="bus_station"> <m k="amenity" v="bus_station">
<symbol src="bus_station" /> <symbol src="bus_station" />
</m> </m>
<m select="when-matched">
<text use="poi" /> <text use="poi" />
</m> </m>
</m>
<m zoom-min="17" select="first"> <m zoom-min="17" select="first">
<m k="amenity" v="bank"> <m k="amenity" v="bank">
@ -1152,8 +1157,10 @@
<m k="amenity" v="theatre"> <m k="amenity" v="theatre">
<symbol src="theatre" /> <symbol src="theatre" />
</m> </m>
<m select="when-matched">
<text use="poi" /> <text use="poi" />
</m> </m>
</m>
<m zoom-min="17"> <m zoom-min="17">
<m k="amenity" v="toilets"> <m k="amenity" v="toilets">
@ -1176,17 +1183,18 @@
<m v="supermarket|organic"> <m v="supermarket|organic">
<symbol src="shop_supermarket" /> <symbol src="shop_supermarket" />
</m> </m>
<m>
<m zoom-min="17">
<symbol src="city" /> <symbol src="city" />
</m> </m>
</m>
<m zoom-min="17"> <m select="when-matched" zoom-min="17">
<text use="poi" /> <text use="poi" />
</m> </m>
</m> </m>
</m>
<m k="tourism"> <m k="tourism">
<m zoom-min="15" select="first"> <m zoom-min="15" select="first">
<m v="alpine_hut"> <m v="alpine_hut">
<symbol src="triangle-stroked" /> <symbol src="triangle-stroked" />
@ -1200,8 +1208,11 @@
<m v="hotel"> <m v="hotel">
<symbol src="hotel" /> <symbol src="hotel" />
</m> </m>
<m select="when-matched">
<text use="poi" /> <text use="poi" />
</m> </m>
</m>
<m zoom-min="16" select="first"> <m zoom-min="16" select="first">
<m v="information" select="first"> <m v="information" select="first">

28
vtm-themes/resources/assets/styles/osmarender.xml
View File

@ -779,19 +779,19 @@
<m k="bridge" v="yes|true"> <m k="bridge" v="yes|true">
<m select="first"> <m select="first">
<m v="service"> <m v="service">
<line stroke="#ffffff" width="0.85" outline="casing-bridge"/> <line stroke="#ffffff" width="0.85" outline="casing-bridge" />
<m zoom-min="15"> <m zoom-min="15">
<text k="name" style="bold" size="10" stroke="#ffffff" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#ffffff" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="construction"> <m v="construction">
<line stroke="#d0d0d0" width="1.0" outline="casing-bridge"/> <line stroke="#d0d0d0" width="1.0" outline="casing-bridge" />
<m zoom-min="15"> <m zoom-min="15">
<text k="name" style="bold" size="10" stroke="#d0d0d0" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#d0d0d0" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="road"> <m v="road">
<line stroke="#d0d0d0" width="1.25" outline="casing-bridge"/> <line stroke="#d0d0d0" width="1.25" outline="casing-bridge" />
<m zoom-min="15"> <m zoom-min="15">
<text k="name" style="bold" size="10" stroke="#d0d0d0" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#d0d0d0" stroke-width="2.0" />
</m> </m>
@ -803,69 +803,69 @@
</m> </m>
</m> </m>
<m v="unclassified|residential|living_street"> <m v="unclassified|residential|living_street">
<line stroke="#ffffff" width="1.25" outline="casing-bridge"/> <line stroke="#ffffff" width="1.25" outline="casing-bridge" />
<m zoom-min="15"> <m zoom-min="15">
<text k="name" style="bold" size="10" stroke="#ffffff" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#ffffff" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="byway"> <m v="byway">
<line stroke="#efadaa" width="1.15" outline="casing-bridge"/> <line stroke="#efadaa" width="1.15" outline="casing-bridge" />
<m zoom-min="15"> <m zoom-min="15">
<text k="name" style="bold" size="10" stroke="#efadaa" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#efadaa" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="tertiary|tertiary_link"> <m v="tertiary|tertiary_link">
<line use="tertiary" cap="square" outline="casing-bridge"/> <line use="tertiary" cap="square" outline="casing-bridge" />
<m zoom-min="14"> <m zoom-min="14">
<text k="name" style="bold" size="10" stroke="#ffff90" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#ffff90" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="secondary_link"> <m v="secondary_link">
<line use="secondary" width="-0.1" cap="square" outline="casing-bridge"/> <line use="secondary" width="-0.1" cap="square" outline="casing-bridge" />
<m zoom-min="14"> <m zoom-min="14">
<text k="name" style="bold" size="10" stroke="#fdbf6f" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#fdbf6f" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="primary_link"> <m v="primary_link">
<line use="primary" width="-0.1" cap="square" outline="casing-bridge"/> <line use="primary" width="-0.1" cap="square" outline="casing-bridge" />
<m zoom-min="14"> <m zoom-min="14">
<text k="name" style="bold" size="10" stroke="#e46d71" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#e46d71" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="trunk_link"> <m v="trunk_link">
<line use="trunk" cap="square" outline="casing-bridge"/> <line use="trunk" cap="square" outline="casing-bridge" />
<m zoom-min="14"> <m zoom-min="14">
<text k="name" style="bold" size="10" stroke="#7fc97f" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#7fc97f" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="motorway_link"> <m v="motorway_link">
<line use="motorway" width="-0.2" cap="square" outline="casing-bridge"/> <line use="motorway" width="-0.2" cap="square" outline="casing-bridge" />
<m zoom-min="14"> <m zoom-min="14">
<text k="name" style="bold" size="10" stroke="#809bc0" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#809bc0" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="secondary"> <m v="secondary">
<line use="secondary" cap="square" outline="casing-bridge"/> <line use="secondary" cap="square" outline="casing-bridge" />
<m zoom-min="14"> <m zoom-min="14">
<text k="name" style="bold" size="10" stroke="#fdbf6f" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#fdbf6f" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="primary"> <m v="primary">
<line use="primary" cap="square" outline="casing-bridge"/> <line use="primary" cap="square" outline="casing-bridge" />
<m zoom-min="14"> <m zoom-min="14">
<text k="name" style="bold" size="10" stroke="#e46d71" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#e46d71" stroke-width="2.0" />
<text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" /> <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="trunk"> <m v="trunk">
<line use="trunk" outline="casing-bridge"/> <line use="trunk" outline="casing-bridge" />
<m zoom-min="14"> <m zoom-min="14">
<text k="name" style="bold" size="10" stroke="#7fc97f" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#7fc97f" stroke-width="2.0" />
<text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" /> <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
</m> </m>
</m> </m>
<m v="motorway"> <m v="motorway">
<line use="motorway" cap="square" outline="casing-bridge"/> <line use="motorway" cap="square" outline="casing-bridge" />
<m zoom-min="14"> <m zoom-min="14">
<text k="name" style="bold" size="10" stroke="#809bc0" stroke-width="2.0" /> <text k="name" style="bold" size="10" stroke="#809bc0" stroke-width="2.0" />
<text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" /> <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />

4
vtm-themes/resources/assets/styles/tronrender.xml
View File

@ -1312,7 +1312,7 @@
</m> </m>
<m k="tourism"> <m k="tourism" select="first">
<m v="alpine_hut" zoom-min="16"> <m v="alpine_hut" zoom-min="16">
<symbol src="alpine_hut" /> <symbol src="alpine_hut" />
</m> </m>
@ -1332,7 +1332,7 @@
<symbol src="viewpoint" /> <symbol src="viewpoint" />
</m> </m>
<m zoom-min="17"> <m select="when-matched" zoom-min="17">
<text use="caption-small-blue" /> <text use="caption-small-blue" />
</m> </m>
</m> </m>