Internal render theme improvements (#488)

This commit is contained in:
Gustl22
2018-01-21 23:01:48 +01:00
committed by Emux
parent aa623f81db
commit 8e35a178d2
26 changed files with 2033 additions and 1287 deletions

View File

@@ -3,29 +3,51 @@
map-background="#fffcfa" version="1" xmlns="http://opensciencemap.org/rendertheme"
xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
<!-- base style for fixed width lines -->
<style-line cap="butt" fix="true" id="fix" width="1.0" />
<!--###### TEXT styles ######-->
<!--default label-->
<style-text caption="true" dy="20" fill="#2d51bc" font-family="medium" id="caption-small-blue"
k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
<!--shop-->
<style-text caption="true" dy="20" fill="#ac39ac" font-family="medium" id="shop" k="name"
size="14" stroke="#ffffff" stroke-width="2.0" />
<!--tavern-->
<style-text caption="true" dy="20" fill="#734a08" font-family="medium" id="tavern" k="name"
size="14" stroke="#ffffff" stroke-width="2.0" />
<!--accommodation-->
<style-text caption="true" dy="20" fill="#0092da" font-family="medium" id="accommodation"
k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
<!--education-->
<style-text caption="true" dy="20" fill="#0a4f0a" font-family="medium" id="education" k="name"
size="14" stroke="#ffffff" stroke-width="2.0" />
<!--health-->
<style-text caption="true" dy="20" fill="#da0092" font-family="medium" id="health" k="name"
size="14" stroke="#ffffff" stroke-width="2.0" />
<!--entertainment-->
<style-text caption="true" dy="20" fill="#b7650c" font-family="medium" id="entertainment"
k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
<!--roads-->
<style-text fill="#101010" id="road" k="name" priority="2" size="16" stroke="#eeeeee"
stroke-width="2.0" />
<!--major roads-->
<style-text style="bold" fill="#101010" id="major-road" k="name" priority="1" size="16"
stroke="#eeeeee" stroke-width="2.0" />
<style-text caption="true" dy="16" fill="#777744" id="poi" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
<!--###### AREA styles ######-->
<!--residential-->
<style-area fade="11" fill="#e8e7e3" id="residential" />
<!--railway-->
<style-area fade="10" fill="#e6e3e5" id="railway|industrial" />
<!--wood-->
<!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
<!-- src="textures/wood.png" -->
<!-- <style-area id="wood" fill="#d1dbc7" fade="8" blend="11" blend-fill="#9ac56e" /> -->
<style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
<!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
<!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" stroke="#d1dbc7" stroke-width="1.0"/> -->
<style-area id="tex1" src="textures/rough.png" />
@@ -38,34 +60,47 @@
<!-- grassland|scrub -->
<style-area fade="10" fill="#c2cba5" id="darkgreen" use="tex1" />
<!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
<!--farmland-->
<style-area fade="12" fill="#e4dab5" id="farmland" stroke="#d1dbc7" stroke-width="1.0"
use="tex1" />
<!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
<!-- marsh|wetland|mud|nature_reserve -->
<style-area fade="12" fill="#deecb9" id="greens2" />
<!-- park|common|green|cemetery|golf_course|dog_park -->
<style-area fade="11" fill="#9ac56e" id="park" use="tex1" />
<!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" stroke="#d1dbc7" stroke-width="1.0"/> -->
<style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
<!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
<!-- <style-area id="park" fill="#a3ca7b" fade="11" /> -->
<style-line cap="butt" fade="14" fix="true" id="park" stroke="#9ac56e" width="1.0" />
<!-- de:Kleingartengebiet -->
<style-area fade="12" fill="#efeae0" id="allotments" use="tex1" />
<!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
<style-area fade="10" fill="#ddddcc" id="quarry" />
<!--military-->
<style-area fade="10" fill="#eeedea" id="military" />
<!--building-->
<style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
<!--<style-area id="building" fill="#e9e6e3" fade="15"/>-->
<!--water-->
<!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
<!-- src="textures/water.png" -->
<style-area fade="-1" fill="#99badf" id="water" use="tex1" />
<!--###### LINE styles ######-->
<!-- base style for fixed width lines -->
<style-line cap="butt" fix="true" id="fix" width="1.0" />
<!--residential-->
<style-line id="residential" stroke="#ffffff" width="1.3" />
<style-line cap="butt" id="residential:bridge" use="residential" />
<!-- when inheriting another style with 'from' then 'witdth' is relative to the parent -->
<!-- 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="butt" id="pedestrian:bridge" use="pedestrian" />
<style-line id="highway:z11" stroke="#fcba5a" width="1.8" />
@@ -88,31 +123,31 @@
<!-- <style-line id="footway:z16" use="footway" width="-0.95" fixed="false" fade="-1"/> -->
<style-line id="footway:z17" stroke="#faf8f5" width="0.3" />
<!-- de: ein Weg der für Reiter vorgeshen ist.. -->
<!-- de: ein Weg der für Reiter vorgesehen ist.. -->
<style-line cap="butt" id="bridleway" stipple-stroke="#837b58" stroke="#d3cb98" use="footway"
width="0.1" />
<style-line cap="butt" fix="true" id="steps" stipple="2" stipple-stroke="#be6253"
stipple-width="1.0" stroke="#aaffffff" width="4.2" />
<style-line cap="butt" fix="true" id="water:outline" stroke="#a4bbcc" width="1.0" />
<style-line cap="butt" fix="true" id="water" stroke="#a4bbcc" width="1.0" />
<style-line fix="false" id="river" stroke="#a4bbcc" use="water" />
<!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
<!-- src="textures/water.png" -->
<style-area fade="-1" fill="#99badf" id="water" use="tex1" />
<!-- no-go area boundary -->
<style-line cap="butt" fix="true" id="fence" stroke="#444444" width="1.2" />
<style-line cap="butt" id="aeroway:runway" stroke="#c8ccbe" width="1.8" />
<!--park-->
<style-line cap="butt" fade="14" fix="true" id="park" stroke="#9ac56e" width="1.0" />
<!--building-->
<!-- <style-line id="building" stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/> -->
<!-- <style-line id="building" stroke="#d0cec8" width="1.0" fix="true" cap="butt" fade="15"/>
<style-area id="building" fill="#e9e6e3" fade="15"/> -->
<!-- <style-line id="building" stroke="#d0cec8" width="1.0" fix="true" cap="butt" fade="15"/> -->
<style-line fade="15" id="building" stroke="#eeb7b6b3" use="fix" />
<style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
<!--water-->
<style-line cap="butt" fix="true" id="water" stroke="#a4bbcc" width="1.0" />
<style-line fix="false" id="river" stroke="#a4bbcc" use="water" />
<!--###### ASSIGNMENT ######-->
<atlas img="atlas/osm.png">
<rect id="airport" pos="1 40 16 16" />
@@ -121,7 +156,7 @@
<rect id="cafe" pos="67 88 16 16" />
<rect id="camping" pos="71 110 16 16" />
<rect id="cinema" pos="1 102 24 24" />
<rect id="city" pos="55 11 10 10" />
<rect id="city" pos="55 11 10 10" /> <!--used as dot-->
<rect id="department_store" pos="67 70 16 16" />
<rect id="fast_food" pos="67 52 16 16" />
<rect id="florist" pos="67 34 16 16" />
@@ -592,10 +627,14 @@
<m zoom-min="17">
<extrusion line-color="#ffd9d8d6" side-color="#eaecebe9" top-color="#eaf9f8f6" />
</m>
<m zoom-min="17">
<text priority="9" use="caption-small-blue" />
<caption style="bold" fill="#606060" font-family="condensed" k="addr:housenumber"
size="10" stroke="#ffffff" stroke-width="2.0" />
<!--Only add house numbers where no name exist-->
<m k="addr:housenumber" zoom-min="17">
<m k="name" v="~">
<caption style="bold" fill="#606060" font-family="condensed"
k="addr:housenumber" priority="10" size="10" stroke="#ffffff"
stroke-width="2.0" />
</m>
</m>
</m>
@@ -947,11 +986,11 @@
<m k="admin_level">
<m k="admin_level" v="4">
<line fix="true" stipple="4" stipple-stroke="#888888" stipple-width="1.0"
stroke="#dadada" width="1.3" />
stroke="#dadada" width="2.0" />
</m>
<m k="admin_level" v="2">
<line fix="true" stipple="6" stipple-stroke="#647b9c" stipple-width="1.0"
stroke="#dadada" width="1.6" />
stroke="#bbbbbb" width="2.5" />
</m>
</m>
<!-- </m> -->
@@ -976,35 +1015,167 @@
</m><!-- end e="way" -->
<m e="node" select="first">
<!--All POIs and WAYs with names-->
<m k="name" select="first">
<m k="barrier">
<m zoom-min="10">
<m v="bollard">
<circle fill="#909090" radius="1.5" />
</m>
<m v="block">
<circle fill="#909090" radius="1.5" />
</m>
<m v="gate">
<circle fill="#909090" radius="1.5" />
</m>
<m v="lift_gate">
<circle fill="#909090" radius="1.5" />
</m>
<!-- aeroway -->
<m k="aeroway">
<m v="helipad" zoom-min="16">
<symbol src="heliport" />
</m>
<m v="aerodrome|airport" zoom-min="9">
<symbol src="airport" />
</m>
<m k="name" zoom-min="16">
<text use="caption-small-blue" />
</m>
</m>
<m k="highway">
<m v="traffic_signals">
<circle fill="#ff0000" radius="1.5" />
<m k="amenity">
<m select="first">
<!--<m v="bench" zoom-min="17">
<symbol src="assets:symbols/bench.svg" />
</m>-->
<m v="drinking_water" zoom-min="17">
<!--<symbol src="drinking_water" />-->
</m>
<m v="fire_station" zoom-min="17">
<!--<symbol src="fire_station" />-->
</m>
<m v="place_of_worship" zoom-min="17">
<m k="denomination|religion" v="jewish">
<symbol src="synagogue" />
</m>
<m k="denomination|religion" v="muslim|moslem">
<symbol src="mosque" />
</m>
<m k="denomination|religion" v="christian">
<symbol src="church" />
</m>
</m>
<m v="post_box" zoom-min="17">
<!--<symbol src="postbox" />-->
</m>
<m v="recycling" zoom-min="17">
<!--<symbol src="recycling" />-->
</m>
<m v="shelter" zoom-min="17">
<symbol src="shelter" />
</m>
<m v="telephone" zoom-min="17">
<symbol src="telephone" />
</m>
<m v="toilets" zoom-min="17">
<symbol src="toilets" />
</m>
<m select="when-matched" zoom-min="17">
<text priority="9" use="caption-small-blue" />
</m>
</m>
<m v="bus_stop">
<circle fill="#ff0000" radius="1.5" />
<m select="first"> <!--Accomodation-->
<m v="parking" zoom-min="17">
<symbol src="parking" />
</m>
<m v="bicycle_rental" zoom-min="17">
<symbol src="bicycle_rental" />
</m>
<m v="bus_station" zoom-min="17">
<symbol src="bus_station" />
</m>
<m select="when-matched" zoom-min="17">
<text priority="9" use="accommodation" />
</m>
</m>
<m v="turning_circle">
<circle fill="#ffffff" radius="1.4" scale-radius="true" />
<m select="first"> <!--Education-->
<m v="kindergarten" zoom-min="17">
<!--<symbol src="kindergarten" />-->
</m>
<m v="library" zoom-min="17">
<symbol src="library" />
</m>
<m v="school" zoom-min="17">
<symbol src="school" />
</m>
<m v="university|college" zoom-min="17">
<!--<symbol src="university" />-->
</m>
<m select="when-matched" zoom-min="17">
<text priority="9" use="education" />
</m>
</m>
<m select="first"> <!--Entertainment-->
<m v="cinema" zoom-min="17">
<symbol src="cinema" />
</m>
<m v="fountain" zoom-min="17">
<!--<symbol src="fountain" />-->
</m>
<m v="theatre" zoom-min="17">
<symbol src="theatre" />
</m>
<m select="when-matched" zoom-min="17">
<text priority="9" use="entertainment" />
</m>
</m>
<m select="first"> <!--Health-->
<m v="hospital" zoom-min="15">
<symbol src="hospital" />
</m>
<m v="pharmacy" zoom-min="17">
<symbol src="pharmacy" />
</m>
<m select="when-matched" zoom-min="17">
<text priority="9" use="health" />
</m>
</m>
<m select="first"> <!--Shop-->
<m v="atm" zoom-min="17">
<symbol src="atm" />
</m>
<m v="bank" zoom-min="17">
<!--<symbol src="bank" />-->
</m>
<m v="fuel" zoom-min="17">
<!--<symbol src="fuel" />-->
</m>
<m v="post_office" zoom-min="17">
<!--<symbol src="post_office" />-->
</m>
<m select="when-matched" zoom-min="17">
<text priority="9" use="shop" />
</m>
</m>
<m select="first"> <!--Tavern-->
<m v="cafe" zoom-min="17">
<symbol src="cafe" />
</m>
<m v="bar" zoom-min="17">
<symbol src="bar" />
</m>
<m v="fast_food" zoom-min="17">
<symbol src="fast_food" />
</m>
<m v="pub" zoom-min="17">
<symbol src="pub" />
</m>
<m v="restaurant" zoom-min="17">
<symbol src="restaurant" />
</m>
<m select="when-matched" zoom-min="17">
<text priority="9" use="tavern" />
</m>
</m>
<!--Style all missed amenities-->
<!--<m select="when-missed" zoom-min="17">-->
<!--<text use="caption-small-blue" />-->
<!--</m>-->
</m>
<!-- historic -->
@@ -1055,183 +1226,36 @@
<!-- railway -->
<m k="railway">
<m v="station" zoom-min="14">
<circle fill="#af3a3a" radius="6" stroke="#606060" stroke-width="1.5" />
<!--<circle fill="#af3a3a" radius="6" stroke="#606060" stroke-width="1.5" />-->
<caption style="bold" dy="15" fill="#af3a3a" k="name" size="14" stroke="#ffffff"
stroke-width="2.0" />
</m>
<m v="halt|tram_stop">
<circle fill="#af3a3a" radius="4" stroke="#606060" stroke-width="1.5" />
<!--<circle fill="#af3a3a" radius="4" stroke="#606060" stroke-width="1.5" />-->
<caption style="bold" dy="10" fill="#af3a3a" k="name" size="12" stroke="#ffffff"
stroke-width="2.0" />
</m>
<m v="level_crossing">
<circle fill="#ff0000" radius="1.5" />
</m>
</m>
<!-- aeroway -->
<m k="aeroway">
<m k="aeroway" v="helipad" zoom-min="16">
<symbol src="heliport" />
<m k="shop" select="first">
<m v="bakery" zoom-min="15">
<symbol src="shop_bakery" />
</m>
<m k="aeroway" v="aerodrome|airport">
<symbol src="airport" />
<m v="florist" zoom-min="15">
<symbol src="florist" />
</m>
</m>
<m k="amenity">
<m select="first" zoom-min="15">
<m v="hospital">
<symbol src="hospital" />
</m>
<m k="amenity" v="school">
<symbol src="school" />
</m>
<m k="amenity" v="university|college">
<symbol src="university" />
</m>
<m k="amenity" v="library">
<symbol src="library" />
</m>
<m k="amenity" v="cinema">
<symbol src="cinema" />
</m>
<m select="when-matched">
<text use="poi" />
</m>
<m v="hairdresser" zoom-min="16">
<symbol src="shop_hairdresser" />
</m>
<m select="first" zoom-min="16">
<m v="atm" zoom-min="17">
<symbol src="atm" />
</m>
<m v="cafe">
<symbol src="cafe" />
</m>
<m v="pub">
<symbol src="pub" />
</m>
<m v="bar">
<symbol src="bar" />
</m>
<m v="fast_food">
<symbol src="fast_food" />
</m>
<m v="restaurant">
<symbol src="restaurant" />
</m>
<m k="amenity" v="bus_station">
<symbol src="bus_station" />
</m>
<m select="when-matched">
<text use="poi" />
</m>
<m v="supermarket|organic" zoom-min="15">
<symbol src="shop_supermarket" />
</m>
<m select="first" zoom-min="17">
<m k="amenity" v="bank">
<symbol src="bank" />
</m>
<m k="amenity" v="bench">
<symbol src="bench" />
</m>
<m k="amenity" v="bicycle_rental">
<symbol src="bicycle_rental" />
</m>
<m k="amenity" v="drinking_water">
<symbol src="drinking_water" />
</m>
<m k="amenity" v="fire_station">
<symbol src="fire_station" />
</m>
<m k="amenity" v="fountain">
<symbol src="fountain" />
</m>
<m k="amenity" v="fuel">
<symbol src="petrolStation" />
</m>
<m k="amenity" v="kindergarten">
<symbol src="kindergarten" />
</m>
<m k="amenity" v="parking">
<symbol src="parking" />
</m>
<m k="amenity" v="pharmacy">
<symbol src="pharmacy" />
</m>
<m k="amenity" v="place_of_worship">
<m k="denomination|religion" v="jewish">
<symbol src="synagogue" />
</m>
<m k="denomination|religion" v="muslim|moslem">
<symbol src="mosque" />
</m>
<m k="denomination|religion" v="christian">
<symbol src="church" />
</m>
</m>
<m k="amenity" v="post_box">
<symbol src="postbox" />
</m>
<m k="amenity" v="post_office">
<symbol src="postoffice" />
</m>
<m k="amenity" v="recycling">
<symbol src="recycling" />
</m>
<m k="amenity" v="shelter">
<symbol src="shelter" />
</m>
<m k="amenity" v="telephone">
<symbol src="telephone" />
</m>
<m k="amenity" v="theatre">
<symbol src="theatre" />
</m>
<m select="when-matched">
<text use="poi" />
</m>
</m>
<m zoom-min="17">
<m k="amenity" v="toilets">
<symbol src="toilets" />
</m>
<symbol src="city" />
</m>
<m zoom-min="15">
<text use="caption-small-blue" />
</m>
</m>
<m k="shop">
<m select="first" zoom-min="15">
<m v="bakery">
<symbol src="shop_bakery" />
</m>
<m v="florist">
<symbol src="florist" />
</m>
<m v="hairdresser" zoom-min="16">
<symbol src="shop_hairdresser" />
</m>
<m v="supermarket|organic">
<symbol src="shop_supermarket" />
</m>
<m zoom-min="17">
<symbol src="city" />
</m>
<m select="when-matched" zoom-min="17">
<text use="poi" />
</m>
</m>
<m zoom-min="15">
<text use="caption-small-blue" />
<m select="when-matched" zoom-min="17">
<text priority="9" use="shop" />
</m>
</m>
@@ -1249,39 +1273,96 @@
<m v="hotel">
<symbol src="hotel" />
</m>
<m select="when-matched">
<text use="poi" />
<text priority="8" use="accommodation" />
</m>
</m>
<!-- <m zoom-min="16" select="first">
<m v="information" select="first">
<m k="name">
<!-- <m v="information" zoom-min="17">
<m k="name" v="*">
<symbol src="information" />
<text use="poi" />
</m>
<m>
<circle r="1.5" fill="#ff0000" />
</m>
</m>
</m>
-->
<m v="viewpoint">
<symbol src="view_point" />
</m>-->
<m select="first" zoom-min="15">
<m v="attraction">
<symbol src="city" />
</m>
<m v="museum">
<symbol src="museum" />
</m>
<m v="viewpoint">
<symbol src="view_point" />
</m>
<m select="when-matched">
<text priority="8" use="entertainment" />
</m>
</m>
<m v="museum">
<symbol src="museum" />
</m>
<m zoom-min="15">
<text use="caption-small-blue" />
</m>
</m>
<m k="natural" v="tree" zoom-min="15">
<circle radius="10" />
</m>
</m>
</rendertheme>
<!--<m e="node" select="first">-->
<!--<m k="barrier">-->
<!--<m zoom-min="10">-->
<!--<m v="bollard">-->
<!--<circle fill="#909090" radius="1.5" />-->
<!--</m>-->
<!--<m v="block">-->
<!--<circle fill="#909090" radius="1.5" />-->
<!--</m>-->
<!--<m v="gate">-->
<!--<circle fill="#909090" radius="1.5" />-->
<!--</m>-->
<!--<m v="lift_gate">-->
<!--<circle fill="#909090" radius="1.5" />-->
<!--</m>-->
<!--</m>-->
<!--</m>-->
<!--<m k="highway">-->
<!--<m v="traffic_signals">-->
<!--<circle fill="#ff0000" radius="1.5" />-->
<!--</m>-->
<!--<m v="bus_stop">-->
<!--<circle fill="#ff0000" radius="1.5" />-->
<!--</m>-->
<!--<m v="turning_circle">-->
<!--<circle fill="#ffffff" radius="1.4" scale-radius="true" />-->
<!--</m>-->
<!--</m>-->
<!--<m k="natural">-->
<!--<m select="first">-->
<!--<m k="natural" v="tree" zoom-min="15">-->
<!--<circle radius="10" />-->
<!--</m>-->
<!--<m v="cave_entrance" zoom-min="15">-->
<!--<symbol src="assets:symbols/poi/cave.svg" />-->
<!--<m zoom-min="17">-->
<!--<text use="caption-small-blue" />-->
<!--</m>-->
<!--</m>-->
<!--<m v="peak" zoom-min="12">-->
<!--<symbol src="assets:symbols/peak.svg" />-->
<!--<caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"-->
<!--stroke-width="2.0" />-->
<!--<caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"-->
<!--stroke-width="2.0" />-->
<!--</m>-->
<!--<m v="volcano" zoom-min="12">-->
<!--<symbol src="assets:symbols/volcano.svg" />-->
<!--<caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"-->
<!--stroke-width="2.0" />-->
<!--<caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"-->
<!--stroke-width="2.0" />-->
<!--</m>-->
<!--</m>-->
<!--</m>-->
<!--<m k="railway">-->
<!--<m v="level_crossing">-->
<!--<circle fill="#ff0000" radius="1.5" />-->
<!--</m>-->
<!--</m>-->
<!--</m>-->
</rendertheme>