diff --git a/src/components/ConcernementMapItem.vue b/src/components/ConcernementMapItem.vue index bfc784a..80ec86e 100644 --- a/src/components/ConcernementMapItem.vue +++ b/src/components/ConcernementMapItem.vue @@ -349,6 +349,7 @@ export default { // do not trigger on first fill of the property (if o is null) if (o) { this.resetPaperEntitesAndContours(); + this.resetPaperEntitesProximite(); } }, deep: true @@ -1198,6 +1199,14 @@ export default { } return g; }, + resetPaperEntitesProximite(){ + if (this.paper_main_object.children['entites_proximites']) { + this.paper_main_object.children['entites_proximites'].remove(); + } + if (this.concernement.has_proximites) { + this.paper_main_object.addChild(this.setPaperEntitesProximite()); + } + }, setPaperEntitesProximiteReferences(){ console.log('setPaperEntitesProximiteReferences') let g = new paper.Group({ diff --git a/src/components/contents/TerrainDeVie.vue b/src/components/contents/TerrainDeVie.vue index 5f77316..56c3dd7 100644 --- a/src/components/contents/TerrainDeVie.vue +++ b/src/components/contents/TerrainDeVie.vue @@ -276,21 +276,6 @@ export default { .then(() => { this.reloading_concernements = false; }); - - // TODO reset the user entites liste caching - - // this.getUserEntitees() - // .then(() => { - // console.log('added entite, user entites reloaded'); - // }) - // .catch(error => { - // console.warn('Issue with graphql userentites loading', error); - // }) - - // this.reloadConcernements() - // .then(() => { - // this.reloading_concernements = false; - // }); }) }) }) diff --git a/src/stores/concernements.js b/src/stores/concernements.js index f718d59..df442cc 100644 --- a/src/stores/concernements.js +++ b/src/stores/concernements.js @@ -432,7 +432,18 @@ export const ConcernementsStore = defineStore({ console.log(`reloadProximites loaded`, entite); let concernement = this.concernementsByID[old_entite.cid]; console.log('concernement', concernement); - concernement.entites_byid[entite.id].entite.proximite = entite.proximite; + // update the entites + concernement.entites_byid[entite.id].entite.proximite = entite.proximite; + // also update the current revision entite (needed for mapItem display) + let revision_entites_len = concernement.revisions_byid[concernement.revision_id].entites.length; + for (let i = 0; i < revision_entites_len; i++) { + let rev_entite = concernement.revisions_byid[concernement.revision_id].entites[i]; + if (rev_entite.entite && rev_entite.entite.id === entite.id) { + concernement.revisions_byid[concernement.revision_id].entites[i].entite.proximite = entite.proximite; + break; + } + } + // update the user's entite list let user = UserStore(); console.log('user', user); user.getUserEntitees()