Skip to content

Commit

Permalink
Add nps trails and roads to rendering (osmandapp/OsmAnd-Issues#2408)
Browse files Browse the repository at this point in the history
  • Loading branch information
@xmd5a2
xmd5a2 committed Jan 15, 2025
1 parent ac1a800 commit 4505fea
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 40 deletions.
22 changes: 16 additions & 6 deletions obf_creation/rendering_types_us-maps.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<osmand_types>
<type tag="name" additional="text"/>
<type tag="fee" additional="true"/>
<type tag="drinking_water" additional="true"/>
<type tag="toilets" additional="true"/>
<type tag="name" minzoom="1" additional="text"/>
<type tag="fee" minzoom="10" additional="true"/>
<type tag="drinking_water" minzoom="10" additional="true"/>
<type tag="toilets" minzoom="10" additional="true"/>
<type tag="surface" minzoom="10" additional="true"/>
<type tag="seasonal" value="yes" minzoom="10" additional="true"/>
<type tag="seasonal" value="no" minzoom="10" additional="true"/>
<type tag="seasonal_description" minzoom="10" additional="true"/>
<category name="padus">
<type tag="padus" value="area" minzoom="7"/>
<type tag="padus_category" value="easement" additional="true" minzoom="7"/>
Expand Down Expand Up @@ -82,14 +86,20 @@
<type tag="us_maps_terra_motorized" additional="true" minzoom="10"/>
<type tag="us_maps_snow_motorized" additional="true" minzoom="10"/>
<type tag="us_maps_water_motorized" additional="true" minzoom="10"/>
<type tag="bicycle" additional="true" minzoom="10"/>
<type tag="motorcycle" additional="true" minzoom="10"/>
<type tag="pack_and_saddle" additional="true" minzoom="10"/>
<type tag="atv" additional="true" minzoom="10"/>
<type tag="4wd" additional="true" minzoom="10"/>
<type tag="foot" additional="true" minzoom="10"/>
<type tag="sled" additional="true" minzoom="10"/>
<type tag="dog_sled" additional="true" minzoom="10"/>
<type tag="snowshoe" additional="true" minzoom="10"/>
<type tag="cross_country_ski" additional="true" minzoom="10"/>
<type tag="wheelchair" additional="true" minzoom="10"/>
<type tag="horse" additional="true" minzoom="10"/>

<type tag="us_maps_accessibility_status" value="proposed" additional="true" minzoom="10"/>
<type tag="us_maps_accessibility_status" value="temporarily_closed" additional="true" minzoom="10"/>
<type tag="us_maps_accessibility_status" additional="true" minzoom="10"/>

<type tag="us_maps" value="road" minzoom="10"/>

Expand Down
97 changes: 63 additions & 34 deletions rendering_styles/us-maps.addon.render.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
type="boolean" possibleValues="" category="hide"/>
<renderingProperty attr="hideBLMdata" name="Hide BLM trails, roads, recreation POIs" description="Hide BLM trails, roads, recreation POIs"
type="boolean" possibleValues="" category="hide"/>
<renderingProperty attr="hideNPSdata" name="Hide NPS trails, roads, recreation POIs" description="Hide NPS trails, roads, recreation POIs"
type="boolean" possibleValues="" category="hide"/>

<renderingAttribute name="defaultColor">
<case noPolygons="true" attrColorValue="#00ebe7e4"/>
Expand Down Expand Up @@ -55,6 +57,7 @@
<case tag="us_maps" value="recreation_area">
<apply_if hideNFSdata="true" additional="nfs=yes" order="-1"/>
<apply_if hideBLMdata="true" additional="blm=yes" order="-1"/>
<apply_if hideNPSdata="true" additional="nps=yes" order="-1"/>
</case>
</switch>

Expand All @@ -68,6 +71,7 @@
</case>
<apply_if hideNFSdata="true" additional="nfs=yes" order="-1"/>
<apply_if hideBLMdata="true" additional="blm=yes" order="-1"/>
<apply_if hideNPSdata="true" additional="nps=yes" order="-1"/>
</switch>
</order>

Expand Down Expand Up @@ -221,41 +225,45 @@
</polygon>

<line>
<switch minzoom="11" tag="us_maps" value="trail" color__2="#ffffff">
<switch>
<case additional="us_maps_terra_base_symbology=tc4-5" color="#000000"/>
<apply_if maxzoom="11" strokeWidth="1.5" strokeWidth__2="3" pathEffect="3_3"/>
<apply_if minzoom="12" maxzoom="12" strokeWidth="2" strokeWidth__2="4" pathEffect="4_4"/>
<apply_if minzoom="13" maxzoom="17" strokeWidth="3" strokeWidth__2="7" pathEffect="5_5"/>
<apply_if minzoom="18" strokeWidth="4" strokeWidth__2="10" pathEffect="6_6"/>
</switch>
<switch>
<case additional="us_maps_terra_base_symbology=tc3" color="#000000">
<apply_if maxzoom="11" pathEffect="3_3"/>
<apply_if minzoom="12" maxzoom="12" pathEffect="4_4"/>
<apply_if minzoom="13" maxzoom="17" pathEffect="5_5"/>
<apply_if minzoom="18" pathEffect="6_6"/>
</case>
<case additional="us_maps_terra_base_symbology=tc1-2" color="#000000">
<apply_if maxzoom="11" pathEffect="1_1"/>
<apply_if minzoom="12" maxzoom="12" pathEffect="2_2"/>
<apply_if minzoom="13" maxzoom="17" pathEffect="2_2"/>
<apply_if minzoom="18" pathEffect="3_3"/>
<switch>
<case minzoom="11" tag="us_maps" value="trail" additional="nfs=yes" color__2="#ffffff"/>
<case minzoom="11" tag="us_maps" value="trail" additional="nps=yes" color__2="#ffffff"/>
<apply>
<switch>
<case additional="us_maps_terra_base_symbology=tc4-5" color="#000000"/>
<apply_if maxzoom="11" strokeWidth="1.5" strokeWidth__2="3" pathEffect="3_3"/>
<apply_if minzoom="12" maxzoom="12" strokeWidth="2" strokeWidth__2="4" pathEffect="4_4"/>
<apply_if minzoom="13" maxzoom="17" strokeWidth="3" strokeWidth__2="7" pathEffect="5_5"/>
<apply_if minzoom="18" strokeWidth="4" strokeWidth__2="10" pathEffect="6_6"/>
</switch>
<switch>
<case additional="us_maps_terra_base_symbology=tc3" color="#000000">
<apply_if maxzoom="11" pathEffect="3_3"/>
<apply_if minzoom="12" maxzoom="12" pathEffect="4_4"/>
<apply_if minzoom="13" maxzoom="17" pathEffect="5_5"/>
<apply_if minzoom="18" pathEffect="6_6"/>
</case>
<case additional="us_maps_terra_base_symbology=tc1-2" color="#000000">
<apply_if maxzoom="11" pathEffect="1_1"/>
<apply_if minzoom="12" maxzoom="12" pathEffect="2_2"/>
<apply_if minzoom="13" maxzoom="17" pathEffect="2_2"/>
<apply_if minzoom="18" pathEffect="3_3"/>
</case>
<apply_if maxzoom="11" strokeWidth="1.5" strokeWidth__2="2.8"/>
<apply_if minzoom="12" maxzoom="12" strokeWidth="1.5" strokeWidth__2="3"/>
<apply_if minzoom="13" maxzoom="17" strokeWidth="2" strokeWidth__2="5"/>
<apply_if minzoom="18" strokeWidth="3" strokeWidth__2="7"/>
</switch>
<case color="#000000">
<apply_if maxzoom="11" strokeWidth="1.5" strokeWidth__2="2.8" pathEffect="1_1"/>
<apply_if minzoom="12" maxzoom="12" strokeWidth="1.5" strokeWidth__2="3" pathEffect="2_2"/>
<apply_if minzoom="13" maxzoom="17" strokeWidth="2" strokeWidth__2="5" pathEffect="2_2"/>
<apply_if minzoom="18" strokeWidth="3" strokeWidth__2="7" pathEffect="3_3"/>
</case>
<apply_if maxzoom="11" strokeWidth="1.5" strokeWidth__2="2.8"/>
<apply_if minzoom="12" maxzoom="12" strokeWidth="1.5" strokeWidth__2="3"/>
<apply_if minzoom="13" maxzoom="17" strokeWidth="2" strokeWidth__2="5"/>
<apply_if minzoom="18" strokeWidth="3" strokeWidth__2="7"/>
</switch>
<case color="#000000">
<apply_if maxzoom="11" strokeWidth="1.5" strokeWidth__2="2.8" pathEffect="1_1"/>
<apply_if minzoom="12" maxzoom="12" strokeWidth="1.5" strokeWidth__2="3" pathEffect="2_2"/>
<apply_if minzoom="13" maxzoom="17" strokeWidth="2" strokeWidth__2="5" pathEffect="2_2"/>
<apply_if minzoom="18" strokeWidth="3" strokeWidth__2="7" pathEffect="3_3"/>
</case>
<apply_if additional="us_maps_national_trail_designation=3" color="#C50028"/>
<apply_if additional="us_maps_accessibility_status=temporarily_closed" color="#aaaaaa"/>
<apply_if nightMode="true" color__2="#aaaaaa"/>
<apply_if additional="us_maps_national_trail_designation=3" color="#C50028"/>
<apply_if additional="us_maps_accessibility_status=temporarily_closed" color="#aaaaaa"/>
<apply_if nightMode="true" color__2="#aaaaaa"/>
</apply>
</switch>
<switch minzoom="11" tag="us_maps" value="road" additional="nfs=yes" color__2="#333333" cap="ROUND">
<case additional="us_maps_road_symbol_name=paved_road" color="#A2A2A2"/>
Expand Down Expand Up @@ -320,6 +328,27 @@


</switch>
<switch>
<switch minzoom="11" tag="us_maps" value="road" additional="nps=yes" cap="BUTT">
<switch>
<case additional="us_maps_road_functional_class=arterial"/>
<case additional="us_maps_road_functional_class=collector"/>
<apply_if maxzoom="11" strokeWidth="1.4" strokeWidth__1="4"/>
<apply_if minzoom="12" maxzoom="14" strokeWidth="2" strokeWidth__1="7"/>
<apply_if minzoom="15" strokeWidth="3" strokeWidth__1="8"/>
</switch>
<switch>
<case additional="us_maps_road_functional_class=local_important"/>
<case additional="us_maps_road_functional_class=local"/>
<apply_if maxzoom="11" strokeWidth="0.7" strokeWidth__1="3"/>
<apply_if minzoom="12" maxzoom="14" strokeWidth="1.3" strokeWidth__1="5"/>
<apply_if minzoom="15" strokeWidth="2" strokeWidth__1="7"/>
</switch>
</switch>
<apply color__1="#ffffff" color="#000000">
<apply_if nightMode="true" color__1="#aaaaaa" color="#333333"/>
</apply>
</switch>

</line>
</renderingStyle>

0 comments on commit 4505fea

Please sign in to comment.