From 6a14c2b9b36494fdf974d5bb9f06e4b5285619a3 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 12 Dec 2022 16:37:06 +0100 Subject: [PATCH] Fixed: [vue][add-address] fix map center when editing existing address https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/674 --- .../vuejs/Address/components/AddAddress/AddressMap.vue | 9 ++++++++- .../Address/components/AddAddress/AddressSelection.vue | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue index 2422dfdce..cbb8cb0c7 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue @@ -19,7 +19,7 @@ export default { }, computed: { center() { - return this.entity.selected.addressMap.center; + return this.entity.addressMap.center; }, }, methods:{ @@ -41,10 +41,17 @@ export default { this.marker.addTo(this.map); }, update() { +/*<<<<<<< HEAD //console.log('update map with : ', this.entity.addressMap.center) if (this.marker && this.entity.addressMap.center) { this.marker.setLatLng(this.entity.addressMap.center); this.map.setView(this.entity.addressMap.center, this.entity.addressMap.zoom); +=======*/ + console.log('update map with : ', this.center) + if (this.marker && this.center) { + this.marker.setLatLng(this.center); + this.map.setView(this.center, 15); +//>>>>>>> 52512e45f (Fixed: [vue][add-address] fix map center when editing existing address) } } }, diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue index 2c8e17687..bc5adbc89 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue @@ -98,6 +98,11 @@ export default { } }, }, + mounted() { + if (this.value.point) { + this.updateMapCenter(this.value.point); + } + }, methods: { transName(value) { return value.streetNumber === undefined ? value.street : `${value.streetNumber}, ${value.street}`