Skip to content

Commit

Permalink
change railways rendering (funicular, narrow_gauge, preserved)
Browse files Browse the repository at this point in the history 
fix some patterns
delete unused PNG icons
new icons (memorial, bus stop on low zoom)
...
  • Loading branch information
@kaylesk
kaylesk committed May 19, 2017
1 parent f4419f7 commit 35eab6e
Show file tree
Hide file tree
Showing 18 changed files with 166 additions and 35 deletions.
35 changes: 27 additions & 8 deletions client/freemap_slovakia/freemap_slovakia.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@
</rule>

<rule e="way" k="addr:housenumber" v="*" zoom-min="18">
<caption k="addr:housenumber" font-style="bold" font-size="7dp" fill="#000000" stroke="#ffffff" stroke-width="1.2dp"/>
<rule e="way" k="highway" v="~">
<caption k="addr:housenumber" font-style="bold" font-size="7dp" fill="#000000" stroke="#ffffff" stroke-width="1.2dp"/>
</rule>
</rule>
<!-- nodes -->
<rule e="node" k="*" v="*">
Expand Down Expand Up @@ -248,8 +250,13 @@
</rule>
<!-- highway -->
<rule e="node" k="highway" v="*">
<rule e="node" k="highway" v="bus_stop" zoom-min="16">
<symbol src="file:/symbols/bus.png" symbol-width="12dp"/>
<rule e="node" k="highway" v="bus_stop" zoom-min="15">
<rule e="node" k="*" v="*" zoom-max="16">
<symbol src="file:/symbols/bus-mini.png" symbol-width="4dp"/>
</rule>
<rule e="node" k="*" v="*" zoom-min="17">
<symbol src="file:/symbols/bus.png" symbol-width="12dp"/>
</rule>
</rule>
<rule e="node" k="highway" v="traffic_signals" zoom-min="17">
<symbol src="file:/symbols/traffic_signal.png" symbol-width="6dp"/>
Expand All @@ -262,15 +269,22 @@
<rule e="node" k="historic" v="wayside_cross" zoom-min="16">
<symbol src="file:/symbols/wayside_cross.svg" symbol-width="12dp"/>
</rule>
<rule e="node" k="historic" v="*">
<circle r="3" fill="#4040ff" stroke="#606060" stroke-width="1.5dp"/>
<rule e="node" k="historic" v="memorial|monument">
<rule e="node" k="historic" v="memorial">
<symbol src="file:/symbols/memorial.svg" symbol-width="14dp"/>
</rule>
<rule e="node" k="historic" v="monument">
<circle r="3" fill="#4040ff" stroke="#606060" stroke-width="1.5dp"/>
</rule>
<rule e="node" k="*" v="*" zoom-min="17">
<caption k="name" dy="-10dp" font-style="bold" font-size="10dp" fill="#4040ff" stroke="#ffffff" stroke-width="2.0dp"/>
<caption k="name" dy="-10dp" font-style="bold" font-size="10dp" fill="#660000" stroke="#ffffff" stroke-width="2.0dp"/>
</rule>
</rule>
<!-- house numbers -->
<rule e="node" k="addr:housenumber" v="*" zoom-min="18">
<caption k="addr:housenumber" font-style="bold" font-size="7dp" fill="#000000" stroke="#ffffff" stroke-width="1.2dp"/>
<rule e="node" k="information" v="~">
<caption k="addr:housenumber" font-style="bold" font-size="7dp" fill="#000000" stroke="#ffffff" stroke-width="1.2dp"/>
</rule>
</rule>

<!-- leisure -->
Expand Down Expand Up @@ -318,7 +332,12 @@
<rule e="way" k="power" v="*">
<rule e="way" k="power" v="line" zoom-min="13">
<line stroke="#80000000" stroke-width="0.2dp"/>
<lineSymbol src="file:/symbols/way_powerline.svg" align-center="true" repeat="true" symbol-width="16dp" repeat-gap="35dp"/>
<rule e="way" k="*" v="*" zoom-min="14" zoom-max="16">
<lineSymbol src="file:/symbols/way_powerline.svg" align-center="true" repeat="true" symbol-width="12dp" repeat-gap="50dp"/>
</rule>
<rule e="way" k="*" v="*" zoom-min="17">
<lineSymbol src="file:/symbols/way_powerline.svg" align-center="true" repeat="true" symbol-width="16dp" repeat-gap="35dp"/>
</rule>
</rule>
<!--
<rule e="way" k="power" v="minor_line" zoom-min="17">
Expand Down
3 changes: 3 additions & 0 deletions client/freemap_slovakia/marked_trails.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@
<xsl:template name="markedTrailsAllNew">
<!-- turistika nová -->
<rule cat="hiking" e="way" k="highway" v="*" zoom-min="11">
<rule e="way" k="addr:housenumber" v="*" zoom-min="16">
<pathText k="addr:housenumber" dy="10dp" font-style="bold" font-size="9dp" fill="#000000" stroke="#ffffff" stroke-width="2.2dp"/>
</rule>
<xsl:call-template name="markedTrailsDual">
<xsl:with-param name="redKey" select="'fmrelhikingred'"/>
<xsl:with-param name="blueKey" select="'fmrelhikingblue'"/>
Expand Down
2 changes: 1 addition & 1 deletion client/freemap_slovakia/naturals.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<rule e="node" k="natural" v="cave_entrance" zoom-min="14">
<symbol src="file:/symbols/cave_entrance.png" symbol-width="16dp" force-draw="1"/>
<rule e="node" k="*" v="*" zoom-min="16">
<caption k="name" dy="12dp" font-style="bold" font-family="serif" font-size="8dp" fill="#000000" stroke="#ffffff" stroke-width="2dp"/>
<caption k="name" dy="14dp" font-style="bold" font-family="serif" font-size="8dp" fill="#000000" stroke="#ffffff" stroke-width="2dp" force-draw="1"/>
</rule>
</rule>
<rule e="node" k="natural" v="spring" zoom-min="14">
Expand Down
Binary file modified client/freemap_slovakia/patterns/access-destination.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/freemap_slovakia/patterns/access-private.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/freemap_slovakia/patterns/cemetery.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/freemap_slovakia/patterns/marsh.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/freemap_slovakia/patterns/military.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions client/freemap_slovakia/places.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<rule e="node" k="place" v="town" zoom-min="11" zoom-max="15">
<caption k="name" font-style="bold" font-size="14dp" fill="#000000" stroke="#ffffff" stroke-width="2dp"/>
</rule>
<rule e="node" k="place" v="suburb" zoom-min="12" zoom-max="16">
<rule e="node" k="place" v="suburb" zoom-min="14" zoom-max="16">
<caption k="name" font-style="bold" font-size="12dp" fill="#6C6C6C" stroke="#ffffff" stroke-width="2dp"/>
</rule>
<rule e="node" k="place" v="village" zoom-min="11" zoom-max="12">
<rule e="node" k="place" v="village" zoom-min="12" zoom-max="12">
<caption k="name" font-style="normal" font-size="7dp" fill="#000000" stroke="#ffffff" stroke-width="2dp"/>
</rule>
<rule e="node" k="place" v="village" zoom-min="13" zoom-max="18">
Expand Down
52 changes: 38 additions & 14 deletions client/freemap_slovakia/railways.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
<!-- railway casings and cores -->
<rule e="way" k="railway" v="tram" zoom-min="12">
<line stroke="#e6b7e6" stroke-width="0.25dp" stroke-linecap="butt"/>
<line stroke="#4c0f4c" stroke-width="0.25dp" stroke-dasharray="12,18" stroke-linecap="butt"/>
<rule e="way" k="*" v="*" max-zoom="16">
<line stroke="#4c0f4c" stroke-width="0.25dp" stroke-dasharray="12,18" stroke-linecap="butt"/>
</rule>
<rule e="way" k="*" v="*" min-zoom="17">
<line stroke="#4c0f4c" stroke-width="0.25dp" stroke-dasharray="8,12" stroke-linecap="butt"/>
</rule>
</rule>
<rule e="way" k="railway" v="subway" zoom-min="12">
<line stroke="#0f0f4c" stroke-width="0.4dp" stroke-linecap="butt"/>
Expand All @@ -35,25 +40,44 @@
<line stroke="#0f4c0f" stroke-width="0.25dp" stroke-dasharray="12,18" stroke-linecap="butt"/>
</rule>
<rule e="way" k="railway" v="narrow_gauge|funicular" zoom-min="12">
<line stroke="#333333" stroke-width="0.35dp" stroke-linecap="butt"/>
<line stroke="#e6e6e6" stroke-width="0.20dp" stroke-linecap="butt"/>
<line stroke="#333333" stroke-width="0.20dp" stroke-dasharray="8,8" stroke-linecap="butt"/>
<rule e="way" k="*" v="*" zoom-min="12" zoom-max="16">
<line stroke="#222222" stroke-width="0.6dp" stroke-linecap="butt"/>
<line stroke="#cccccc" stroke-width="0.5dp" stroke-linecap="butt"/>
<line stroke="#222222" stroke-width="0.5dp" stroke-dasharray="10,10" stroke-linecap="butt"/>
</rule>
<rule e="way" k="*" v="*" zoom-min="17">
<line stroke="#222222" stroke-width="0.45dp" stroke-linecap="butt"/>
<line stroke="#cccccc" stroke-width="0.3dp" stroke-linecap="butt"/>
<line stroke="#222222" stroke-width="0.3dp" stroke-dasharray="8,8" stroke-linecap="butt"/>
</rule>
</rule>
<rule e="way" k="railway" v="preserved" zoom-min="13">
<rule e="way" k="*" v="*" zoom-min="13" zoom-max="16">
<line stroke="#000000" stroke-width="0.6dp" stroke-linecap="butt"/>
<line stroke="#ffff99" stroke-width="0.4dp" stroke-linecap="butt"/>
<line stroke="#000000" stroke-width="0.4dp" stroke-dasharray="10,10" stroke-linecap="butt"/>
</rule>
<rule e="way" k="*" v="*" zoom-min="17">
<line stroke="#000000" stroke-width="0.45dp" stroke-linecap="butt"/>
<line stroke="#ffff99" stroke-width="0.3dp" stroke-linecap="butt"/>
<line stroke="#000000" stroke-width="0.3dp" stroke-dasharray="8,8" stroke-linecap="butt"/>
</rule>
</rule>
<rule e="way" k="railway" v="rail">
<rule e="way" k="service" v="~" zoom-max="16">
<line stroke="#333333" stroke-width="0.55dp" stroke-linecap="butt"/>
<line stroke="#e6e6e6" stroke-width="0.4dp" stroke-linecap="butt"/>
<line stroke="#333333" stroke-width="0.4dp" stroke-dasharray="15,15" stroke-linecap="butt"/>
<line stroke="#000000" stroke-width="0.6dp" stroke-linecap="butt"/>
<line stroke="#f2f2f2" stroke-width="0.5dp" stroke-linecap="butt"/>
<line stroke="#000000" stroke-width="0.5dp" stroke-dasharray="12,12" stroke-linecap="butt"/>
</rule>
<rule e="way" k="service" v="~" zoom-min="17">
<line stroke="#333333" stroke-width="0.35dp" stroke-linecap="butt"/>
<line stroke="#e6e6e6" stroke-width="0.25dp" stroke-linecap="butt"/>
<line stroke="#333333" stroke-width="0.25dp" stroke-dasharray="15,15" stroke-linecap="butt"/>
<line stroke="#000000" stroke-width="0.45dp" stroke-linecap="butt"/>
<line stroke="#f2f2f2" stroke-width="0.3dp" stroke-linecap="butt"/>
<line stroke="#000000" stroke-width="0.3dp" stroke-dasharray="10,10" stroke-linecap="butt"/>
</rule>
<rule e="way" k="service" v="*" zoom-min="15">
<line stroke="#333333" stroke-width="0.30dp" stroke-linecap="butt"/>
<line stroke="#e6e6e6" stroke-width="0.20dp" stroke-linecap="butt"/>
<line stroke="#333333" stroke-width="0.20dp" stroke-dasharray="10,10" stroke-linecap="butt"/>
<rule e="way" k="service" v="*" zoom-min="16">
<line stroke="#000000" stroke-width="0.30dp" stroke-linecap="butt"/>
<line stroke="#f2f2f2" stroke-width="0.20dp" stroke-linecap="butt"/>
<line stroke="#000000" stroke-width="0.20dp" stroke-dasharray="4,5" stroke-linecap="butt"/>
</rule>
</rule>
</rule>
Expand Down
Binary file added client/freemap_slovakia/symbols/bus-mini.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed client/freemap_slovakia/symbols/hunting_stand.png
View file
Binary file not shown.
46 changes: 46 additions & 0 deletions client/freemap_slovakia/symbols/memorial.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed client/freemap_slovakia/symbols/spring.png
View file
Binary file not shown.
7 changes: 4 additions & 3 deletions client/freemap_slovakia/tourism.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,16 @@
<rule e="node" k="tourism" v="wilderness_hut" zoom-min="15">
<symbol src="file:/symbols/wilderness_hut.svg" symbol-width="14dp" force-draw="1"/>
</rule>
<rule e="node" k="tourism" v="information" zoom-min="17">
<rule e="node" k="information" v="map|board" zoom-min="15">
<rule cat="topo_common" e="node" k="tourism" v="information" zoom-min="16">
<rule e="node" k="information" v="map|board">
<symbol src="file:/symbols/information.png" symbol-width="12dp"/>
<caption k="addr:housenumber" dy="15dp" font-style="bold" font-size="8dp" fill="#734a08" stroke="#ffffff" stroke-width="1.25dp"/>
</rule>
</rule>
<rule e="node" k="tourism" v="viewpoint" zoom-min="15">
<symbol src="file:/symbols/viewpoint.png" symbol-width="12dp"/>
</rule>
<rule cat="topo_common" e="node" k="amenity" v="feeding_place|game_feeding" zoom-min="15">
<rule cat="topo_common" e="node" k="amenity" v="feeding_place|game_feeding" zoom-min="15">
<symbol src="file:/symbols/feeding_place.svg" symbol-width="18dp"/>
</rule>
<rule e="node" k="tourism" v="attraction" zoom-min="15">
Expand Down
24 changes: 17 additions & 7 deletions client/freemap_slovakia/waterways.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,36 +26,46 @@
<rule e="way" k="waterway" v="drain" zoom-min="13">
<line stroke="#8DB0DD" stroke-width="0.8dp"/>
<rule e="way" k="*" v="*" zoom-min="16">
<lineSymbol src="file:/symbols/waterflow.svg" align-center="true" repeat="true" symbol-width="7dp" repeat-gap="50dp"/>
<lineSymbol src="file:/symbols/waterflow.svg" align-center="true" repeat="true" symbol-width="7dp" repeat-gap="40dp"/>
</rule>
</rule>
<rule e="way" k="waterway" v="canal" zoom-min="13">
<pathText k="name" font-style="bold_italic" font-size="9dp" fill="#0000fc" stroke="#ffffff" stroke-width="2.5dp"/>
<line stroke="#8DB0DD" stroke-width="0.8dp" />
<rule e="way" k="*" v="*" zoom-min="16">
<lineSymbol src="file:/symbols/waterflow.svg" align-center="true" repeat="true" symbol-width="7dp" repeat-gap="50dp"/>
<rule e="way" k="*" v="*" zoom-min="15" zoom-max="17">
<lineSymbol src="file:/symbols/waterflow.svg" align-center="true" repeat="true" symbol-width="9dp" repeat-gap="30dp"/>
</rule>
<rule e="way" k="*" v="*" zoom-min="18">
<lineSymbol src="file:/symbols/waterflow.svg" align-center="true" repeat="true" symbol-width="9dp" repeat-gap="50dp"/>
</rule>
</rule>
<rule e="way" k="waterway" v="stream" zoom-min="14">
<pathText k="name" font-style="bold_italic" font-size="8dp" fill="#8DB0DD" stroke="#ffffff" stroke-width="2dp"/>
<pathText k="name" font-style="bold_italic" font-size="8dp" fill="#0000fc" stroke="#ffffff" stroke-width="2dp"/>
<rule e="way" k="tunnel" v="yes|culvert">
<line stroke="#8DB0DD" stroke-dasharray="4,8" stroke-width="0.3dp"/>
</rule>
<rule e="way" k="tunnel" v="~|no">
<line stroke="#8DB0DD" stroke-width="0.3dp"/>
</rule>
<rule e="way" k="*" v="*" zoom-min="15">
<rule e="way" k="*" v="*" zoom-min="15" zoom-max="17">
<lineSymbol src="file:/symbols/waterflow.svg" align-center="true" repeat="true" symbol-width="8dp" repeat-gap="30dp"/>
</rule>
<rule e="way" k="*" v="*" zoom-min="18">
<lineSymbol src="file:/symbols/waterflow.svg" align-center="true" repeat="true" symbol-width="9dp" repeat-gap="50dp"/>
</rule>
</rule>
<rule e="way" k="waterway" v="river">
<pathText k="name" font-style="bold_italic" font-size="9dp" fill="#8DB0DD" stroke="#ffffff" stroke-width="2.6dp"/>
<pathText k="name" font-style="bold_italic" font-size="9dp" fill="#0000fc" stroke="#ffffff" stroke-width="2.6dp"/>
<rule e="way" k="tunnel" v="yes|culvert">
<line stroke="#8DB0DD" stroke-dasharray="5,12" stroke-width="1.0dp"/>
</rule>
<rule e="way" k="tunnel" v="~|no">
<line stroke="#8DB0DD" stroke-width="1.5dp"/>
</rule>
<rule e="way" k="*" v="*" zoom-min="13">
<rule e="way" k="*" v="*" zoom-min="13" zoom-max="17">
<lineSymbol src="file:/symbols/waterflow.svg" align-center="true" repeat="true" symbol-width="7dp" scale-icon-size="16,1.1" repeat-gap="30dp"/>
</rule>
<rule e="way" k="*" v="*" zoom-min="18">
<lineSymbol src="file:/symbols/waterflow.svg" align-center="true" repeat="true" symbol-width="7dp" scale-icon-size="16,1.1" repeat-gap="50dp"/>
</rule>
</rule>
Expand Down
Loading

0 comments on commit 35eab6e

Please sign in to comment.