From f63085bef7fbbf756852dfa4559f0cc08b06da63 Mon Sep 17 00:00:00 2001
From: choelzl <cedric.hoelzl@helcel.net>
Date: Fri, 16 Jul 2021 19:03:55 +0200
Subject: [PATCH] cleanup

---
 public/js/main.js            | 10 ++++++----
 public/template/journey.html | 25 +++++++++++++++++--------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/public/js/main.js b/public/js/main.js
index 887184c..979240a 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -37,11 +37,11 @@ const icon_type = (item)=>{
         return 'bed';
     }else if(t=='museum'){
         return 'landmark';
-    }else if(t=='peak'){
+    }else if(t=='peak' || t=='viewpoint'){
         return 'mountain';
     }else if(t=='parking'){
         return 'parking';
-    }else if(t=='water' || t=='river'){
+    }else if(t=='water' || t=='river' || t=='lake' || t=='torrent'){
         return 'water';
     }else if(t=='community_centre'){
         return 'building';
@@ -51,9 +51,11 @@ const icon_type = (item)=>{
         return 'landmark';
     }else if(t=='bridge'){
         return 'archway';
-    }else if(t=='a'){
+    }else if(t=='woodland'|| t=='shieling'){
+        return 'tree';
+    }else if(t=='?'){
         return '';
-    }else if(t=='a'){
+    }else if(t=='?'){
         return '';
     }else{
         console.log(item.category, item.type);
diff --git a/public/template/journey.html b/public/template/journey.html
index bc3ff27..49d6dc7 100644
--- a/public/template/journey.html
+++ b/public/template/journey.html
@@ -54,7 +54,7 @@
                 <div v-for="(item,idx) in journey_data.main" :class="idx%2===0 ? 'bg-dark text-white' : ''" v-cloak>
                     <div class="container section">
                         <div class="row text-center">
-                                <div class="col-sm-1"><button class="button button--secondary button--mobileFull" v-on:click="rm_section(idx)">X</button></div>
+                                <div class="col-auto"><button class="button button--secondary button--mobileFull" v-on:click="rm_section(idx)">X</button></div>
                                 <div class="input col-sm-4"><input class="" v-model="item.title" type="text" /></div>
                             
                         </div>
@@ -234,9 +234,9 @@
                                             <l-popup>
                                                 <h1 class="row text-medium text-center">{{place.sname}}</h1>
                                                 <span class="row text-small text-gray">{{place.display_name}}</span>
-                                                <div class="row">
+                                                <div class="row input">
                                                     <textarea-autosize
-                                                        class="col-12 col-sm-10"
+                                                        class="col-12 col-sm-10 text-small"
                                                         placeholder="Notes"
                                                         v-model="place.notes"
                                                         :min-height="30"
@@ -253,9 +253,9 @@
                                             <l-popup>
                                                 <h1 class="row text-medium text-center">{{place.sname}}</h1>
                                                 <span class="row text-small text-gray">{{place.display_name}}</span>
-                                                <div class="row">
+                                                <div class="row input">
                                                     <textarea-autosize
-                                                        class="col-12 col-sm-10"
+                                                        class="col-12 col-sm-10 text-small"
                                                         placeholder="Notes"
                                                         v-model="place.notes"
                                                         :min-height="30"
@@ -272,9 +272,9 @@
                                             <l-popup>
                                                 <h1 class="row text-medium text-center">{{place.sname}}</h1>
                                                 <span class="row text-small text-gray">{{place.display_name}}</span>
-                                                <div class="row">
+                                                <div class="row input">
                                                     <textarea-autosize
-                                                        class="col-12 col-sm-10"
+                                                        class="col-12 col-sm-10 text-small"
                                                         placeholder="Notes"
                                                         v-model="place.notes"
                                                         :min-height="30"
@@ -291,7 +291,6 @@
                                             <l-popup>
                                                 <h1 class="row text-medium text-center">{{place.sname}}</h1>
                                                 <span class="row text-small text-gray">{{place.display_name}}</span>
-                                                
                                             </l-popup>
                                         </div>
                                     </l-marker>
@@ -386,6 +385,16 @@
                                         <span class="row text-small text-white">{{place.notes}}</span>
                                     </l-popup>
                                 </l-marker>
+                                <l-marker v-for="place in journey_data.main[journey_step_data.section].places.activities" :lat-lng="place.latlon" v-if="place.step==undefined || place.step==-1" >
+                                    <l-icon>
+                                        <div v-html="generate_icon(place,'gray')"></div>
+                                    </l-icon>
+                                    <l-popup>
+                                        <h1 class="row text-medium text-center">{{place.sname}}</h1>
+                                        <span class="row text-small text-gray">{{place.display_name}}</span>
+                                        <span class="row text-small text-white">{{place.notes}}</span>
+                                    </l-popup>
+                                </l-marker>
                                 <l-marker v-for="place in journey_data.main[journey_step_data.section].places.restaurants" :lat-lng.sync="place.latlon">
                                     <l-icon>
                                         <div v-html="generate_icon(place,'cadetblue')"></div>