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.

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

Setup tags and icons for Travel Routes #1158

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
15 changes: 14 additions & 1 deletion icons/tools/sortfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3656,4 +3656,17 @@ icon activities_surfing
icon activities_running
icon activities_horse_riding
icon activities_diving
icon activities_canoe
icon activities_canoe

#Routes
icon_alias routes_kayak activities_kayak
icon_alias routes_horse activities_horse
icon_alias routes_skiing activities_skiing
icon_alias routes_bicycle activities_bicycle
icon_alias routes_trekking activities_trekking
icon_alias routes_pedestrian activities_pedestrian
icon_alias routes_snowmobile activities_snowmobile
icon_alias routes_mountain_bike activities_mountain_bike
icon_alias routes_inline_skates activities_inline_skates
icon_alias routes_running activities_running
icon_alias routes_fitness sport_fitness_station
17 changes: 11 additions & 6 deletions obf_creation/rendering_types.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
<type
tag="" value="" - necessary
minzoom="" - indexed for map section (min zoom)

?additional="true/text" - attach tag/value to another map object
Note: additional="true" is supposed to use with tags that have a limited range of values (to avoid dictionary overflow)
Use additional="true" for: POI type, icon names, category names, text-colors (red,green,blue), etc.
Use additional="text" for: ids, latlon, hex-colors, elevation values, ref, name, description, etc.
?poi - register only for poi (deprecated)
?map - register only for map (deprecated)
?relation - propogate tag from relation objects to
Expand Down Expand Up @@ -1157,13 +1161,14 @@
<type tag="route" value="point" minzoom="3" nameTags="shield_text,ref,name"/>
<type tag="category" additional="true" minzoom="3"/>
<type tag="route_activity_type" additional="true" minzoom="3"/>
<type tag="diff_ele_up" additional="true" minzoom="3"/>
<type tag="diff_ele_down" additional="true" minzoom="3"/>

<type tag="min_ele__start" additional="true" minzoom="3"/>
<type tag="max_ele__start" additional="true" minzoom="3"/>
<type tag="avg_ele__start" additional="true" minzoom="3"/>
<type tag="end_ele__start" additional="true" minzoom="3"/>
<type tag="diff_ele_up" additional="text" minzoom="3"/>
<type tag="diff_ele_down" additional="text" minzoom="3"/>
<type tag="min_ele__start" additional="text" minzoom="3"/>
<type tag="max_ele__start" additional="text" minzoom="3"/>
<type tag="avg_ele__start" additional="text" minzoom="3"/>
<type tag="end_ele__start" additional="text" minzoom="3"/>

<type tag="start_ele" additional="text" minzoom="3"/>
<type tag="ele_graph" additional="text" minzoom="3"/>

Expand Down
25 changes: 13 additions & 12 deletions poi/poi_types.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5322,18 +5322,18 @@
<poi_type name="route_article" tag="route_type" value="article"/>

<!-- OBF-GPX relation route types (convertFromOsmGPXTag) -->
<!-- Name acts as icon not as activity (refers to the icon) -->
<poi_type tag="route_type" value="water" name="activities_kayak"/>
<poi_type tag="route_type" value="riding" name="activities_horse"/>
<poi_type tag="route_type" value="winter" name="activities_skiing"/>
<poi_type tag="route_type" value="cycling" name="activities_bicycle"/>
<poi_type tag="route_type" value="hiking" name="activities_trekking"/>
<poi_type tag="route_type" value="walking" name="activities_pedestrian"/>
<poi_type tag="route_type" value="snowmobile" name="activities_snowmobile"/>
<poi_type tag="route_type" value="mountainbike" name="activities_mountain_bike"/>
<poi_type tag="route_type" value="inline_skates" name="activities_inline_skates"/>
<poi_type tag="route_type" value="running" name="activities_running"/> <!-- TODO copy icon from running -->
<poi_type tag="route_type" value="fitness" name="activities_fitness"/> <!-- TODO copy icon from fitness_station -->
<!-- most routes_ icons are aliased from activities_ icons -->
<poi_type tag="route_type" value="water" name="routes_kayak"/>
<poi_type tag="route_type" value="riding" name="routes_horse"/>
<poi_type tag="route_type" value="winter" name="routes_skiing"/>
<poi_type tag="route_type" value="cycling" name="routes_bicycle"/>
<poi_type tag="route_type" value="hiking" name="routes_trekking"/>
<poi_type tag="route_type" value="walking" name="routes_pedestrian"/>
<poi_type tag="route_type" value="snowmobile" name="routes_snowmobile"/>
<poi_type tag="route_type" value="mountainbike" name="routes_mountain_bike"/>
<poi_type tag="route_type" value="inline_skates" name="routes_inline_skates"/>
<poi_type tag="route_type" value="running" name="routes_running"/>
<poi_type tag="route_type" value="fitness" name="routes_fitness"/> <!-- aliased from fitness_station -->

<poi_type name="route_track" tag="route_type" value="track">
<!-- OBF-GPX track: basic tags -->
Expand Down Expand Up @@ -5398,6 +5398,7 @@
<poi_additional name="color" tag="colour" type="text"/> <!-- global for "routes" category -->
<!-- OBF-GPX track (relation id) / points (node id) -->
<poi_additional name="osm_id" tag="osm_id" type="text"/>
<poi_additional name="relation_gpx" tag="relation_gpx" type="text"/>
</poi_category>
<poi_category name="user_defined_other" default_tag="amenity" no_edit="true" excluded_poi_additional_category="fee,payment_type,wheelchair_accessibility,internet_access_type,opening_hours">
<!-- Add additional combination for UK postcode POI files-->
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions rendering_styles/style-icons/map-icons-svg/mx_routes_horse.svg
24 changes: 24 additions & 0 deletions rendering_styles/style-icons/map-icons-svg/mx_routes_kayak.svg
Loading