From d0cc74a3e2855975019831a8874849201a34870e Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Sun, 6 Dec 2020 16:22:52 +0200
Subject: [PATCH 01/21] layouts/hiking/en: Initial hiking arrangement

---
 layouts/hiking/en.xml | 79 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 layouts/hiking/en.xml

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
new file mode 100644
index 0000000..2c34615
--- /dev/null
+++ b/layouts/hiking/en.xml
@@ -0,0 +1,79 @@
+<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="Surface" targetlayout="surface"/>
+			<button type="page" label="Amenity" targetlayout="amenity"/>
+		</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="Path"/>
+			<button type="tag" label="Track"/>
+			<button type="tag" label="Footway"/>
+		</row>
+		<row>
+			<button type="tag" label="Compacted"/>
+			<button type="tag" label="Gravel"/>
+			<button type="tag" label="Earth"/>
+		</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>
+		<row>
+			<button type="tag" label="SAC hiking"/>
+			<button type="tag" label="SAC mtn hiking"/>
+			<button type="tag" label="Earth"/>
+		</row>
+		<row>
+			<button type="tag" label="Smth = small wheels"/>
+			<button type="tag" label="Smth = racing bike"/>
+			<button type="tag" label="Smth = city bike"/>
+			<button type="tag" label="Smth = mtn bike"/>
+			<button type="tag" label="Smth = car"/>
+		</row>
+		<row>
+			<button type="tag" label="Duckboard start"/>
+			<button type="tag" label="Duckboard end"/>
+			<button type="tag" label="Bridge"/>
+		</row>
+	</layout>
+        <layout name="amenity">
+		<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="Bench"/>
+		</row>
+		<row>
+			<button type="tag" label="Viewpoint"/>
+			<button type="tag" label="Shelter"/>
+			<button type="tag" label="picnic_site"/>
+		</row>
+		<row>
+			<button type="tag" label="Camp site"/>
+			<button type="tag" label="Parking"/>
+			<button type="tag" label="Toilet"/>
+		</row>
+		<row>
+			<button type="tag" label="Firewood"/>
+		</row>
+	</layout>
+</layouts>

From 32856e0846d6fe07ba3b9a273a7df0df51050c9e Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Sun, 6 Dec 2020 16:32:03 +0200
Subject: [PATCH 02/21] layouts/metadata/hiking: add metadata

---
 layouts/metadata/hiking.xml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 layouts/metadata/hiking.xml

diff --git a/layouts/metadata/hiking.xml b/layouts/metadata/hiking.xml
new file mode 100644
index 0000000..a0d7a06
--- /dev/null
+++ b/layouts/metadata/hiking.xml
@@ -0,0 +1,4 @@
+<metadata>
+    <option iso="en" name="English">This layout allows you to map objects related to hiking.</option>
+    <github username="rkdarst" repo="osmtracker-android-layouts" branch="hiking" />
+</metadata>

From 2dd166c50b33bb8426fa37e23253779300bb07ef Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Sun, 6 Dec 2020 17:06:49 +0200
Subject: [PATCH 03/21] layouts/hiking/en: layout updates

---
 layouts/hiking/en.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index 2c34615..674f95d 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -26,6 +26,7 @@
 			<button type="tag" label="Compacted"/>
 			<button type="tag" label="Gravel"/>
 			<button type="tag" label="Earth"/>
+			<button type="tag" label="Asphalt"/>
 		</row>
 		<row>
 			<button type="tag" label="Viz excellent"/>
@@ -36,14 +37,13 @@
 		<row>
 			<button type="tag" label="SAC hiking"/>
 			<button type="tag" label="SAC mtn hiking"/>
-			<button type="tag" label="Earth"/>
+			<button type="tag" label="S= small wheels"/>
 		</row>
 		<row>
-			<button type="tag" label="Smth = small wheels"/>
-			<button type="tag" label="Smth = racing bike"/>
-			<button type="tag" label="Smth = city bike"/>
-			<button type="tag" label="Smth = mtn bike"/>
-			<button type="tag" label="Smth = car"/>
+			<button type="tag" label="S= racing bike"/>
+			<button type="tag" label="S= city bike"/>
+			<button type="tag" label="S= mtn bike"/>
+			<button type="tag" label="S= car"/>
 		</row>
 		<row>
 			<button type="tag" label="Duckboard start"/>
@@ -73,6 +73,7 @@
 			<button type="tag" label="Toilet"/>
 		</row>
 		<row>
+			<button type="tag" label="Fire pit"/>
 			<button type="tag" label="Firewood"/>
 		</row>
 	</layout>

From dfc8d83163ad752974050fd7ff76feb607608db0 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 14 Dec 2020 01:38:42 +0200
Subject: [PATCH 04/21] layouts/hiking/en: Rearrange extra screen

---
 layouts/hiking/en.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index 674f95d..058ffb4 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -60,12 +60,12 @@
 		<row>
 			<button type="tag" label="Info = Map"/>
 			<button type="tag" label="Info = Guidepost"/>
-			<button type="tag" label="Bench"/>
+			<button type="tag" label="Viewpoint"/>
 		</row>
 		<row>
-			<button type="tag" label="Viewpoint"/>
 			<button type="tag" label="Shelter"/>
-			<button type="tag" label="picnic_site"/>
+			<button type="tag" label="Picnic table"/>
+			<button type="tag" label="Bench"/>
 		</row>
 		<row>
 			<button type="tag" label="Camp site"/>

From 9b83b82372247639ec49bec8c73b2b63a67b0b5e Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Tue, 29 Dec 2020 19:34:30 +0200
Subject: [PATCH 05/21] layouts/hiking/en: Adjust buttons

---
 layouts/hiking/en.xml | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index 058ffb4..dfe8c42 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -7,8 +7,8 @@
 		</row>
 		<row>
 			<button type="page" label="Ways" targetlayout="ways"/>
-			<button type="page" label="Surface" targetlayout="surface"/>
 			<button type="page" label="Amenity" targetlayout="amenity"/>
+			<button type="page" label="Ways, extra Amenity" targetlayout="ways-advanced"/>
 		</row>
 	</layout>
         <layout name="ways">
@@ -35,21 +35,17 @@
 			<button type="tag" label="Viz bad"/>
 		</row>
 		<row>
-			<button type="tag" label="SAC hiking"/>
-			<button type="tag" label="SAC mtn hiking"/>
-			<button type="tag" label="S= small wheels"/>
+			<button type="tag" label="SAC1 hiking"/>
+			<button type="tag" label="SAC2 mtn hiking"/>
+			<button type="tag" label="SAC3 difficult mtn"/>
 		</row>
 		<row>
+			<button type="tag" label="S= small wheels"/>
 			<button type="tag" label="S= racing bike"/>
 			<button type="tag" label="S= city bike"/>
 			<button type="tag" label="S= mtn bike"/>
 			<button type="tag" label="S= car"/>
 		</row>
-		<row>
-			<button type="tag" label="Duckboard start"/>
-			<button type="tag" label="Duckboard end"/>
-			<button type="tag" label="Bridge"/>
-		</row>
 	</layout>
         <layout name="amenity">
 		<row>
@@ -60,7 +56,7 @@
 		<row>
 			<button type="tag" label="Info = Map"/>
 			<button type="tag" label="Info = Guidepost"/>
-			<button type="tag" label="Viewpoint"/>
+			<button type="tag" label="Info = Nature"/>
 		</row>
 		<row>
 			<button type="tag" label="Shelter"/>
@@ -73,8 +69,34 @@
 			<button type="tag" label="Toilet"/>
 		</row>
 		<row>
+			<button type="tag" label="Viewpoint"/>
 			<button type="tag" label="Fire pit"/>
 			<button type="tag" label="Firewood"/>
 		</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="END"/>
+			<button type="tag" label="Nothing here"/>
+		</row>
+		<row>
+			<button type="tag" label="Mark 1"/>
+			<button type="tag" label="Mark 2"/>
+		</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="Cycle = yes"/>
+			<button type="tag" label="Horse = yes"/>
+			<button type="tag" label="Ski = yes"/>
+		</row>
+	</layout>
 </layouts>

From 0ae27c5677476d3babe2264885d2ebb84ee90908 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Tue, 29 Dec 2020 19:50:36 +0200
Subject: [PATCH 06/21] add roads, clarify buttons

---
 layouts/hiking/en.xml | 62 ++++++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index dfe8c42..0caffac 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -7,8 +7,11 @@
 		</row>
 		<row>
 			<button type="page" label="Ways" targetlayout="ways"/>
+			<button type="page" label="Ways 2" targetlayout="ways-advanced"/>
 			<button type="page" label="Amenity" targetlayout="amenity"/>
-			<button type="page" label="Ways, extra Amenity" targetlayout="ways-advanced"/>
+		</row>
+		<row>
+			<button type="page" label="Ways, extra Amenity" targetlayout="road"/>
 		</row>
 	</layout>
         <layout name="ways">
@@ -18,33 +21,33 @@
 			<button type="voicerec" icon="logo_voice"/>
 		</row>
 		<row>
-			<button type="tag" label="Path"/>
-			<button type="tag" label="Track"/>
-			<button type="tag" label="Footway"/>
+			<button type="tag" label="Way = Path"/>
+			<button type="tag" label="Way = Track"/>
+			<button type="tag" label="Way = Footway"/>
 		</row>
 		<row>
-			<button type="tag" label="Compacted"/>
-			<button type="tag" label="Gravel"/>
-			<button type="tag" label="Earth"/>
-			<button type="tag" label="Asphalt"/>
+			<button type="tag" label="Surf = Compacted"/>
+			<button type="tag" label="Surf = Gravel"/>
+			<button type="tag" label="Surf = Earth"/>
+			<button type="tag" label="Surf = Asphalt"/>
 		</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"/>
+			<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>
 		<row>
-			<button type="tag" label="SAC1 hiking"/>
-			<button type="tag" label="SAC2 mtn hiking"/>
-			<button type="tag" label="SAC3 difficult mtn"/>
+			<button type="tag" label="Diff = SAC1 hiking"/>
+			<button type="tag" label="Diff = SAC2 mtn hiking"/>
+			<button type="tag" label="Diff = SAC3 difficult mtn"/>
 		</row>
 		<row>
-			<button type="tag" label="S= small wheels"/>
-			<button type="tag" label="S= racing bike"/>
-			<button type="tag" label="S= city bike"/>
-			<button type="tag" label="S= mtn bike"/>
-			<button type="tag" label="S= car"/>
+			<button type="tag" label="Smth = small wheels"/>
+			<button type="tag" label="Smth = racing bike"/>
+			<button type="tag" label="Smth = city bike"/>
+			<button type="tag" label="Smth = mtn bike"/>
+			<button type="tag" label="Smth = car"/>
 		</row>
 	</layout>
         <layout name="amenity">
@@ -57,6 +60,7 @@
 			<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="Shelter"/>
@@ -65,13 +69,13 @@
 		</row>
 		<row>
 			<button type="tag" label="Camp site"/>
-			<button type="tag" label="Parking"/>
-			<button type="tag" label="Toilet"/>
+			<button type="tag" label="Fire pit"/>
+			<button type="tag" label="Firewood"/>
 		</row>
 		<row>
 			<button type="tag" label="Viewpoint"/>
-			<button type="tag" label="Fire pit"/>
-			<button type="tag" label="Firewood"/>
+			<button type="tag" label="Parking"/>
+			<button type="tag" label="Toilet"/>
 		</row>
 	</layout>
         <layout name="ways-advanced">
@@ -99,4 +103,14 @@
 			<button type="tag" label="Ski = yes"/>
 		</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>
 </layouts>

From 8a7160ee8b08c8c90c63af7440a7eb1938b7c13c Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Tue, 29 Dec 2020 20:53:03 +0200
Subject: [PATCH 07/21] layouts/hiking/en: Add left/right side buttons

---
 layouts/hiking/en.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index 0caffac..c3ca2fa 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -13,6 +13,10 @@
 		<row>
 			<button type="page" label="Ways, extra Amenity" targetlayout="road"/>
 		</row>
+		<row>
+			<button type="tag" label="Left side"/>
+			<button type="tag" label="Right side"/>
+		</row>
 	</layout>
         <layout name="ways">
 		<row>

From 4cf61c5049f1d8aeb9c786f967bb52ad6a474b62 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Sun, 3 Jan 2021 21:43:53 +0200
Subject: [PATCH 08/21] layouts/hiking/en: Further adjust layout

- add symbols
- split "along ways" and "surfaces"
- more minor changes
---
 layouts/hiking/en.xml | 95 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 72 insertions(+), 23 deletions(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index c3ca2fa..f45dd88 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -7,16 +7,22 @@
 		</row>
 		<row>
 			<button type="page" label="Ways" targetlayout="ways"/>
-			<button type="page" label="Ways 2" targetlayout="ways-advanced"/>
-			<button type="page" label="Amenity" targetlayout="amenity"/>
+			<button type="page" label="Way surfaces" targetlayout="ways-advanced"/>
+			<button type="page" label="Along ways" targetlayout="along-ways"/>
 		</row>
 		<row>
-			<button type="page" label="Ways, extra Amenity" targetlayout="road"/>
+			<button type="page" label="Sites" targetlayout="sites"/>
+			<button type="page" label="Symbols" targetlayout="symbols"/>
+			<button type="page" label="Roads/transit" targetlayout="road"/>
 		</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>
@@ -46,15 +52,41 @@
 			<button type="tag" label="Diff = SAC2 mtn hiking"/>
 			<button type="tag" label="Diff = SAC3 difficult mtn"/>
 		</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="END"/>
+			<button type="tag" label="Nothing here"/>
+			<button type="tag" label="Connected"/>
+			<button type="tag" label="Separate"/>
+		</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="Cycle = yes"/>
+			<button type="tag" label="Horse = yes"/>
+			<button type="tag" label="Ski = yes"/>
+		</row>
 		<row>
 			<button type="tag" label="Smth = small wheels"/>
 			<button type="tag" label="Smth = racing bike"/>
 			<button type="tag" label="Smth = city bike"/>
 			<button type="tag" label="Smth = mtn bike"/>
+		</row>
+		<row>
+			<button type="tag" label="Smth = no wheels"/>
 			<button type="tag" label="Smth = car"/>
 		</row>
 	</layout>
-        <layout name="amenity">
+        <layout name="along-ways">
 		<row>
 			<button type="picture" icon="logo_camera"/>
 			<button type="textnote" icon="logo_textnote"/>
@@ -67,6 +99,19 @@
 			<button type="tag" label="Info = History"/>
 		</row>
 		<row>
+			<button type="tag" label="Picnic table"/>
+			<button type="tag" label="Bench"/>
+			<button type="tag" label="Viewpoint"/>
+		</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="Shelter"/>
 			<button type="tag" label="Picnic table"/>
 			<button type="tag" label="Bench"/>
@@ -77,44 +122,48 @@
 			<button type="tag" label="Firewood"/>
 		</row>
 		<row>
-			<button type="tag" label="Viewpoint"/>
-			<button type="tag" label="Parking"/>
 			<button type="tag" label="Toilet"/>
 		</row>
 	</layout>
-        <layout name="ways-advanced">
+        <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="END"/>
-			<button type="tag" label="Nothing here"/>
+			<button type="tag" label="Parking"/>
 		</row>
+	</layout>
+        <layout name="symbols">
 		<row>
-			<button type="tag" label="Mark 1"/>
-			<button type="tag" label="Mark 2"/>
+			<button type="picture" icon="logo_camera"/>
+			<button type="textnote" icon="logo_textnote"/>
+			<button type="voicerec" icon="logo_voice"/>
 		</row>
 		<row>
-			<button type="tag" label="Stairs Start"/>
-			<button type="tag" label="Bridge Start"/>
-			<button type="tag" label="Duckboard start"/>
+			<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="Cycle = yes"/>
-			<button type="tag" label="Horse = yes"/>
-			<button type="tag" label="Ski = yes"/>
+			<button type="tag" label="Red"/>
+			<button type="tag" label="White"/>
+			<button type="tag" label="Yellow"/>
+			<button type="tag" label=""/>
 		</row>
-	</layout>
-        <layout name="road">
 		<row>
-			<button type="picture" icon="logo_camera"/>
-			<button type="textnote" icon="logo_textnote"/>
-			<button type="voicerec" icon="logo_voice"/>
+			<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="Parking"/>
+			<button type="tag" label="Circle"/>
+			<button type="tag" label="H line through"/>
+			<button type="tag" label=""/>
+			<button type="tag" label=""/>
 		</row>
 	</layout>
 </layouts>

From 3003f9e1d86d470719a30d154d2c0e29b3680d76 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 2 Aug 2021 00:07:03 +0300
Subject: [PATCH 09/21] Add "water" category

---
 layouts/hiking/en.xml       | 30 ++++++++++++++++++++++++++++++
 layouts/metadata/hiking.xml |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index f45dd88..14efc7c 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -14,6 +14,7 @@
 			<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"/>
@@ -135,6 +136,35 @@
 			<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"/>
+		</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"/>
+		</row>
+	</layout>
         <layout name="symbols">
 		<row>
 			<button type="picture" icon="logo_camera"/>
diff --git a/layouts/metadata/hiking.xml b/layouts/metadata/hiking.xml
index a0d7a06..b0043a8 100644
--- a/layouts/metadata/hiking.xml
+++ b/layouts/metadata/hiking.xml
@@ -1,4 +1,4 @@
 <metadata>
-    <option iso="en" name="English">This layout allows you to map objects related to hiking.</option>
+    <option iso="en" name="English">This layout allows you to map objects related to hiking and outdoors.</option>
     <github username="rkdarst" repo="osmtracker-android-layouts" branch="hiking" />
 </metadata>

From 980a0f8ef0c310cb72662c97cf783dd7028c05e3 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 2 Aug 2021 00:12:42 +0300
Subject: [PATCH 10/21] hiking: Add some rock-related stuff

---
 layouts/hiking/en.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index 14efc7c..085dd48 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -104,6 +104,9 @@
 			<button type="tag" label="Bench"/>
 			<button type="tag" label="Viewpoint"/>
 		</row>
+		<row>
+			<button type="tag" label="Cliff"/>
+		</row>
 	</layout>
         <layout name="sites">
 		<row>
@@ -125,6 +128,11 @@
 		<row>
 			<button type="tag" label="Toilet"/>
 		</row>
+		<row>
+			<button type="tag" label="Stone (detached)"/>
+			<button type="tag" label="Rock"/>
+			<button type="tag" label="Cliff"/>
+		</row>
 	</layout>
         <layout name="road">
 		<row>

From b623a62969d4738c0adadc1ddd9fa1c856037468 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 2 Aug 2021 00:35:32 +0300
Subject: [PATCH 11/21] layouts/hiking/en: Rearrangements and improvements
 throughout

---
 layouts/hiking/en.xml | 50 +++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index 085dd48..ce13864 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -37,10 +37,20 @@
 			<button type="tag" label="Way = Footway"/>
 		</row>
 		<row>
-			<button type="tag" label="Surf = Compacted"/>
-			<button type="tag" label="Surf = Gravel"/>
-			<button type="tag" label="Surf = Earth"/>
-			<button type="tag" label="Surf = Asphalt"/>
+			<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"/>
@@ -48,11 +58,6 @@
 			<button type="tag" label="Viz = intermediate"/>
 			<button type="tag" label="Viz = bad"/>
 		</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="ways-advanced">
 		<row>
@@ -61,20 +66,11 @@
 			<button type="voicerec" icon="logo_voice"/>
 		</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="Stairs Start"/>
-			<button type="tag" label="Bridge Start"/>
-			<button type="tag" label="Duckboard start"/>
-		</row>
-		<row>
-			<button type="tag" label="Cycle = yes"/>
-			<button type="tag" label="Horse = yes"/>
-			<button type="tag" label="Ski = yes"/>
+			<button type="tag" label="Surf = Asphalt"/>
+			<button type="tag" label="Surf = Compacted"/>
+			<button type="tag" label="Surf = Fine Grv"/>
+			<button type="tag" label="Surf = Gravel"/>
+			<button type="tag" label="Surf = Earth"/>
 		</row>
 		<row>
 			<button type="tag" label="Smth = small wheels"/>
@@ -86,6 +82,11 @@
 			<button type="tag" label="Smth = no wheels"/>
 			<button type="tag" label="Smth = car"/>
 		</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>
@@ -103,6 +104,7 @@
 			<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"/>
@@ -127,6 +129,7 @@
 		</row>
 		<row>
 			<button type="tag" label="Toilet"/>
+			<button type="tag" label="Trash"/>
 		</row>
 		<row>
 			<button type="tag" label="Stone (detached)"/>
@@ -171,6 +174,7 @@
 			<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">

From 8158e34d102492e0e477324407c72b4d0e140002 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 2 Aug 2021 00:37:36 +0300
Subject: [PATCH 12/21] layouts/hiking/en: Adjust labels to fit buttons

---
 layouts/hiking/en.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index ce13864..6fad325 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -66,21 +66,21 @@
 			<button type="voicerec" icon="logo_voice"/>
 		</row>
 		<row>
-			<button type="tag" label="Surf = Asphalt"/>
-			<button type="tag" label="Surf = Compacted"/>
-			<button type="tag" label="Surf = Fine Grv"/>
-			<button type="tag" label="Surf = Gravel"/>
-			<button type="tag" label="Surf = Earth"/>
+			<button type="tag" label="Su= Asphalt"/>
+			<button type="tag" label="Su= Compacted"/>
+			<button type="tag" label="Su= Fine Grv"/>
+			<button type="tag" label="Su= Gravel"/>
+			<button type="tag" label="Su= Earth"/>
 		</row>
 		<row>
-			<button type="tag" label="Smth = small wheels"/>
-			<button type="tag" label="Smth = racing bike"/>
-			<button type="tag" label="Smth = city bike"/>
-			<button type="tag" label="Smth = mtn bike"/>
+			<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="Smth = no wheels"/>
-			<button type="tag" label="Smth = car"/>
+			<button type="tag" label="Sm= no wheels"/>
+			<button type="tag" label="Sm= car"/>
 		</row>
 		<row>
 			<button type="tag" label="Diff = SAC1 hiking"/>

From ad7bb1eb18f73bee49622708740614c1de4de08e Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 2 Aug 2021 22:44:05 +0300
Subject: [PATCH 13/21] layouts/hiking/en: Adjust surface=earth to avoid row of
 five

---
 layouts/hiking/en.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index 6fad325..6e6b29e 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -70,13 +70,13 @@
 			<button type="tag" label="Su= Compacted"/>
 			<button type="tag" label="Su= Fine Grv"/>
 			<button type="tag" label="Su= Gravel"/>
-			<button type="tag" label="Su= Earth"/>
 		</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"/>
+			<button type="tag" label="Su= Earth"/>
 		</row>
 		<row>
 			<button type="tag" label="Sm= no wheels"/>

From ba5b435ec7531e015665187a781a246238cdc149 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 4 Oct 2021 15:21:18 +0300
Subject: [PATCH 14/21] layouts/hiking/en: rearrange ways, avoid overflowing
 roles

---
 layouts/hiking/en.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index 6e6b29e..6aa2eaf 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -68,6 +68,10 @@
 		<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>
@@ -76,11 +80,10 @@
 			<button type="tag" label="Sm= racing bike"/>
 			<button type="tag" label="Sm= city bike"/>
 			<button type="tag" label="Sm= mtn bike"/>
-			<button type="tag" label="Su= Earth"/>
 		</row>
 		<row>
-			<button type="tag" label="Sm= no wheels"/>
 			<button type="tag" label="Sm= car"/>
+			<button type="tag" label="Sm= no wheels"/>
 		</row>
 		<row>
 			<button type="tag" label="Diff = SAC1 hiking"/>

From 2031121f5d91477341b0d100c9839e540d93af06 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 4 Oct 2021 15:22:49 +0300
Subject: [PATCH 15/21] layouts/hiking/en: emojis for symbols

---
 layouts/hiking/en.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index 6aa2eaf..8da8a3f 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -187,26 +187,26 @@
 			<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"/>
+			<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="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"/>
+			<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="Circle ○"/>
+			<button type="tag" label="H line through ─"/>
 			<button type="tag" label=""/>
 			<button type="tag" label=""/>
 		</row>

From 542cf54bb762417cec1569d6d0cfb7adf66a9b1a Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Sun, 2 Jan 2022 23:35:32 +0200
Subject: [PATCH 16/21] layouts/hiking/en: Small updates based on needs

---
 layouts/hiking/en.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index 8da8a3f..d33b7b5 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -121,16 +121,19 @@
 		</row>
 		<row>
 
-			<button type="tag" label="Shelter"/>
-			<button type="tag" label="Picnic table"/>
-			<button type="tag" label="Bench"/>
+			<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="Camp site"/>
+			<button type="tag" label="Picnic table"/>
+			<button type="tag" label="Bench"/>
 			<button type="tag" label="Fire pit"/>
-			<button type="tag" label="Firewood"/>
+			<button type="tag" label="Grill spot"/>
 		</row>
 		<row>
+			<button type="tag" label="Firewood"/>
 			<button type="tag" label="Toilet"/>
 			<button type="tag" label="Trash"/>
 		</row>
@@ -166,6 +169,7 @@
 			<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"/>

From ee70ec8cc7c1db079a47b1fb3b2b971501a8dba1 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Sun, 2 Jan 2022 23:45:19 +0200
Subject: [PATCH 17/21] layouts/metadata/hiking: Update layout description

---
 layouts/metadata/hiking.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/metadata/hiking.xml b/layouts/metadata/hiking.xml
index b0043a8..6ab6192 100644
--- a/layouts/metadata/hiking.xml
+++ b/layouts/metadata/hiking.xml
@@ -1,4 +1,4 @@
 <metadata>
-    <option iso="en" name="English">This layout allows you to map objects related to hiking and outdoors.</option>
+    <option iso="en" name="English">Hiking and camping POIs and general movement in nature.</option>
     <github username="rkdarst" repo="osmtracker-android-layouts" branch="hiking" />
 </metadata>

From 23b7a456c2418ac97c331b9e14f6242bfb9f9fbc Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 3 Jan 2022 00:01:29 +0200
Subject: [PATCH 18/21] layouts/hiking/README: Add basic readme

---
 layouts/hiking/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 layouts/hiking/README.md

diff --git a/layouts/hiking/README.md b/layouts/hiking/README.md
new file mode 100644
index 0000000..d53c6fd
--- /dev/null
+++ b/layouts/hiking/README.md
@@ -0,0 +1,14 @@
+# 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 .

From 6b7e476fef28927df62add2b13d7736aff901dfc Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 9 May 2022 01:02:43 +0300
Subject: [PATCH 19/21] layouts/hiking/en: Symbols: add triangle and (no
 symbol)

---
 layouts/hiking/en.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/hiking/en.xml b/layouts/hiking/en.xml
index d33b7b5..8f36a6e 100644
--- a/layouts/hiking/en.xml
+++ b/layouts/hiking/en.xml
@@ -211,8 +211,8 @@
 		<row>
 			<button type="tag" label="Circle ○"/>
 			<button type="tag" label="H line through ─"/>
-			<button type="tag" label=""/>
-			<button type="tag" label=""/>
+			<button type="tag" label="Triangle △"/>
+			<button type="tag" label="(no symbol)"/>
 		</row>
 	</layout>
 </layouts>

From 068377e8eb48a4a4c30c1124392bfc42179ce409 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 9 May 2022 10:18:48 +0300
Subject: [PATCH 20/21] layouts/hiking/README: Include note about upstream
 location

- It may have further updates
---
 layouts/hiking/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layouts/hiking/README.md b/layouts/hiking/README.md
index d53c6fd..adea936 100644
--- a/layouts/hiking/README.md
+++ b/layouts/hiking/README.md
@@ -11,4 +11,5 @@ The basic idea:
 - Water
 - Roads (mainly focused on trailheads)
 
-Maintainer: @rkdarst .
+Maintainer: @rkdarst .  There may be further updates at
+https://github.com/rkdarst/osmtracker-android-layouts .

From 065394c928be2ba906cd3b40d7a50663ce731519 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Mon, 9 May 2022 10:12:51 +0300
Subject: [PATCH 21/21] layouts/metadata/hiking: Adjust URL for upstream repo
 (UPSTREAM)

---
 layouts/metadata/hiking.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layouts/metadata/hiking.xml b/layouts/metadata/hiking.xml
index 6ab6192..ed771ce 100644
--- a/layouts/metadata/hiking.xml
+++ b/layouts/metadata/hiking.xml
@@ -1,4 +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="rkdarst" repo="osmtracker-android-layouts" branch="hiking" />-->
+    <github username="labexp" repo="osmtracker-android-layouts" branch="master" />
 </metadata>