bachir/ouatterrir-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

superpositions: displaying the right entite to the right map_item

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2023-09-12 11:20:11 +02:00
parent 8377a4b2b1
commit aae6d0c9d5
4 changed files with 113 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/stores/concernements.js
View File

@@ -23,6 +23,7 @@ export const ConcernementsStore = defineStore({
allBesoinsById: {},
allSuperpositions: [],
allSuperpositions_byid: {},
// allSuperpositions_bycid: {},
allProximites: [],
opened_concernement: false,
opened_entite_id: null,
@@ -93,7 +94,7 @@ export const ConcernementsStore = defineStore({
// SUPERPOSITIONS
if (entite.entite.superposition.length) {
concernement.has_superpositions = true;
// concernement.superpositions = [];
concernement.superpositions = {};
concernement.superposition_constraints_id = [];
concernement.superposed_concernements_id = [];
@@ -174,13 +175,36 @@ export const ConcernementsStore = defineStore({
// Handle multiple superpositions accross two concernements
for(let superposition of this.allSuperpositions){
let superposition_couple_id = `${superposition[0].cid}-${superposition[1].cid}`;
let superposition_id = `${superposition[0].cid}-${superposition[0].eid}--${superposition[1].cid}-${superposition[1].eid}`
let superposition_id = `${superposition[0].cid}_${superposition[0].eid}__${superposition[1].cid}_${superposition[1].eid}`
// record allSuperpositions_byid
if (!this.allSuperpositions_byid[superposition_couple_id]) {
this.allSuperpositions_byid[superposition_couple_id] = {};
}
this.allSuperpositions_byid[superposition_couple_id][superposition_id] = superposition;
// record allSuperpositions_bycid
for (let i = 0; i < 2; i++) {
// i is the current concernement, j is the target
let j = i === 0 ? 1 : 0;
// if (!this.allSuperpositions_bycid[superposition[i].cid]) {
// this.allSuperpositions_bycid[superposition[i].cid] = [];
// }
if (!this.concernementsByID[superposition[i].cid].superpositions[superposition_couple_id]) {
this.concernementsByID[superposition[i].cid].superpositions[superposition_couple_id] = {};
}
// let s = {
// eid: superposition[i].eid,
// target_cid: superposition[j].cid,
// target_eid: superposition[j].eid,
// };
// this.allSuperpositions_bycid[superposition[i].cid].push(s)
// this.concernementsByID[superposition[i].cid].superpositions.push(s);
this.concernementsByID[superposition[i].cid].superpositions[superposition_couple_id][superposition_id] = superposition;
}
}
console.log('this.allSuperpositions_byid', this.allSuperpositions_byid);
// console.log('this.allSuperpositions_bycid', this.allSuperpositions_bycid);
this.concernements_loaded = true;
})
@@ -325,9 +349,9 @@ export const ConcernementsStore = defineStore({
}
});
},
setConcernementMapItem (id, o) {
this.concernementsByID[id].map_item = o;
},
// setConcernementMapItem (id, o) {
// this.concernementsByID[id].map_item = o;
// },
resetConcernementOpened () {
this.opened_concernement = null;
this.openCloseConcernements();