dev #160

Merged
sora merged 97 commits from dev into master 2025-03-02 01:09:30 +01:00
Showing only changes of commit 50a98b9a31 - Show all commits

View File

@ -1,6 +1,7 @@
l-map( l-map(
:zoom.sync="journey.data.main[idx].map.zoom",
:center.sync="journey.data.main[idx].map.center", :zoom.sync="journey.leg_get().map.zoom",
:center.sync="journey.leg_get().map.center",
style="padding-top: 100%" style="padding-top: 100%"
ref="map" ref="map"
) )
@ -9,6 +10,12 @@ l-map(
attribution="© <a href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors" attribution="© <a href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors"
) )
l-control-scale(position="topright", :imperial="false", :metric="true") l-control-scale(position="topright", :imperial="false", :metric="true")
l-marker(
v-if="map_override.active",
:lat-lng="map_override.center"
)
l-icon(v-html="generate_marker('plus', 'darkgreen')")
l-marker( l-marker(
v-if="journey.data.main[idx].hotel", v-if="journey.data.main[idx].hotel",
:lat-lng="journey.data.main[idx].hotel.latlon" :lat-lng="journey.data.main[idx].hotel.latlon"
@ -17,8 +24,8 @@ l-map(
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 }}
span(v-if="journey_edit") span(v-if="edit_active")
.row.input .row.input(style="margin-bottom:0;")
textarea-autosize.col-12.col-sm-12.text-small( textarea-autosize.col-12.col-sm-12.text-small(
placeholder="Notes", placeholder="Notes",
v-model="journey.data.main[idx].hotel.notes", v-model="journey.data.main[idx].hotel.notes",
@ -39,12 +46,12 @@ l-map(
v-else-if="place.step == -1 || place.step == undefined", v-else-if="place.step == -1 || place.step == undefined",
v-html="generate_marker(place, 'gray')" v-html="generate_marker(place, 'gray')"
) )
l-icon(v-else-if="journey_edit", v-html="generate_marker(place, 'lightgray')") l-icon(v-else-if="edit_active", v-html="generate_marker(place, 'lightgray')")
l-icon(v-else) l-icon(v-else)
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 }}
span(v-if="journey_edit") span(v-if="edit_active")
.row.input .row.input
textarea-autosize.col-12.col-sm-12.text-small( textarea-autosize.col-12.col-sm-12.text-small(
placeholder="Notes", placeholder="Notes",
@ -72,7 +79,7 @@ l-map(
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 }}
span(v-if="journey_edit") span(v-if="edit_active")
.row.input .row.input
textarea-autosize.col-12.col-sm-12.text-small( textarea-autosize.col-12.col-sm-12.text-small(
placeholder="Notes" placeholder="Notes"
@ -82,11 +89,11 @@ l-map(
) )
span.row.text-small.text-dark(v-else) {{ place.notes }} span.row.text-small.text-dark(v-else) {{ place.notes }}
div(v-for= "latlngs in polyline.latlngs") div(v-for= "travel in journey.data.main[idx].travel")
l-polyline(:lat-lngs="polyline.latlngs" :color="polyline.color") l-polyline(:lat-lngs="travel.path" :color="travel.color || 'gray'")
l-marker( l-marker(
v-for="(place, index) in latlngs" v-for="(place, index) in travel.path"
:key="'plane'+index" :key="'plane'+index"
:lat-lng="place" :lat-lng="place"
) )
l-icon(v-html="generate_icon('plane', polyline.color, generate_rotation(index,latlngs))") l-icon(v-html="generate_icon('plane', travel.color || 'gray', generate_rotation(index,travel.path))")