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

Render themes improvements #41

Browse Source
This commit is contained in:
Emux 2017-09-28 15:05:41 +03:00
parent 60aa9600d8
commit cedf3edc61
8 changed files with 1275 additions and 1250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vtm-themes/resources/assets/vtm/default.xml
View File

@ -62,11 +62,11 @@
<style-area fade="10" fill="#ddddcc" id="quarry" />
<style-area fade="10" fill="#eeedea" id="military" />
<style-line id="residential" stroke="#ffffff" width="1.3" />
<style-line cap="square" id="residential:bridge" use="residential" />
<style-line cap="butt" id="residential:bridge" use="residential" />
<!-- when inheriting another style with 'from' then 'width' is relative to the parent -->
<style-line id="pedestrian" use="residential" width="-0.4" />
<style-line cap="square" id="pedestrian:bridge" use="pedestrian" />
<style-line cap="butt" id="pedestrian:bridge" use="pedestrian" />
<style-line id="highway:z11" stroke="#fcba5a" width="1.8" />
<!-- <style-line id="highway:z11:bridge" use="highway:z11" cap="butt" /> -->
<style-line cap="butt" id="trunk_link" stroke="#fee16e" width="1.3" />
@ -769,10 +769,10 @@
<line use="bridleway" />
</m>
<m v="construction">
<line cap="square" outline="bridge" use="construction" />
<line cap="butt" outline="bridge" use="construction" />
</m>
<m v="service">
<line cap="square" outline="bridge" use="highway-service" />
<line cap="butt" outline="bridge" use="highway-service" />
</m>
</m>
@ -789,29 +789,29 @@
<m select="first">
<m v="tertiary|secondary_link">
<line cap="square" outline="bridge" use="tertiary" />
<line cap="butt" outline="bridge" use="tertiary" />
<text use="road" />
</m>
<m v="trunk_link|motorway_link">
<line cap="square" outline="bridge" use="trunk_link" />
<line cap="butt" outline="bridge" use="trunk_link" />
<text use="major-road" />
</m>
<m v="secondary|primary_link">
<line cap="square" outline="bridge" use="secondary:z11" />
<line cap="butt" outline="bridge" use="secondary:z11" />
<text use="major-road" />
</m>
<m v="primary">
<line cap="square" outline="bridge" use="primary:z11" />
<line cap="butt" outline="bridge" use="primary:z11" />
<text use="major-road" />
<text use="ref" />
</m>
<m v="trunk">
<line cap="square" outline="bridge" use="trunk" />
<line cap="butt" outline="bridge" use="trunk" />
<text use="major-road" />
<text use="ref" />
</m>
<m v="motorway">
<line cap="square" outline="bridge" use="highway:z11" />
<line cap="butt" outline="bridge" use="highway:z11" />
<text use="major-road" />
<text use="ref" />
</m>

20
vtm-themes/resources/assets/vtm/mapzen.xml
View File

@ -62,11 +62,11 @@
<style-area fade="10" fill="#ddddcc" id="quarry" />
<style-area fade="10" fill="#eeedea" id="military" />
<style-line id="residential" stroke="#ffffff" width="1.3" />
<style-line cap="square" id="residential:bridge" use="residential" />
<style-line cap="butt" id="residential:bridge" use="residential" />
<!-- when inheriting another style with 'from' then 'width' is relative to the parent -->
<style-line id="pedestrian" use="residential" width="-0.4" />
<style-line cap="square" id="pedestrian:bridge" use="pedestrian" />
<style-line cap="butt" id="pedestrian:bridge" use="pedestrian" />
<style-line id="highway:z11" stroke="#fcba5a" width="1.8" />
<!-- <style-line id="highway:z11:bridge" use="highway:z11" cap="butt" /> -->
<style-line cap="butt" id="trunk_link" stroke="#fee16e" width="1.3" />
@ -766,10 +766,10 @@
<line use="bridleway" />
</m>
<m v="construction">
<line cap="square" outline="bridge" use="construction" />
<line cap="butt" outline="bridge" use="construction" />
</m>
<m v="service">
<line cap="square" outline="bridge" use="highway-service" />
<line cap="butt" outline="bridge" use="highway-service" />
</m>
</m>
@ -786,29 +786,29 @@
<m select="first">
<m v="tertiary|secondary_link">
<line cap="square" outline="bridge" use="tertiary" />
<line cap="butt" outline="bridge" use="tertiary" />
<text use="road" />
</m>
<m v="trunk_link|motorway_link">
<line cap="square" outline="bridge" use="trunk_link" />
<line cap="butt" outline="bridge" use="trunk_link" />
<text use="major-road" />
</m>
<m v="secondary|primary_link">
<line cap="square" outline="bridge" use="secondary:z11" />
<line cap="butt" outline="bridge" use="secondary:z11" />
<text use="major-road" />
</m>
<m v="primary">
<line cap="square" outline="bridge" use="primary:z11" />
<line cap="butt" outline="bridge" use="primary:z11" />
<text use="major-road" />
<text use="ref" />
</m>
<m v="trunk">
<line cap="square" outline="bridge" use="trunk" />
<line cap="butt" outline="bridge" use="trunk" />
<text use="major-road" />
<text use="ref" />
</m>
<m v="motorway">
<line cap="square" outline="bridge" use="highway:z11" />
<line cap="butt" outline="bridge" use="highway:z11" />
<text use="major-road" />
<text use="ref" />
</m>

20
vtm-themes/resources/assets/vtm/newtron.xml
View File

@ -42,11 +42,11 @@
<style-line blur="1.0" fade="13" id="residential" stroke="#ffffff" width="1.0" />
<style-line cap="square" id="residential:bridge" use="residential" />
<style-line cap="butt" id="residential:bridge" use="residential" />
<!-- when inheriting another style with 'from' then 'width' is meant relative to the parent -->
<style-line id="pedestrian" use="residential" width="-0.4" />
<style-line cap="square" id="pedestrian:bridge" use="pedestrian" />
<style-line cap="butt" id="pedestrian:bridge" use="pedestrian" />
<style-line blur="0.9" id="highway:z11" stroke="#de3935" width="1.8" />
<!-- <style-line id="highway:z11:bridge" use="highway:z11" cap="butt" /> -->
@ -745,12 +745,12 @@
</m>
<m v="construction">
<line cap="square" use="construction" />
<line cap="butt" use="construction" />
<outline use="bridge" />
</m>
<m v="service">
<line cap="square" use="highway-service" />
<line cap="butt" use="highway-service" />
<outline use="bridge" />
</m>
</m>
@ -769,40 +769,40 @@
</m>
<m v="tertiary|secondary_link">
<line cap="square" use="tertiary" />
<line cap="butt" use="tertiary" />
<outline use="bridge" />
<text use="road" />
</m>
<m v="trunk_link|motorway_link">
<line cap="square" use="trunk_link" />
<line cap="butt" use="trunk_link" />
<outline use="bridge" />
<text use="major-road" />
</m>
<m v="secondary|primary_link">
<!-- <line stroke="#fff939" width="1.6" cap="butt" /> -->
<line cap="square" use="secondary:z11" />
<line cap="butt" use="secondary:z11" />
<outline use="bridge" />
<text use="major-road" />
</m>
<m v="primary">
<line cap="square" use="primary:z11" />
<line cap="butt" use="primary:z11" />
<outline use="bridge" />
<text use="major-road" />
<text use="ref" />
</m>
<m v="trunk">
<line cap="square" use="trunk" />
<line cap="butt" use="trunk" />
<outline use="bridge" />
<text use="major-road" />
<text use="ref" />
</m>
<m v="motorway">
<line cap="square" use="highway:z11" />
<line cap="butt" use="highway:z11" />
<outline use="bridge" />
<text use="major-road" />
<text use="ref" />

20
vtm-themes/resources/assets/vtm/openmaptiles.xml
View File

@ -62,11 +62,11 @@
<style-area fade="10" fill="#ddddcc" id="quarry" />
<style-area fade="10" fill="#eeedea" id="military" />
<style-line id="residential" stroke="#ffffff" width="1.3" />
<style-line cap="square" id="residential:bridge" use="residential" />
<style-line cap="butt" id="residential:bridge" use="residential" />
<!-- when inheriting another style with 'from' then 'width' is relative to the parent -->
<style-line id="pedestrian" use="residential" width="-0.4" />
<style-line cap="square" id="pedestrian:bridge" use="pedestrian" />
<style-line cap="butt" id="pedestrian:bridge" use="pedestrian" />
<style-line id="highway:z11" stroke="#fcba5a" width="1.8" />
<!-- <style-line id="highway:z11:bridge" use="highway:z11" cap="butt" /> -->
<style-line cap="butt" id="trunk_link" stroke="#fee16e" width="1.3" />
@ -765,10 +765,10 @@
<line use="bridleway" />
</m>
<m v="construction">
<line cap="square" outline="bridge" use="construction" />
<line cap="butt" outline="bridge" use="construction" />
</m>
<m v="service">
<line cap="square" outline="bridge" use="highway-service" />
<line cap="butt" outline="bridge" use="highway-service" />
</m>
</m>
@ -785,29 +785,29 @@
<m select="first">
<m v="tertiary|secondary_link">
<line cap="square" outline="bridge" use="tertiary" />
<line cap="butt" outline="bridge" use="tertiary" />
<text use="road" />
</m>
<m v="trunk_link|motorway_link">
<line cap="square" outline="bridge" use="trunk_link" />
<line cap="butt" outline="bridge" use="trunk_link" />
<text use="major-road" />
</m>
<m v="secondary|primary_link">
<line cap="square" outline="bridge" use="secondary:z11" />
<line cap="butt" outline="bridge" use="secondary:z11" />
<text use="major-road" />
</m>
<m v="primary">
<line cap="square" outline="bridge" use="primary:z11" />
<line cap="butt" outline="bridge" use="primary:z11" />
<text use="major-road" />
<text use="ref" />
</m>
<m v="trunk">
<line cap="square" outline="bridge" use="trunk" />
<line cap="butt" outline="bridge" use="trunk" />
<text use="major-road" />
<text use="ref" />
</m>
<m v="motorway">
<line cap="square" outline="bridge" use="highway:z11" />
<line cap="butt" outline="bridge" use="highway:z11" />
<text use="major-road" />
<text use="ref" />
</m>

18
vtm-themes/resources/assets/vtm/osmagray.xml
View File

@ -816,14 +816,14 @@
</m>
</m>
<m v="tertiary|tertiary_link">
<line cap="square" outline="casing-bridge" use="tertiary" />
<line cap="butt" outline="casing-bridge" use="tertiary" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#f7f7f7"
stroke-width="2.0" />
</m>
</m>
<m v="secondary_link">
<line cap="square" outline="casing-bridge" use="secondary"
<line cap="butt" outline="casing-bridge" use="secondary"
width="-0.1" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#c6c6c6"
@ -831,7 +831,7 @@
</m>
</m>
<m v="primary_link">
<line cap="square" outline="casing-bridge" use="primary"
<line cap="butt" outline="casing-bridge" use="primary"
width="-0.1" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#868686"
@ -839,14 +839,14 @@
</m>
</m>
<m v="trunk_link">
<line cap="square" outline="casing-bridge" use="trunk" />
<line cap="butt" outline="casing-bridge" use="trunk" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#b4b4b4"
stroke-width="2.0" />
</m>
</m>
<m v="motorway_link">
<line cap="square" outline="casing-bridge" use="motorway"
<line cap="butt" outline="casing-bridge" use="motorway"
width="-0.2" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#979797"
@ -854,14 +854,14 @@
</m>
</m>
<m v="secondary">
<line cap="square" outline="casing-bridge" use="secondary" />
<line cap="butt" outline="casing-bridge" use="secondary" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#c6c6c6"
stroke-width="2.0" />
</m>
</m>
<m v="primary">
<line cap="square" outline="casing-bridge" use="primary" />
<line cap="butt" outline="casing-bridge" use="primary" />
<m zoom-min="14">
<text style="bold" k="name" priority="1" size="16"
stroke="#868686" stroke-width="2.0" />
@ -870,7 +870,7 @@
</m>
</m>
<m v="trunk">
<line outline="casing-bridge" use="trunk" />
<line cap="butt" outline="casing-bridge" use="trunk" />
<m zoom-min="14">
<text style="bold" k="name" priority="1" size="16"
stroke="#b4b4b4" stroke-width="2.0" />
@ -879,7 +879,7 @@
</m>
</m>
<m v="motorway">
<line cap="square" outline="casing-bridge" use="motorway" />
<line cap="butt" outline="casing-bridge" use="motorway" />
<m zoom-min="14">
<text style="bold" k="name" priority="1" size="16"
stroke="#979797" stroke-width="2.0" />

18
vtm-themes/resources/assets/vtm/osmarender.xml
View File

@ -816,14 +816,14 @@
</m>
</m>
<m v="tertiary|tertiary_link">
<line cap="square" outline="casing-bridge" use="tertiary" />
<line cap="butt" outline="casing-bridge" use="tertiary" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#ffff90"
stroke-width="2.0" />
</m>
</m>
<m v="secondary_link">
<line cap="square" outline="casing-bridge" use="secondary"
<line cap="butt" outline="casing-bridge" use="secondary"
width="-0.1" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#fdbf6f"
@ -831,7 +831,7 @@
</m>
</m>
<m v="primary_link">
<line cap="square" outline="casing-bridge" use="primary"
<line cap="butt" outline="casing-bridge" use="primary"
width="-0.1" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#e46d71"
@ -839,14 +839,14 @@
</m>
</m>
<m v="trunk_link">
<line cap="square" outline="casing-bridge" use="trunk" />
<line cap="butt" outline="casing-bridge" use="trunk" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#7fc97f"
stroke-width="2.0" />
</m>
</m>
<m v="motorway_link">
<line cap="square" outline="casing-bridge" use="motorway"
<line cap="butt" outline="casing-bridge" use="motorway"
width="-0.2" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#809bc0"
@ -854,14 +854,14 @@
</m>
</m>
<m v="secondary">
<line cap="square" outline="casing-bridge" use="secondary" />
<line cap="butt" outline="casing-bridge" use="secondary" />
<m zoom-min="14">
<text style="bold" k="name" size="16" stroke="#fdbf6f"
stroke-width="2.0" />
</m>
</m>
<m v="primary">
<line cap="square" outline="casing-bridge" use="primary" />
<line cap="butt" outline="casing-bridge" use="primary" />
<m zoom-min="14">
<text style="bold" k="name" priority="1" size="16"
stroke="#e46d71" stroke-width="2.0" />
@ -870,7 +870,7 @@
</m>
</m>
<m v="trunk">
<line outline="casing-bridge" use="trunk" />
<line cap="butt" outline="casing-bridge" use="trunk" />
<m zoom-min="14">
<text style="bold" k="name" priority="1" size="16"
stroke="#7fc97f" stroke-width="2.0" />
@ -879,7 +879,7 @@
</m>
</m>
<m v="motorway">
<line cap="square" outline="casing-bridge" use="motorway" />
<line cap="butt" outline="casing-bridge" use="motorway" />
<m zoom-min="14">
<text style="bold" k="name" priority="1" size="16"
stroke="#809bc0" stroke-width="2.0" />

20
vtm-themes/resources/assets/vtm/tronrender.xml
View File

@ -42,11 +42,11 @@
<style-line blur="1.0" fade="13" id="residential" stroke="#ffffff" width="1.0" />
<style-line cap="square" id="residential:bridge" use="residential" />
<style-line cap="butt" id="residential:bridge" use="residential" />
<!-- when inheriting another style with 'from' then 'width' is meant relative to the parent -->
<style-line id="pedestrian" use="residential" width="-0.4" />
<style-line cap="square" id="pedestrian:bridge" use="pedestrian" />
<style-line cap="butt" id="pedestrian:bridge" use="pedestrian" />
<style-line blur="0.9" id="highway:z11" stroke="#fcba5a" width="1.8" />
<!-- <style-line id="highway:z11:bridge" use="highway:z11" cap="butt" /> -->
@ -738,12 +738,12 @@
</m>
<m v="construction">
<line cap="square" use="construction" />
<line cap="butt" use="construction" />
<outline use="bridge" />
</m>
<m v="service">
<line cap="square" use="highway-service" />
<line cap="butt" use="highway-service" />
<outline use="bridge" />
</m>
</m>
@ -762,40 +762,40 @@
</m>
<m v="tertiary|secondary_link">
<line cap="square" use="tertiary" />
<line cap="butt" use="tertiary" />
<outline use="bridge" />
<text use="road" />
</m>
<m v="trunk_link|motorway_link">
<line cap="square" use="trunk_link" />
<line cap="butt" use="trunk_link" />
<outline use="bridge" />
<text use="major-road" />
</m>
<m v="secondary|primary_link">
<!-- <line stroke="#fff939" width="1.6" cap="butt" /> -->
<line cap="square" use="secondary:z11" />
<line cap="butt" use="secondary:z11" />
<outline use="bridge" />
<text use="major-road" />
</m>
<m v="primary">
<line cap="square" use="primary:z11" />
<line cap="butt" use="primary:z11" />
<outline use="bridge" />
<text use="major-road" />
<text use="ref" />
</m>
<m v="trunk">
<line cap="square" use="trunk" />
<line cap="butt" use="trunk" />
<outline use="bridge" />
<text use="major-road" />
<text use="ref" />
</m>
<m v="motorway">
<line cap="square" use="highway:z11" />
<line cap="butt" use="highway:z11" />
<outline use="bridge" />
<text use="major-road" />
<text use="ref" />

2389
vtm-web-app/resources/assets/vtm/default_atlas.xml
View File

File diff suppressed because it is too large Load Diff