sora/OTM
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

dev #160

Merged
sora merged 97 commits from dev into master 2025-03-02 01:09:30 +01:00
Conversation 0 Commits 97 Files Changed 67 +14 -7
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f5b9ad05c7 - Show all commits

21
template/module/map.pug
View File

@ -14,7 +14,7 @@ l-map(
:lat-lng="journey.data.main[idx].hotel.latlon" :lat-lng="journey.data.main[idx].hotel.latlon"
) )
l-icon l-icon
div(v-html="generate_icon(journey.data.main[idx].hotel, 'darkblue')") div(v-html="generate_marker(journey.data.main[idx].hotel, 'darkblue')")
l-popup l-popup
h1.row.text-medium.text-center {{ journey.data.main[idx].hotel.sname }} h1.row.text-medium.text-center {{ journey.data.main[idx].hotel.sname }}
span.row.text-small.text-gray {{ journey.data.main[idx].hotel.display_name }} span.row.text-small.text-gray {{ journey.data.main[idx].hotel.display_name }}
@ -34,13 +34,13 @@ l-map(
l-icon l-icon
div( div(
v-if="place.step == journey.sel_day", v-if="place.step == journey.sel_day",
v-html="generate_icon(place)" v-html="generate_marker(place)"
) )
div( div(
v-else-if="place.step == -1 || place.step == undefined", v-else-if="place.step == -1 || place.step == undefined",
v-html="generate_icon(place, 'gray')" v-html="generate_marker(place, 'gray')"
) )
div(v-else-if="journey_edit", v-html="generate_icon(place, 'lightgray')") div(v-else-if="journey_edit", v-html="generate_marker(place, 'lightgray')")
div(v-else) div(v-else)
l-popup l-popup
h1.row.text-medium.text-center {{ place.sname }} h1.row.text-medium.text-center {{ place.sname }}
@ -66,10 +66,10 @@ l-map(
span.row.text-small.text-dark(v-else) {{ place.notes }} span.row.text-small.text-dark(v-else) {{ place.notes }}
l-marker( l-marker(
v-for="place in journey.data.main[idx].places.restaurants", v-for="place in journey.data.main[idx].places.restaurants",
:lat-lng.sync="place.latlon" :lat-lng="place.latlon"
) )
l-icon l-icon
div(v-html="generate_icon(place, 'cadetblue')") div(v-html="generate_marker(place, 'cadetblue')")
l-popup l-popup
h1.row.text-medium.text-center {{ place.sname }} h1.row.text-medium.text-center {{ place.sname }}
span.row.text-small.text-gray {{ place.display_name }} span.row.text-small.text-gray {{ place.display_name }}
@ -83,4 +83,11 @@ l-map(
) )
span.row.text-small.text-dark(v-else) {{ place.notes }} span.row.text-small.text-dark(v-else) {{ place.notes }}
l-polyline(:lat-lngs="polyline.latlngs" :color="polyline.color") div(v-for= "latlngs in polyline.latlngs")
l-polyline(:lat-lngs="polyline.latlngs" :color="polyline.color")
l-marker(
v-for="(place, index) in latlngs",
:lat-lng="place"
)
l-icon
div(v-html="generate_icon('plane', polyline.color, generate_rotation(index,latlngs))")