Skip to content

Commit

Permalink
Render theme improvements opensciencemap#41
Browse files Browse the repository at this point in the history
  • Loading branch information
@devemux86
devemux86 committed Oct 28, 2016
1 parent 53ca77d commit a9283dd
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 40 deletions.
20 changes: 11 additions & 9 deletions vtm-themes/resources/assets/styles/default.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,9 @@
-->
<m v="parking" zoom-min="15">
<area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
<symbol src="assets:symbols/transport/parking.svg" />
<m zoom-min="17">
<symbol src="assets:symbols/transport/parking.svg" />
</m>
</m>
<m closed="yes" v="fountain">
<area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
Expand Down Expand Up @@ -527,14 +529,14 @@
<m zoom-min="12">
<area fill="#e8ecde" />
</m>
<m zoom-min="12">
<caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
stroke="#ffffff" stroke-width="2.0" />
</m>
<m zoom-max="11">
<caption dy="18" fill="#000000" k="ref" priority="5" size="19" stroke="#ffffff"
stroke-width="2.0" />
</m>
<m zoom-min="12">
<caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
stroke="#ffffff" stroke-width="2.0" />
</m>
<symbol src="assets:symbols/transport/airport.svg" />
</m>
<!-- A place where planes are parked -->
Expand Down Expand Up @@ -568,7 +570,7 @@
<m zoom-min="17">
<caption style="bold" fill="#4040ff" k="name" priority="9" size="14"
stroke="#ffffff" stroke-width="2.0" />
<caption style="bold" fill="#606060" k="addr:housenumber" priority="10" size="16"
<caption style="bold" fill="#606060" k="addr:housenumber" priority="10" size="14"
stroke="#ffffff" stroke-width="2.0" />
</m>
</m>
Expand Down Expand Up @@ -992,7 +994,7 @@

<!-- house numbers -->
<m k="addr:housenumber" zoom-min="18">
<caption style="bold" fill="#606060" k="addr:housenumber" size="10" stroke="#ffffff"
<caption style="bold" fill="#606060" k="addr:housenumber" size="14" stroke="#ffffff"
stroke-width="2.0" />
</m>

Expand All @@ -1012,7 +1014,7 @@
stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="town">
<caption dy="14" fill="#000000" k="name" priority="2" size="19" stroke="#ffffff"
<caption fill="#000000" k="name" priority="2" size="19" stroke="#ffffff"
stroke-width="2.0" />
</m>
<m v="city">
Expand Down Expand Up @@ -1041,7 +1043,7 @@

<m v="halt|tram_stop">
<symbol src="assets:symbols/transport/train_station2.svg" />
<caption style="bold" dy="-15" fill="#ec2d2d" k="name" size="13" stroke="#ffffff"
<caption style="bold" dy="-15" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
stroke-width="2.0" />
</m>
<m v="level_crossing">
Expand Down
43 changes: 30 additions & 13 deletions vtm-themes/resources/assets/styles/newtron.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@
</m>
<m v="parking" zoom-min="14">
<area fill="#444434" stroke="#d4d4d4" stroke-width="0.2" />
<m zoom-min="17">
<symbol src="assets:symbols/transport/parking.svg" />
</m>
</m>

<m closed="yes" v="fountain">
Expand Down Expand Up @@ -331,6 +334,8 @@

<m k="natural" v="water">
<area use="water" />
<caption area-size="0.4" fill="#777744" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
<!--<line use="water:outline" width="0.5" fix="true" />-->
</m>

Expand Down Expand Up @@ -470,12 +475,23 @@

<!-- runways areas -->
<m k="aeroway">
<!-- <m v="aerodrome" closed="yes">
<area fill="#050008" />
</m>
<m v="apron">
<area fill="#050008" />
</m> -->
<m closed="yes" v="aerodrome">
<m zoom-min="12">
<area fill="#050008" />
</m>
<m zoom-max="11">
<caption dy="18" fill="#000000" k="ref" priority="5" size="19" stroke="#ffffff"
stroke-width="2.0" />
</m>
<m zoom-min="12">
<caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
stroke="#ffffff" stroke-width="2.0" />
</m>
<symbol src="assets:symbols/transport/airport.svg" />
</m>
<m v="apron">
<area fill="#050008" />
</m>
<!-- Airport passenger building -->
<m v="terminal|hangar">
<area use="building" />
Expand Down Expand Up @@ -503,8 +519,8 @@
<m zoom-min="17">
<caption style="bold" fill="#4040ff" k="name" priority="9" size="14"
stroke="#ffffff" stroke-width="2.0" />
<caption style="bold" fill="#606060" k="addr:housenumber" priority="10" size="10"
stroke="#ffffff" stroke-width="2.0" />
<caption style="bold" fill="#ffffff" k="addr:housenumber" priority="10" size="14"
stroke="#606060" stroke-width="2.0" />
</m>
</m>

Expand Down Expand Up @@ -992,7 +1008,7 @@
house numbers
<m k="addr:housenumber" zoom-min="18"> <caption
k="addr:housenumber" style="bold" size="10" fill="#606060" stroke="#ffffff"
k="addr:housenumber" style="bold" size="14" fill="#ffffff" stroke="#606060"
width="2.0" /> </m>
place
Expand Down Expand Up @@ -1025,7 +1041,7 @@
</m>
<m v="halt|tram_stop" zoom-min="17">
<symbol src="assets:symbols/transport/train_station2.svg" />
<caption k="name" dy="-15" style="bold" size="13" fill="#ec2d2d"
<caption k="name" dy="-15" style="bold" size="14" fill="#ec2d2d"
stroke="#ffffff" stroke-width="2.0" />
</m>
</m>
Expand All @@ -1043,7 +1059,7 @@
<m k="aeroway" v="helipad" zoom-min="17">
<symbol src="assets:symbols/transport/helicopter_pad.svg" />
</m>
<m k="aeroway" v="aerodrome|airport" zoom-max="13">
<m k="aeroway" v="aerodrome|airport" zoom-max="13" zoom-min="9">
<symbol src="assets:symbols/transport/airport.svg" />
</m>
</m>
Expand Down Expand Up @@ -1179,7 +1195,7 @@


<m k="addr:housenumber" zoom-min="18">
<caption style="bold" fill="#606060" k="addr:housenumber" size="10" stroke="#ffffff"
<caption style="bold" fill="#ffffff" k="addr:housenumber" size="14" stroke="#606060"
stroke-width="2.0" />
</m>

Expand Down Expand Up @@ -1217,6 +1233,7 @@


<m k="place" select="first">
<circle fill="#ff0000" radius="5.0" />
<m v="hamlet" zoom-min="13">
<caption style="bold" fill="#000000" k="name" size="13" stroke="#ffffff"
stroke-width="2.0" />
Expand Down Expand Up @@ -1255,7 +1272,7 @@
</m>
<m k="railway" v="halt|tram_stop" zoom-min="15">
<symbol src="assets:symbols/transport/train_station2.svg" />
<caption style="bold" dy="-15" fill="#ec2d2d" k="name" size="13" stroke="#ffffff"
<caption style="bold" dy="-15" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
stroke-width="2.0" />
</m>
</m>
Expand Down
24 changes: 19 additions & 5 deletions vtm-themes/resources/assets/styles/osmarender.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@

<m k="natural" v="water">
<area fill="#b5d6f1" />
<caption area-size="0.4" fill="#777744" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
</m>

<!--<m k="natural" v="coastline" closed="no">
Expand Down Expand Up @@ -412,7 +414,18 @@
<!-- runways casings and areas -->
<m k="aeroway">
<m closed="yes" v="aerodrome">
<area fill="#d8dcce" stroke="#b8acae" stroke-width="0.8" />
<m zoom-min="12">
<area fill="#d8dcce" stroke="#b8acae" stroke-width="0.8" />
</m>
<m zoom-max="11">
<caption dy="18" fill="#000000" k="ref" priority="5" size="19" stroke="#ffffff"
stroke-width="2.0" />
</m>
<m zoom-min="12">
<caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
stroke="#ffffff" stroke-width="2.0" />
</m>
<symbol src="assets:symbols/transport/airport.svg" />
</m>
<m v="apron">
<area fill="#f0f0f0" />
Expand Down Expand Up @@ -538,7 +551,7 @@

<m zoom-min="17">
<text priority="9" use="caption-small-blue" />
<caption style="bold" fill="#606060" k="addr:housenumber" priority="10" size="10"
<caption style="bold" fill="#606060" k="addr:housenumber" priority="10" size="14"
stroke="#ffffff" stroke-width="2.0" />
</m>
</m>
Expand Down Expand Up @@ -1067,7 +1080,7 @@
<m k="aeroway" v="helipad" zoom-min="17">
<symbol src="assets:symbols/transport/helicopter_pad.svg" />
</m>
<m k="aeroway" v="aerodrome|airport" zoom-max="13">
<m k="aeroway" v="aerodrome|airport" zoom-max="13" zoom-min="9">
<symbol src="assets:symbols/transport/airport.svg" />
</m>
</m>
Expand Down Expand Up @@ -1203,7 +1216,7 @@


<m k="addr:housenumber" zoom-min="18">
<caption style="bold" fill="#606060" k="addr:housenumber" size="10" stroke="#ffffff"
<caption style="bold" fill="#606060" k="addr:housenumber" size="14" stroke="#ffffff"
stroke-width="2.0" />
</m>

Expand Down Expand Up @@ -1244,6 +1257,7 @@


<m k="place" select="first">
<circle fill="#ff0000" radius="5.0" />
<m v="hamlet" zoom-min="13">
<caption style="bold" fill="#000000" k="name" size="13" stroke="#ffffff"
stroke-width="2.0" />
Expand Down Expand Up @@ -1282,7 +1296,7 @@
</m>
<m k="railway" v="halt|tram_stop" zoom-min="15">
<symbol src="assets:symbols/transport/train_station2.svg" />
<caption style="bold" dy="-15" fill="#ec2d2d" k="name" size="13" stroke="#ffffff"
<caption style="bold" dy="-15" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
stroke-width="2.0" />
</m>
</m>
Expand Down
43 changes: 30 additions & 13 deletions vtm-themes/resources/assets/styles/tronrender.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@
</m>
<m v="parking" zoom-min="14">
<area fill="#444434" stroke="#d4d4d4" stroke-width="0.2" />
<m zoom-min="17">
<symbol src="assets:symbols/transport/parking.svg" />
</m>
</m>

<m closed="yes" v="fountain">
Expand Down Expand Up @@ -331,6 +334,8 @@

<m k="natural" v="water">
<area use="water" />
<caption area-size="0.4" fill="#777744" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
<!--<line use="water:outline" width="0.5" fix="true" />-->
</m>

Expand Down Expand Up @@ -470,12 +475,23 @@

<!-- runways areas -->
<m k="aeroway">
<!-- <m v="aerodrome" closed="yes">
<area fill="#050008" />
</m>
<m v="apron">
<area fill="#050008" />
</m> -->
<m closed="yes" v="aerodrome">
<m zoom-min="12">
<area fill="#050008" />
</m>
<m zoom-max="11">
<caption dy="18" fill="#000000" k="ref" priority="5" size="19" stroke="#ffffff"
stroke-width="2.0" />
</m>
<m zoom-min="12">
<caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
stroke="#ffffff" stroke-width="2.0" />
</m>
<symbol src="assets:symbols/transport/airport.svg" />
</m>
<m v="apron">
<area fill="#050008" />
</m>
<!-- Airport passenger building -->
<m v="terminal|hangar">
<area use="building" />
Expand Down Expand Up @@ -503,8 +519,8 @@
<m zoom-min="17">
<caption style="bold" fill="#4040ff" k="name" priority="9" size="14"
stroke="#ffffff" stroke-width="2.0" />
<caption style="bold" fill="#606060" k="addr:housenumber" priority="10" size="10"
stroke="#ffffff" stroke-width="2.0" />
<caption style="bold" fill="#ffffff" k="addr:housenumber" priority="10" size="14"
stroke="#606060" stroke-width="2.0" />
</m>
</m>

Expand Down Expand Up @@ -985,7 +1001,7 @@
house numbers
<m k="addr:housenumber" zoom-min="18"> <caption
k="addr:housenumber" style="bold" size="10" fill="#606060" stroke="#ffffff"
k="addr:housenumber" style="bold" size="14" fill="#ffffff" stroke="#606060"
width="2.0" /> </m>
place
Expand Down Expand Up @@ -1018,7 +1034,7 @@
</m>
<m v="halt|tram_stop" zoom-min="17">
<symbol src="assets:symbols/transport/train_station2.svg" />
<caption k="name" dy="-15" style="bold" size="13" fill="#ec2d2d"
<caption k="name" dy="-15" style="bold" size="14" fill="#ec2d2d"
stroke="#ffffff" stroke-width="2.0" />
</m>
</m>
Expand All @@ -1036,7 +1052,7 @@
<m k="aeroway" v="helipad" zoom-min="17">
<symbol src="assets:symbols/transport/helicopter_pad.svg" />
</m>
<m k="aeroway" v="aerodrome|airport" zoom-max="13">
<m k="aeroway" v="aerodrome|airport" zoom-max="13" zoom-min="9">
<symbol src="assets:symbols/transport/airport.svg" />
</m>
</m>
Expand Down Expand Up @@ -1172,7 +1188,7 @@


<m k="addr:housenumber" zoom-min="18">
<caption style="bold" fill="#606060" k="addr:housenumber" size="10" stroke="#ffffff"
<caption style="bold" fill="#ffffff" k="addr:housenumber" size="14" stroke="#606060"
stroke-width="2.0" />
</m>

Expand Down Expand Up @@ -1212,6 +1228,7 @@


<m k="place" select="first">
<circle fill="#ff0000" radius="5.0" />
<m v="hamlet" zoom-min="13">
<caption style="bold" fill="#000000" k="name" size="13" stroke="#ffffff"
stroke-width="2.0" />
Expand Down Expand Up @@ -1250,7 +1267,7 @@
</m>
<m k="railway" v="halt|tram_stop" zoom-min="15">
<symbol src="assets:symbols/transport/train_station2.svg" />
<caption style="bold" dy="-15" fill="#ec2d2d" k="name" size="13" stroke="#ffffff"
<caption style="bold" dy="-15" fill="#ec2d2d" k="name" size="14" stroke="#ffffff"
stroke-width="2.0" />
</m>
</m>
Expand Down

0 comments on commit a9283dd

Please sign in to comment.