Skip to content

Commit

Permalink
Render alpine_hut, wilderness_hut. Force rendering cave icon.
Browse files Browse the repository at this point in the history
  • Loading branch information
kaylesk committed Mar 31, 2017
1 parent 43747cb commit 57f9318
Show file tree
Hide file tree
Showing 6 changed files with 198 additions and 9 deletions.
8 changes: 4 additions & 4 deletions client/freemap_slovakia/contours.xslt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<xsl:template name="contour_labels">
<rule cat="contours" e="way" k="contour_ext" v="*">
<rule e="way" k="contour_ext" v="elevation_major" zoom-min="13">
<pathText k="ele" font-size="8dp" font-style="bold" fill="#A86868" stroke="#FFFFFF" stroke-width="1dp" curve="cubic"/>
<pathText k="ele" font-size="7dp" scale-font-size="17,1.2" font-style="bold" fill="#A86868" stroke="#FFFFFF" stroke-width="1dp"/>
</rule>
<rule e="way" k="contour_ext" v="elevation_medium" zoom-min="14">
<pathText k="ele" font-size="8dp" font-style="bold" fill="#A86868" stroke="#FFFFFF" stroke-width="1dp" curve="cubic"/>
<pathText k="ele" font-size="7dp" scale-font-size="17,1.2" font-style="bold" fill="#A86868" stroke="#FFFFFF" stroke-width="1dp"/>
</rule>
<rule e="way" k="contour_ext" v="elevation_minor" zoom-min="16">
<pathText k="ele" font-size="5dp" font-style="bold" fill="#A86868" stroke="#FFFFFF" stroke-width="1dp" curve="cubic"/>
<pathText k="ele" font-size="5dp" font-style="bold" fill="#A86868" stroke="#FFFFFF" stroke-width="1dp"/>
</rule>
</rule>
</xsl:template>
Expand All @@ -31,7 +31,7 @@
</rule>

<rule cat="contours" e="way" k="contour_ext" v="elevation_minor" zoom-min="14" zoom-max="15">
<line stroke="#DDDB8888" stroke-width="0.08dp" stroke-linecap="butt" curve="cubic"/>
<line stroke="#DDDB8888" stroke-width="0.06dp" stroke-linecap="butt" curve="cubic"/>
</rule>
<rule cat="contours" e="way" k="contour_ext" v="elevation_minor" zoom-min="16">
<line stroke="#DDDB8888" stroke-width="0.10dp" stroke-linecap="butt" curve="cubic"/>
Expand Down
2 changes: 1 addition & 1 deletion client/freemap_slovakia/freemap_slovakia.xslt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<xsl:template match="/">

<rendertheme version="1" locus-extended="1" xsi:schemaLocation="http://mapsforge.org/renderTheme ../renderTheme.xsd" map-background="#FBFBF9" map-background-outside="#dddddd">
<rendertheme version="1" locus-extended="1" xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/dev/resources/renderTheme.xsd" map-background="#FBFBF9" map-background-outside="#dddddd">
<!-- ways -->
<rule e="way" k="*" v="*">

Expand Down
2 changes: 1 addition & 1 deletion client/freemap_slovakia/naturals.xslt
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
</rule>
</rule>
<rule e="node" k="natural" v="cave_entrance" zoom-min="14">
<symbol src="file:/symbols/cave_entrance.png" symbol-width="16dp"/>
<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"/>
</rule>
Expand Down
88 changes: 88 additions & 0 deletions client/freemap_slovakia/symbols/alpine_hut.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 81 additions & 0 deletions client/freemap_slovakia/symbols/wilderness_hut.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 23 additions & 3 deletions client/freemap_slovakia/tourism.xslt
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,18 @@
<rule e="way" k="tourism" v="zoo|picnic_site|caravan_site|camp_site">
<area fill="#90c7f1a3" stroke="#6fc18e" stroke-width="0.2dp"/>
</rule>
<rule e="node" k="tourism" v="hostel" zoom-min="17">
<symbol src="file:/symbols/hostel.png" symbol-width="12dp"/>
</rule>
<rule e="node" k="tourism" v="hotel" zoom-min="16">
<symbol src="file:/symbols/hotel.png" symbol-width="12dp"/>
</rule>
<rule e="node" k="tourism" v="alpine_hut" zoom-min="15">
<symbol src="file:/symbols/alpine_hut.svg" symbol-width="14dp" force-draw="1"/>
</rule>
<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="way" k="*" v="*" zoom-min="16">
<caption k="name" font-style="bold" font-size="10dp" fill="#4040ff" stroke="#ffffff" stroke-width="2.0dp"/>
</rule>
Expand All @@ -120,19 +132,27 @@
<rule e="node" k="tourism" v="hostel" zoom-min="17">
<symbol src="file:/symbols/hostel.png" symbol-width="12dp"/>
</rule>
<rule e="node" k="tourism" v="hotel" zoom-min="17">
<rule e="node" k="tourism" v="hotel" zoom-min="16">
<symbol src="file:/symbols/hotel.png" symbol-width="12dp"/>
</rule>
<rule e="node" k="tourism" v="alpine_hut" zoom-min="15">
<symbol src="file:/symbols/alpine_hut.svg" symbol-width="14dp" force-draw="1"/>
</rule>
<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">
<symbol src="file:/symbols/information.png" symbol-width="12dp"/>
<rule e="node" k="information" v="map|board" zoom-min="15">
<symbol src="file:/symbols/information.png" symbol-width="12dp"/>
</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">
<symbol src="file:/symbols/feeding_place.svg" symbol-width="18dp"/>
</rule>
<rule e="node" k="tourism" v="attraction">
<rule e="node" k="tourism" v="attraction" zoom-min="15">
<symbol src="file:/symbols/attraction.svg" symbol-width="18dp"/>
</rule>
</rule>
Expand Down

0 comments on commit 57f9318

Please sign in to comment.