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

Hiking and outdoor layout #38

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d0cc74a
layouts/hiking/en: Initial hiking arrangement
rkdarst Dec 6, 2020
32856e0
layouts/metadata/hiking: add metadata
rkdarst Dec 6, 2020
2dd166c
layouts/hiking/en: layout updates
rkdarst Dec 6, 2020
dfc8d83
layouts/hiking/en: Rearrange extra screen
rkdarst Dec 13, 2020
9b83b82
layouts/hiking/en: Adjust buttons
rkdarst Dec 29, 2020
0ae27c5
add roads, clarify buttons
rkdarst Dec 29, 2020
8a7160e
layouts/hiking/en: Add left/right side buttons
rkdarst Dec 29, 2020
4cf61c5
layouts/hiking/en: Further adjust layout
rkdarst Jan 3, 2021
3003f9e
Add "water" category
rkdarst Aug 1, 2021
980a0f8
hiking: Add some rock-related stuff
rkdarst Aug 1, 2021
b623a62
layouts/hiking/en: Rearrangements and improvements throughout
rkdarst Aug 1, 2021
8158e34
layouts/hiking/en: Adjust labels to fit buttons
rkdarst Aug 1, 2021
ad7bb1e
layouts/hiking/en: Adjust surface=earth to avoid row of five
rkdarst Aug 2, 2021
ba5b435
layouts/hiking/en: rearrange ways, avoid overflowing roles
rkdarst Oct 4, 2021
2031121
layouts/hiking/en: emojis for symbols
rkdarst Oct 4, 2021
542cf54
layouts/hiking/en: Small updates based on needs
rkdarst Jan 2, 2022
ee70ec8
layouts/metadata/hiking: Update layout description
rkdarst Jan 2, 2022
23b7a45
layouts/hiking/README: Add basic readme
rkdarst Jan 2, 2022
6b7e476
layouts/hiking/en: Symbols: add triangle and (no symbol)
rkdarst May 8, 2022
068377e
layouts/hiking/README: Include note about upstream location
rkdarst May 9, 2022
065394c
layouts/metadata/hiking: Adjust URL for upstream repo (UPSTREAM)
rkdarst May 9, 2022
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: 15 additions & 0 deletions layouts/hiking/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Hiking layout

This layout is for hiking in nature in semi-developed areas (and
perhaps is useful for other foot travel). It has properties of both
trails and other infrastructure (signs, picnic, fires, shelters, etc).

The basic idea:
- Basic types of ways
- Additional properties of ways (surfaces, difficulty, symbols)
- Things along the way (while walking, and also sites)
- Water
- Roads (mainly focused on trailheads)

Maintainer: @rkdarst . There may be further updates at
https://github.com/rkdarst/osmtracker-android-layouts .
218 changes: 218 additions & 0 deletions layouts/hiking/en.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
<layouts>
<layout name="root">
<row>
<button type="picture" icon="logo_camera"/>
<button type="textnote" icon="logo_textnote"/>
<button type="voicerec" icon="logo_voice"/>
</row>
<row>
<button type="page" label="Ways" targetlayout="ways"/>
<button type="page" label="Way surfaces" targetlayout="ways-advanced"/>
<button type="page" label="Along ways" targetlayout="along-ways"/>
</row>
<row>
<button type="page" label="Sites" targetlayout="sites"/>
<button type="page" label="Symbols" targetlayout="symbols"/>
<button type="page" label="Roads/transit" targetlayout="road"/>
<button type="page" label="Water" targetlayout="water"/>
</row>
<row>
<button type="tag" label="Left side"/>
<button type="tag" label="Right side"/>
</row>
<row>
<button type="tag" label="Mark 1"/>
<button type="tag" label="Mark 2"/>
</row>
</layout>
<layout name="ways">
<row>
<button type="picture" icon="logo_camera"/>
<button type="textnote" icon="logo_textnote"/>
<button type="voicerec" icon="logo_voice"/>
</row>
<row>
<button type="tag" label="Way = Path"/>
<button type="tag" label="Way = Track"/>
<button type="tag" label="Way = Footway"/>
</row>
<row>
<button type="tag" label="Stairs Start"/>
<button type="tag" label="Bridge Start"/>
<button type="tag" label="Duckboard start"/>
</row>
<row>
<button type="tag" label="END"/>
<button type="tag" label="Nothing here"/>
<button type="tag" label="Connected"/>
<button type="tag" label="Separate"/>
</row>
<row>
<button type="tag" label="Cycle = yes"/>
<button type="tag" label="Horse = yes"/>
<button type="tag" label="Ski = yes"/>
</row>
<row>
<button type="tag" label="Viz = excellent"/>
<button type="tag" label="Viz = good"/>
<button type="tag" label="Viz = intermediate"/>
<button type="tag" label="Viz = bad"/>
</row>
</layout>
<layout name="ways-advanced">
<row>
<button type="picture" icon="logo_camera"/>
<button type="textnote" icon="logo_textnote"/>
<button type="voicerec" icon="logo_voice"/>
</row>
<row>
<button type="tag" label="Su= Asphalt"/>
<button type="tag" label="Su= Compacted"/>
<button type="tag" label="Su= Earth"/>
</row>
<row>
<button type="tag" label="Su= Rock"/>
<button type="tag" label="Su= Fine Grv"/>
<button type="tag" label="Su= Gravel"/>
</row>
<row>
<button type="tag" label="Sm= small wheels"/>
<button type="tag" label="Sm= racing bike"/>
<button type="tag" label="Sm= city bike"/>
<button type="tag" label="Sm= mtn bike"/>
</row>
<row>
<button type="tag" label="Sm= car"/>
<button type="tag" label="Sm= no wheels"/>
</row>
<row>
<button type="tag" label="Diff = SAC1 hiking"/>
<button type="tag" label="Diff = SAC2 mtn hiking"/>
<button type="tag" label="Diff = SAC3 difficult mtn"/>
</row>
</layout>
<layout name="along-ways">
<row>
<button type="picture" icon="logo_camera"/>
<button type="textnote" icon="logo_textnote"/>
<button type="voicerec" icon="logo_voice"/>
</row>
<row>
<button type="tag" label="Info = Map"/>
<button type="tag" label="Info = Guidepost"/>
<button type="tag" label="Info = Nature"/>
<button type="tag" label="Info = History"/>
</row>
<row>
<button type="tag" label="Picnic table"/>
<button type="tag" label="Bench"/>
<button type="tag" label="Viewpoint"/>
<button type="tag" label="Trash"/>
</row>
<row>
<button type="tag" label="Cliff"/>
</row>
</layout>
<layout name="sites">
<row>
<button type="picture" icon="logo_camera"/>
<button type="textnote" icon="logo_textnote"/>
<button type="voicerec" icon="logo_voice"/>
</row>
<row>

<button type="tag" label="Picnic shelter"/>
<button type="tag" label="Lean-to"/>
<button type="tag" label="Basic hut"/>
<button type="tag" label="Camp site"/>
</row>
<row>
<button type="tag" label="Picnic table"/>
<button type="tag" label="Bench"/>
<button type="tag" label="Fire pit"/>
<button type="tag" label="Grill spot"/>
</row>
<row>
<button type="tag" label="Firewood"/>
<button type="tag" label="Toilet"/>
<button type="tag" label="Trash"/>
</row>
<row>
<button type="tag" label="Stone (detached)"/>
<button type="tag" label="Rock"/>
<button type="tag" label="Cliff"/>
</row>
</layout>
<layout name="road">
<row>
<button type="picture" icon="logo_camera"/>
<button type="textnote" icon="logo_textnote"/>
<button type="voicerec" icon="logo_voice"/>
</row>
<row>
<button type="tag" label="Parking"/>
</row>
</layout>
<layout name="water">
<row>
<button type="picture" icon="logo_camera"/>
<button type="textnote" icon="logo_textnote"/>
<button type="voicerec" icon="logo_voice"/>
</row>
<row>
<button type="tag" label="Stream"/>
<button type="tag" label="Canal"/>
<button type="tag" label="Drain"/>
<button type="tag" label="Ditch"/>
</row>
<row>
<button type="tag" label="Nothing"/>
<button type="tag" label="Intermittent"/>
<button type="tag" label="Intermittent=no"/>
<button type="tag" label="Life ring"/>
</row>
<row>
<button type="tag" label="Dock"/>
<button type="tag" label="Dam"/>
<button type="tag" label="Weir"/>
<button type="tag" label="Waterfall"/>
</row>
<row>
<button type="tag" label="Marina"/>
<button type="tag" label="Fuel"/>
<button type="tag" label="Water point"/>
<button type="tag" label="Septic"/>
</row>
</layout>
<layout name="symbols">
<row>
<button type="picture" icon="logo_camera"/>
<button type="textnote" icon="logo_textnote"/>
<button type="voicerec" icon="logo_voice"/>
</row>
<row>
<button type="tag" label="Blue 🟦"/>
<button type="tag" label="Green 🟩"/>
<button type="tag" label="Orange 🟧"/>
<button type="tag" label="Purple 🟪"/>
</row>
<row>
<button type="tag" label="Red 🟥"/>
<button type="tag" label="White ⬜"/>
<button type="tag" label="Yellow 🟨"/>
<button type="tag" label=""/>
</row>
<row>
<button type="tag" label="Diamond ◇"/>
<button type="tag" label="Square □"/>
<button type="tag" label="V bar ▯"/>
<button type="tag" label="H bar ▭"/>
</row>
<row>
<button type="tag" label="Circle ○"/>
<button type="tag" label="H line through ─"/>
<button type="tag" label="Triangle △"/>
<button type="tag" label="(no symbol)"/>
</row>
</layout>
</layouts>
5 changes: 5 additions & 0 deletions layouts/metadata/hiking.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<metadata>
<option iso="en" name="English">Hiking and camping POIs and general movement in nature.</option>
<!--<github username="rkdarst" repo="osmtracker-android-layouts" branch="hiking" />-->
<github username="labexp" repo="osmtracker-android-layouts" branch="master" />
</metadata>