Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add eleUnits hidden option (https://github.com/osmandapp/OsmAnd/issue… #1150

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add eleUnits hidden option (https://github.com/osmandapp/OsmAnd/issue… #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 41 additions & 9 deletions rendering_styles/LightRS.render.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
type="string" possibleValues="default, car, bicycle, pedestrian, public_transport, boat, ski"/>
<renderingProperty attr="transportStops" name="Transport stops" description="Public transport stops"
type="boolean" possibleValues="" category="transport"/>
<renderingProperty attr="eleUnits" name="Elevation units" type="string" possibleValues="meters,feet" defaultValueDescription="default" category="ui_hidden"/>

<renderingAttribute name="defaultColor">
<case noPolygons="true" attrColorValue="#00ffffff"/>
Expand Down Expand Up @@ -997,15 +998,46 @@
</case>

<switch textColor="#654321" textWrapWidth="25" textHaloRadius="$textHaloRadiusDay">
<switch minzoom="12" tag="natural" value="peak" textItalic="true" textOrder="80">
<case maxzoom="13" nameTag="ele" textSize="11"/>
<case maxzoom="14" nameTag="" nameTag2="ele" textSize="12"/>
<case maxzoom="14" nameTag="ele" textSize="12"/>
<case maxzoom="16" nameTag="" nameTag2="ele" textSize="13"/>
<case maxzoom="16" nameTag="ele" textSize="13"/>
<case minzoom="17" nameTag="" nameTag2="ele" textSize="16"/>
<case minzoom="17" nameTag="ele" textSize="16"/>
</switch>
<case minzoom="12" tag="natural" value="peak" textOrder="80">
<case maxzoom="12" textSize="11" intersectionMargin="15">
<case eleUnits="feet" nameTag="ele_feet"/>
<case nameTag="ele"/>
</case>
<case minzoom="13" maxzoom="13">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="11"/>
<case nameTag="ele_feet" textSize="12"/>
</case>
<case nameTag="" nameTag2="ele" textSize="11"/>
<case nameTag="ele" textSize="12"/>
</case>
<case minzoom="14" maxzoom="14">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="12"/>
<case nameTag="ele_feet" textSize="12"/>
</case>
<case nameTag="" nameTag2="ele" textSize="12"/>
<case nameTag="ele" textSize="12"/>
</case>
<case minzoom="15" maxzoom="16">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="13"/>
<case nameTag="ele_feet" textSize="13"/>
</case>
<case nameTag="" nameTag2="ele" textSize="13"/>
<case nameTag="ele" textSize="13"/>
</case>
<case minzoom="17">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="15"/>
<case nameTag="ele_feet" textSize="15"/>
</case>
<case nameTag="" nameTag2="ele" textSize="15"/>
<case nameTag="ele" textSize="15"/>
</case>
<apply_if maxzoom="14" engine_v1="true" textDy="-2"/>
<apply_if minzoom="15" engine_v1="true" textDy="-1"/>
</case>
<case minzoom="16" tag="natural" value="cave_entrance" nameTag="" textSize="12" textOrder="236"/>
<case minzoom="13" tag="natural" value="volcano" nameTag="" textSize="14" textOrder="79"/>
<apply_if engine_v1="true" textDy="7"/>
Expand Down
86 changes: 70 additions & 16 deletions rendering_styles/default.render.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
type="string" possibleValues="thin,medium,bold" defaultValueDescription="default"/>

<renderingProperty attr="legend" name="Legend" type="boolean" possibleValues="" category="ui_hidden"/>
<renderingProperty attr="eleUnits" name="Elevation units" type="string" possibleValues="meters,feet" defaultValueDescription="default" category="ui_hidden"/>

<!-- <renderingProperty attr="levelNumber" name="Levels" description="" type="string" possibleValues="-5,-4,-3,-2,-1,0,1,2,3,4,5"/>-->

Expand Down Expand Up @@ -4887,19 +4888,53 @@
<switch textColor="#654321" textDy="7" textWrapWidth="25" textHaloColor="#aaf1eae4" textHaloRadius="$textHaloRadius" textItalic="true">
<switch>
<case minzoom="$naturalPeakTextMinZoom" tag="natural" value="peak" textOrder="80">
<case maxzoom="12" nameTag="ele" textSize="11" intersectionMargin="15"/>
<case minzoom="13" maxzoom="13" nameTag="" nameTag2="ele" textSize="11"/>
<case minzoom="13" maxzoom="13" nameTag="ele" textSize="12"/>
<case minzoom="14" maxzoom="14" nameTag="" nameTag2="ele" textSize="12"/>
<case minzoom="14" maxzoom="14" nameTag="ele" textSize="12"/>
<case minzoom="15" maxzoom="16" nameTag="" nameTag2="ele" textSize="13"/>
<case minzoom="15" maxzoom="16" nameTag="ele" textSize="13"/>
<case minzoom="17" nameTag="" nameTag2="ele" textSize="15"/>
<case minzoom="17" nameTag="ele" textSize="15"/>
<case maxzoom="12" textSize="11" intersectionMargin="15">
<case eleUnits="feet" nameTag="ele_feet"/>
<case nameTag="ele"/>
</case>
<case minzoom="13" maxzoom="13">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="11"/>
<case nameTag="ele_feet" textSize="12"/>
</case>
<case nameTag="" nameTag2="ele" textSize="11"/>
<case nameTag="ele" textSize="12"/>
</case>
<case minzoom="14" maxzoom="14">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="12"/>
<case nameTag="ele_feet" textSize="12"/>
</case>
<case nameTag="" nameTag2="ele" textSize="12"/>
<case nameTag="ele" textSize="12"/>
</case>
<case minzoom="15" maxzoom="16">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="13"/>
<case nameTag="ele_feet" textSize="13"/>
</case>
<case nameTag="" nameTag2="ele" textSize="13"/>
<case nameTag="ele" textSize="13"/>
</case>
<case minzoom="17">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="15"/>
<case nameTag="ele_feet" textSize="15"/>
</case>
<case nameTag="" nameTag2="ele" textSize="15"/>
<case nameTag="ele" textSize="15"/>
</case>
<apply_if maxzoom="14" engine_v1="true" textDy="-2"/>
<apply_if minzoom="15" engine_v1="true" textDy="-1"/>
</case>
<case minzoom="$naturalHillTextMinZoom" tag="natural" value="hill" nameTag="" nameTag2="ele" textOrder="70" textSize="11"/>
<case minzoom="$naturalHillTextMinZoom" tag="natural" value="hill" textOrder="70">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="11"/>
<case nameTag="ele_feet" textSize="11"/>
</case>
<case nameTag="" nameTag2="ele" textSize="11"/>
<case nameTag="ele" textSize="11"/>
</case>
<switch tag="natural" value="ridge" nameTag="" textOnPath="true" textDy="0" textOrder="43">
<case minzoom="17" textSize="20" />
<case minzoom="16" textSize="18" />
Expand Down Expand Up @@ -4963,9 +4998,23 @@
<apply_if nightMode="true" textColor="#ffcc9b" textHaloColor="#774d2803"/>
<apply_if legend="true" textDy="0"/>
</switch>
<case minzoom="$naturalVolcanoTextMinZoom" tag="natural" value="volcano" nameTag="" nameTag2="ele" textOrder="79" textHaloColor="#99ffd6c0">
<case maxzoom="12" textSize="12"/>
<case minzoom="13" textSize="13"/>
<case minzoom="$naturalVolcanoTextMinZoom" tag="natural" value="volcano" textOrder="79" textHaloColor="#99ffd6c0">
<case maxzoom="12">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="12"/>
<case nameTag="ele_feet" textSize="12"/>
</case>
<case nameTag="" nameTag2="ele" textSize="12"/>
<case nameTag="ele" textSize="12"/>
</case>
<case minzoom="13">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="13"/>
<case nameTag="ele_feet" textSize="13"/>
</case>
<case nameTag="" nameTag2="ele" textSize="13"/>
<case nameTag="ele" textSize="13"/>
</case>
<apply_if nightMode="true" textColor="#ffcc9b" textHaloColor="#77772105"/>
</case>
<apply_if engine_v1="false" textDy="0"/>
Expand Down Expand Up @@ -5265,7 +5314,7 @@
</switch>

<!-- Traffic, transportation and orientation -->
<switch textSize="12" nameTag="" textColor="#0066ff" textHaloRadius="$textHaloRadius" textHaloColor="$defaultTextHaloColorDay" textWrapWidth="25" textOrder="150">
<switch textSize="12" textColor="#0066ff" textHaloRadius="$textHaloRadius" textHaloColor="$defaultTextHaloColorDay" textWrapWidth="25" textOrder="150">
<switch hidePOILabels="false">
<switch >
<case minzoom="17" tag="amenity" value="fuel" nameTag="" textWrapWidth="20"/>
Expand Down Expand Up @@ -5300,8 +5349,12 @@
<case minzoom="16" tag="highway" value="rest_area" nameTag="" textOrder="101" />
<case minzoom="18" tag="amenity" value="weighbridge"/>
</switch>
<case minzoom="14" tag="mountain_pass" value="yes" nameTag="" nameTag2="rtsa_scale"/>
<case minzoom="14" tag="mountain_pass" value="yes" nameTag="ele"/>
<case minzoom="14" tag="mountain_pass" value="yes">
<case nameTag="" nameTag2="rtsa_scale"/>
<case eleUnits="feet" nameTag="ele_feet"/>
<case eleUnits="feet" nameTag="ele" textSize="0"/>
<case nameTag="ele"/>
</case>
<apply_if nightMode="true" textColor="#b9d5ff" textHaloColor="#88355777"/>
<apply_if engine_v1="true" textDy="5"/>
</switch>
Expand Down Expand Up @@ -5584,6 +5637,7 @@
<case minzoom="15" tag="tourism" value="cabin"/>
<case minzoom="14" tag="tourism" value="wilderness_hut"/>
<case minzoom="16" tag="amenity" value="shelter"/>
<apply_if eleUnits="feet" nameTag2="ele_feet"/>
<apply_if minzoom="15" moreDetailed="true" textOrder="43"/>
<apply_if nightMode="true" textHaloColor="#55234ca7"/>
<apply_if baseAppMode="car" moreDetailed="false" maxzoom="17" disable="true"/>
Expand Down
59 changes: 51 additions & 8 deletions rendering_styles/nautical.render.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<renderingProperty attr="noPolygons" name="Hide polygons" description="Make all areal land features on map transparent"
type="boolean" possibleValues="" category="hide"/>
<renderingProperty attr="legend" name="Legend" type="boolean" possibleValues="" category="ui_hidden"/>
<renderingProperty attr="eleUnits" name="Elevation units" type="string" possibleValues="meters,feet" defaultValueDescription="default" category="ui_hidden"/>

<renderingAttribute name="gpxColor"> <!-- deprecated -->
<case attrColorValue="#b400ffff"/>
Expand Down Expand Up @@ -1318,19 +1319,61 @@

<switch textColor="#654321" textWrapWidth="25" textHaloColor="#aafddb8f" textHaloRadius="$textHaloRadiusDay" textItalic="true">
<switch>
<case minzoom="12" tag="natural" value="peak">
<case maxzoom="13" nameTag="ele" textSize="11" textOrder="60"/>
<case maxzoom="14" nameTag="" nameTag2="ele" textSize="12" textOrder="60"/>
<case maxzoom="16" nameTag="" nameTag2="ele" textSize="13" textOrder="65"/>
<case minzoom="17" nameTag="" nameTag2="ele" textSize="16" textOrder="65"/>
<case minzoom="12" tag="natural" value="peak" textOrder="80">
<case minzoom="13" maxzoom="13" textOrder="60">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="11"/>
<case nameTag="ele_feet" textSize="12"/>
</case>
<case nameTag="" nameTag2="ele" textSize="11"/>
<case nameTag="ele" textSize="12"/>
</case>
<case minzoom="14" maxzoom="14" textOrder="60">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="12"/>
<case nameTag="ele_feet" textSize="12"/>
</case>
<case nameTag="" nameTag2="ele" textSize="12"/>
<case nameTag="ele" textSize="12"/>
</case>
<case minzoom="15" maxzoom="16" textOrder="65">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="13"/>
<case nameTag="ele_feet" textSize="13"/>
</case>
<case nameTag="" nameTag2="ele" textSize="13"/>
<case nameTag="ele" textSize="13"/>
</case>
<case minzoom="17" textOrder="65">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="15"/>
<case nameTag="ele_feet" textSize="15"/>
</case>
<case nameTag="" nameTag2="ele" textSize="15"/>
<case nameTag="ele" textSize="15"/>
</case>
</case>
<case minzoom="14" textSize="12" tag="natural" value="ridge" nameTag="" textOnPath="true" textDy="0"/>
<case minzoom="13" textSize="14" tag="natural" value="crater" nameTag="" textColor="#4e0d0d" textDy="-4"/>
<apply_if nightMode="true" textHaloRadius="$textHaloRadiusNight" textColor="#ffcc9b" textHaloColor="#77464234"/>
</switch>
<case minzoom="11" tag="natural" value="volcano" nameTag="" nameTag2="ele" textOrder="53" textHaloColor="#99ffd6c0">
<case maxzoom="12" textSize="12"/>
<case minzoom="13" textSize="13"/>
<case minzoom="11" tag="natural" value="volcano" textOrder="53" textHaloColor="#99ffd6c0">
<case maxzoom="12">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="12"/>
<case nameTag="ele_feet" textSize="12"/>
</case>
<case nameTag="" nameTag2="ele" textSize="12"/>
<case nameTag="ele" textSize="12"/>
</case>
<case minzoom="13">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="13"/>
<case nameTag="ele_feet" textSize="13"/>
</case>
<case nameTag="" nameTag2="ele" textSize="13"/>
<case nameTag="ele" textSize="13"/>
</case>
<apply_if nightMode="true" textColor="#ffcc9b" textHaloColor="#77464234"/>
</case>
<apply_if engine_v1="false" textDy="0"/>
Expand Down
80 changes: 64 additions & 16 deletions rendering_styles/osm-carto.render.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,19 +1020,53 @@
<switch textColor="#795430" textDy="7" textWrapWidth="25" textHaloColor="#aaf1eae4" textHaloRadius="$textHaloRadius" textItalic="true">
<switch>
<case minzoom="$naturalPeakTextMinZoom" tag="natural" value="peak" textOrder="80">
<case maxzoom="12" nameTag="ele" textSize="11" intersectionMargin="15" />
<case minzoom="13" maxzoom="13" nameTag="" nameTag2="ele" textSize="11" />
<case minzoom="13" maxzoom="13" nameTag="ele" textSize="12" />
<case minzoom="14" maxzoom="14" nameTag="" nameTag2="ele" textSize="12" />
<case minzoom="14" maxzoom="14" nameTag="ele" textSize="12" />
<case minzoom="15" maxzoom="16" nameTag="" nameTag2="ele" textSize="13" />
<case minzoom="15" maxzoom="16" nameTag="ele" textSize="13" />
<case minzoom="17" nameTag="" nameTag2="ele" textSize="15" />
<case minzoom="17" nameTag="ele" textSize="15" />
<apply_if maxzoom="14" engine_v1="true" textDy="-2" />
<apply_if minzoom="15" engine_v1="true" textDy="-1" />
<case maxzoom="12" textSize="11" intersectionMargin="15">
<case eleUnits="feet" nameTag="ele_feet"/>
<case nameTag="ele"/>
</case>
<case minzoom="13" maxzoom="13">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="11"/>
<case nameTag="ele_feet" textSize="12"/>
</case>
<case nameTag="" nameTag2="ele" textSize="11"/>
<case nameTag="ele" textSize="12"/>
</case>
<case minzoom="14" maxzoom="14">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="12"/>
<case nameTag="ele_feet" textSize="12"/>
</case>
<case nameTag="" nameTag2="ele" textSize="12"/>
<case nameTag="ele" textSize="12"/>
</case>
<case minzoom="15" maxzoom="16">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="13"/>
<case nameTag="ele_feet" textSize="13"/>
</case>
<case nameTag="" nameTag2="ele" textSize="13"/>
<case nameTag="ele" textSize="13"/>
</case>
<case minzoom="17">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="15"/>
<case nameTag="ele_feet" textSize="15"/>
</case>
<case nameTag="" nameTag2="ele" textSize="15"/>
<case nameTag="ele" textSize="15"/>
</case>
<apply_if maxzoom="14" engine_v1="true" textDy="-2"/>
<apply_if minzoom="15" engine_v1="true" textDy="-1"/>
</case>
<case minzoom="$naturalHillTextMinZoom" tag="natural" value="hill" textOrder="70">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="11"/>
<case nameTag="ele_feet" textSize="11"/>
</case>
<case nameTag="" nameTag2="ele" textSize="11"/>
<case nameTag="ele" textSize="11"/>
</case>
<case minzoom="$naturalHillTextMinZoom" tag="natural" value="hill" nameTag="" nameTag2="ele" textOrder="70" textSize="11" />
<case hidePOILabels="false" minzoom="16" textSize="12" tag="natural" value="cave_entrance" textOrder="236" />
<switch tag="natural" value="ridge" textOnPath="true" textDy="0" textOrder="43">
<case minzoom="17" textSize="20" />
Expand Down Expand Up @@ -1094,10 +1128,24 @@
<apply_if nightMode="true" textColor="#ffcc9b" textHaloColor="#774d2803" />
<apply_if legend="true" textDy="0" />
</switch>
<case minzoom="$naturalVolcanoTextMinZoom" tag="natural" value="volcano" nameTag2="ele" textOrder="79" textHaloColor="#99ffd6c0">
<case maxzoom="12" textSize="12" />
<case minzoom="13" textSize="13" />
<apply_if nightMode="true" textColor="#ffcc9b" textHaloColor="#77772105" />
<case minzoom="$naturalVolcanoTextMinZoom" tag="natural" value="volcano" textOrder="79" textHaloColor="#99ffd6c0">
<case maxzoom="12">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="12"/>
<case nameTag="ele_feet" textSize="12"/>
</case>
<case nameTag="" nameTag2="ele" textSize="12"/>
<case nameTag="ele" textSize="12"/>
</case>
<case minzoom="13">
<case eleUnits="feet">
<case nameTag="" nameTag2="ele_feet" textSize="13"/>
<case nameTag="ele_feet" textSize="13"/>
</case>
<case nameTag="" nameTag2="ele" textSize="13"/>
<case nameTag="ele" textSize="13"/>
</case>
<apply_if nightMode="true" textColor="#ffcc9b" textHaloColor="#77772105"/>
</case>
<apply_if engine_v1="false" textDy="0" />
<apply_if additional="ele_limit=200" textOrder="83" />
Expand Down
Loading