Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions rendering_styles/LightRS.render.xml
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,12 @@
<case attrColorValue="#300002B4"/>
</renderingAttribute>

<renderingAttribute name="placeCityVillageTextColor">
<case attrColorValue="#000000">
<apply_if nightMode="true" attrColorValue="#E5E5E5"/>
</case>
</renderingAttribute>

<renderingAttribute name="placeCountryTextColor">
<case attrColorValue="#8e3a7e">
<apply_if nightMode="true" attrColorValue="#d99b42"/>
Expand Down Expand Up @@ -1273,12 +1279,6 @@
<apply_if minzoom="16" textSize="15"/>
<apply_if minzoom="17" textSize="16"/>
</switch>
<switch minzoom="11" nameTag="">
<case tag="place" value="island"/>
<case minzoom="13" tag="place" value="islet"/>
<apply textItalic="true" textSize="14" textOrder="113"/>
<apply_if minzoom="16" textSize="16"/>
</switch>
<apply_if nightMode="true" textColor="#ffffff" textHaloRadius="$textHaloRadiusNight" textHaloColor="#77777777"/>
<apply_if engine_v1="false" textDy="-5"/>
<apply>
Expand Down Expand Up @@ -1313,6 +1313,33 @@
<case additional="population_rounded=100" textOrder="43"/>
</apply>
</switch>
<switch minzoom="5" tag="place" value="island" nameTag="">
<switch maxzoom="10" additional="osmand_prominent_island=yes" textOrder="77">
<case minzoom="5" additional="area_rounded=2048000" textSize="11"/>
<case minzoom="5" additional="area_rounded=1024000" textSize="11"/>
<case minzoom="5" additional="area_rounded=512000" textSize="11"/>
<case minzoom="5" additional="area_rounded=256000" textSize="11"/>
<case minzoom="5" additional="area_rounded=128000" textSize="11"/>
<case minzoom="5" additional="area_rounded=64000" textSize="11"/>
<case minzoom="5" additional="area_rounded=32000" textSize="11"/>
<case minzoom="5" additional="area_rounded=16000" textSize="11"/>
<case minzoom="6" additional="area_rounded=8000" textSize="12"/>
<case minzoom="7" additional="area_rounded=4000" textSize="12"/>
<case minzoom="8" additional="area_rounded=2000" textSize="13"/>
<case minzoom="9" additional="area_rounded=1000" textSize="13"/>
<case minzoom="9" additional="area_rounded=500" textSize="13"/>
<case minzoom="10" additional="area_rounded=200" textSize="13"/>
<case minzoom="10" additional="area_rounded=100" textSize="13"/>
</switch>
<case minzoom="11" textSize="14" textOrder="37" intersectionMargin="15"/>
<apply textColor="$placeCityVillageTextColor" textWrapWidth="20" textHaloColor="#ffffff" textItalic="true"/>
<apply_if nightMode="true" textHaloColor="#77777777"/>
</switch>

<case minzoom="13" tag="place" value="islet" nameTag="">
<apply textWrapWidth="20" textColor="$placeCityVillageTextColor" textHaloColor="#ffffff" intersectionMargin="15" textItalic="true" textSize="14"/>
<apply_if nightMode="true" textHaloColor="#77777777"/>
</case>

<switch textSize="12" textColor="#0066ff" textWrapWidth="20" textHaloRadius="$textHaloRadiusDay" textOrder="150" nameTag="">
<case minzoom="17" tag="amenity" value="fuel"/>
Expand Down
32 changes: 25 additions & 7 deletions rendering_styles/default.render.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4920,13 +4920,31 @@
</apply>
</switch>

<switch minzoom="11">
<case tag="place" value="island" nameTag="">
<apply_if minzoom="12" textOrder="37"/>
</case>
<case minzoom="13" tag="place" value="islet" nameTag=""/>
<apply textWrapWidth="20" textColor="$placeCityVillageTextColor" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeCityVillageTextHaloColor" intersectionMargin="15" textItalic="true" nameTag="" textSize="14"/>
</switch>
<switch minzoom="5" tag="place" value="island" nameTag="">
<switch maxzoom="10" additional="osmand_prominent_island=yes" textOrder="77">
<case minzoom="5" additional="area_rounded=2048000" textSize="11"/>
<case minzoom="5" additional="area_rounded=1024000" textSize="11"/>
<case minzoom="5" additional="area_rounded=512000" textSize="11"/>
<case minzoom="5" additional="area_rounded=256000" textSize="11"/>
<case minzoom="5" additional="area_rounded=128000" textSize="11"/>
<case minzoom="5" additional="area_rounded=64000" textSize="11"/>
<case minzoom="5" additional="area_rounded=32000" textSize="11"/>
<case minzoom="5" additional="area_rounded=16000" textSize="11"/>
<case minzoom="6" additional="area_rounded=8000" textSize="12"/>
<case minzoom="7" additional="area_rounded=4000" textSize="12"/>
<case minzoom="8" additional="area_rounded=2000" textSize="13"/>
<case minzoom="9" additional="area_rounded=1000" textSize="13"/>
<case minzoom="9" additional="area_rounded=500" textSize="13"/>
<case minzoom="10" additional="area_rounded=200" textSize="13"/>
<case minzoom="10" additional="area_rounded=100" textSize="13"/>
</switch>
<case minzoom="11" textSize="14" textOrder="37" intersectionMargin="15"/>
<apply textColor="$placeCityVillageTextColor" textWrapWidth="20" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeCityVillageTextHaloColor" textItalic="true"/>
</switch>

<case minzoom="13" tag="place" value="islet" nameTag="">
<apply textWrapWidth="20" textColor="$placeCityVillageTextColor" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeCityVillageTextHaloColor" intersectionMargin="15" textItalic="true" textSize="14"/>
</case>

<!-- Natural -->
<case minzoom="12" tag="leisure" value="park" nameTag="" textSize="12" textWrapWidth="15" textHaloRadius="$textHaloRadius" textHaloColor="#aaffffff" textColor="$parkTextColorDay" textItalic="true" textOrder="103">
Expand Down
33 changes: 25 additions & 8 deletions rendering_styles/marine.render.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1268,17 +1268,34 @@
<case additional="population_rounded=100" textOrder="43"/>
</apply>
</switch>
<switch minzoom="11" nameTag="">
<case tag="place" value="island">
<apply_if maxzoom="12" textOrder="24"/>
<apply_if minzoom="13" textOrder="37"/>
</case>
<case minzoom="13" tag="place" value="islet"/>
<apply textWrapWidth="20" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeCityVillageTextHaloColorDay" intersectionMargin="15" textItalic="true" textSize="14"/>
<apply_if minzoom="16" textSize="16"/>
<switch minzoom="5" tag="place" value="island" nameTag="">
<switch maxzoom="10" additional="osmand_prominent_island=yes" textOrder="77">
<case minzoom="5" additional="area_rounded=2048000" textSize="11"/>
<case minzoom="5" additional="area_rounded=1024000" textSize="11"/>
<case minzoom="5" additional="area_rounded=512000" textSize="11"/>
<case minzoom="5" additional="area_rounded=256000" textSize="11"/>
<case minzoom="5" additional="area_rounded=128000" textSize="11"/>
<case minzoom="5" additional="area_rounded=64000" textSize="11"/>
<case minzoom="5" additional="area_rounded=32000" textSize="11"/>
<case minzoom="5" additional="area_rounded=16000" textSize="11"/>
<case minzoom="6" additional="area_rounded=8000" textSize="12"/>
<case minzoom="7" additional="area_rounded=4000" textSize="12"/>
<case minzoom="8" additional="area_rounded=2000" textSize="13"/>
<case minzoom="9" additional="area_rounded=1000" textSize="13"/>
<case minzoom="9" additional="area_rounded=500" textSize="13"/>
<case minzoom="10" additional="area_rounded=200" textSize="13"/>
<case minzoom="10" additional="area_rounded=100" textSize="13"/>
</switch>
<case minzoom="11" textSize="14" textOrder="37" intersectionMargin="15"/>
<apply textColor="#000000" textWrapWidth="20" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeTextHaloColorDay" textItalic="true"/>
<apply_if nightMode="true" textColor="#ffffff" textHaloColor="#77777777"/>
</switch>

<case minzoom="13" tag="place" value="islet" nameTag="">
<apply textWrapWidth="20" textColor="#000000" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeTextHaloColorDay" intersectionMargin="15" textItalic="true" textSize="14"/>
<apply_if nightMode="true" textColor="#ffffff" textHaloColor="#77777777"/>
</case>

<switch textHaloRadius="$buildingTextHaloRadiusDay">
<switch minzoom="17" nameTag="">
<case tag="military" value="barracks"/>
Expand Down
41 changes: 33 additions & 8 deletions rendering_styles/nautical.render.xml
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,12 @@
</case>
</renderingAttribute>

<renderingAttribute name="placeCityVillageTextColor">
<case attrColorValue="#000000">
<apply_if nightMode="true" attrColorValue="#FFFFFF"/>
</case>
</renderingAttribute>

<renderingAttribute name="placeCountryTextColor">
<case attrColorValue="#635700">
<apply_if nightMode="true" attrColorValue="#fffccc"/>
Expand Down Expand Up @@ -1076,16 +1082,35 @@
<case additional="population_rounded=100" textOrder="43"/>
</apply>
</switch>
<switch minzoom="11" nameTag="">
<case tag="place" value="island">
<apply_if maxzoom="12" textOrder="24"/>
<apply_if minzoom="13" textOrder="37"/>
</case>
<case minzoom="13" tag="place" value="islet"/>
<apply textWrapWidth="20" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeCityVillageTextHaloColorDay" intersectionMargin="15" textItalic="true" textSize="14"/>

<switch minzoom="5" tag="place" value="island" nameTag="">
<switch maxzoom="10" additional="osmand_prominent_island=yes" textOrder="77">
<case minzoom="5" additional="area_rounded=2048000" textSize="11"/>
<case minzoom="5" additional="area_rounded=1024000" textSize="11"/>
<case minzoom="5" additional="area_rounded=512000" textSize="11"/>
<case minzoom="5" additional="area_rounded=256000" textSize="11"/>
<case minzoom="5" additional="area_rounded=128000" textSize="11"/>
<case minzoom="5" additional="area_rounded=64000" textSize="11"/>
<case minzoom="5" additional="area_rounded=32000" textSize="11"/>
<case minzoom="5" additional="area_rounded=16000" textSize="11"/>
<case minzoom="6" additional="area_rounded=8000" textSize="12"/>
<case minzoom="7" additional="area_rounded=4000" textSize="12"/>
<case minzoom="8" additional="area_rounded=2000" textSize="13"/>
<case minzoom="9" additional="area_rounded=1000" textSize="13"/>
<case minzoom="9" additional="area_rounded=500" textSize="13"/>
<case minzoom="10" additional="area_rounded=200" textSize="13"/>
<case minzoom="10" additional="area_rounded=100" textSize="13"/>
</switch>
<case minzoom="11" textSize="14" textOrder="37" intersectionMargin="15"/>
<apply textColor="$placeCityVillageTextColor" textWrapWidth="20" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeCityVillageTextHaloColorDay" textItalic="true"/>
<apply_if minzoom="16" textSize="16"/>
<apply_if nightMode="true" textColor="#ffffff" textHaloColor="#77777777"/>
<apply_if nightMode="true" textHaloColor="#77777777"/>
</switch>
<case minzoom="13" tag="place" value="islet" nameTag="">
<apply textWrapWidth="20" textColor="$placeCityVillageTextColor" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeCityVillageTextHaloColorDay" intersectionMargin="15" textItalic="true" textSize="14"/>
<apply_if minzoom="16" textSize="16"/>
<apply_if nightMode="true" textHaloColor="#77777777"/>
</case>

<switch textHaloRadius="$buildingTextHaloRadiusDay">
<switch minzoom="17" nameTag="">
Expand Down
31 changes: 25 additions & 6 deletions rendering_styles/topo.render.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3156,14 +3156,33 @@
<case additional="population_rounded=100" textOrder="43"/>
</apply>
</switch>
<switch minzoom="11" nameTag="">
<case tag="place" value="island">
<apply_if minzoom="12" textOrder="37"/>
</case>
<case minzoom="13" tag="place" value="islet"/>
<apply textColor="$placeCityVillageTextColor" textWrapWidth="20" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeCityVillageTextHaloColor" intersectionMargin="15" textItalic="true" nameTag="" textSize="14"/>

<switch minzoom="5" tag="place" value="island" nameTag="">
<switch maxzoom="10" additional="osmand_prominent_island=yes" textOrder="77">
<case minzoom="5" additional="area_rounded=2048000" textSize="11"/>
<case minzoom="5" additional="area_rounded=1024000" textSize="11"/>
<case minzoom="5" additional="area_rounded=512000" textSize="11"/>
<case minzoom="5" additional="area_rounded=256000" textSize="11"/>
<case minzoom="5" additional="area_rounded=128000" textSize="11"/>
<case minzoom="5" additional="area_rounded=64000" textSize="11"/>
<case minzoom="5" additional="area_rounded=32000" textSize="11"/>
<case minzoom="5" additional="area_rounded=16000" textSize="11"/>
<case minzoom="6" additional="area_rounded=8000" textSize="12"/>
<case minzoom="7" additional="area_rounded=4000" textSize="12"/>
<case minzoom="8" additional="area_rounded=2000" textSize="13"/>
<case minzoom="9" additional="area_rounded=1000" textSize="13"/>
<case minzoom="9" additional="area_rounded=500" textSize="13"/>
<case minzoom="10" additional="area_rounded=200" textSize="13"/>
<case minzoom="10" additional="area_rounded=100" textSize="13"/>
</switch>
<case minzoom="11" textSize="14" textOrder="37" intersectionMargin="15"/>
<apply textColor="$placeCityVillageTextColor" textWrapWidth="20" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeCityVillageTextHaloColor" textItalic="true"/>
</switch>

<case minzoom="13" tag="place" value="islet" nameTag="">
<apply textWrapWidth="20" textColor="$placeCityVillageTextColor" textHaloRadius="$placeTextHaloRadiusDay" textHaloColor="$placeCityVillageTextHaloColor" intersectionMargin="15" textItalic="true" textSize="14"/>
</case>

<switch minzoom="17">
<case tag="junction" value="yes" nameTag="" textOrder="140"/>
<case tag="highway" value="traffic_signals" nameTag="" textOrder="141"/>
Expand Down
Loading