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

made mapPopup hover proximites

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2023-10-26 12:11:45 +02:00
parent fcce41aa77
commit 5a6a71359d
3 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/components/ConcernementMapItem.vue
View File

@@ -540,6 +540,9 @@ export default {
this.initPaperEvents()
},
/*
* called by openClose() function
*/
setPaperContents(){
// trigered once opening tween is complete
this.clearPaperContents();
@@ -589,7 +592,8 @@ export default {
this.paper_main_object.addChild(this.setPaperEntites());
},
clearPaperContents(){
let clearable_children = ['boussole_bg', 'entites',
let clearable_children = ['boussole_bg', 'entites',
'entites_proximites_references',
'puissanceagir_bg','puissanceagir_besoins',
'agissantes',
'doleance_bg', 'doleances'];
@@ -850,6 +854,11 @@ export default {
let e=0;
entite.entite.proximite.forEach(entite_ref => {
// console.log(`${entite_ref.id}, ${entite_ref.title}`, this.allEntitesById[entite_ref.id]);
// get the concernement parents of the proximite reference
let ref_cid = this.allEntitesById[entite_ref.id].cid;
// console.log('PROXIMITE ref concernement jarvis_envelope_convexe', this.concernementsByID[ref_cid].sailentEntites);
let ref_concernement = this.concernementsByID[ref_cid];
// create the entite ref paper point
let ref_instance = new paper.SymbolItem(this.paper_symbol_definitions['entite']);
@@ -867,14 +876,12 @@ export default {
ref_instance.fillColor = '#000';
ref_instance.item_id = entite_ref.id;
ref_instance.item_type = 'entite_proximite_reference';
ref_instance.ref_cid = ref_cid;
ref_instance.parent_eid = entite.entite.id;
ref_instance.is_symbol_instance = true;
ref_g.addChild(ref_instance)
// create the original concernement contours arround the entite_ref
let ref_cid = this.allEntitesById[entite_ref.id].cid;
// console.log('PROXIMITE ref concernement jarvis_envelope_convexe', this.concernementsByID[ref_cid].sailentEntites);
let ref_concernement = this.concernementsByID[ref_cid];
// define the right scale
let scale = 0.05;
@@ -945,6 +952,7 @@ export default {
// })
// ref_g.addChild(p);
// })
// // end debug
// general contour arround proximité
// console.log('allEntiteRefConcernementContourEntites', allEntiteRefConcernementContourEntites);
@@ -1623,7 +1631,9 @@ export default {
}
},
// PAPER EVENTS
/*
* PAPER EVENTS
*/
initPaperEvents(){
this.paper_main_object.onMouseLeave = function(event){
@@ -1681,6 +1691,9 @@ export default {
case "terraindevie":
paper_group_tohit = this.paper_main_object.children['entites'];
break;
case "proximite":
paper_group_tohit = this.paper_main_object.children['entites_proximites_references'];
break;
case "superposition":
paper_group_tohit = this.paper_main_object.children['entites_superposes'];
break;
@@ -1707,6 +1720,10 @@ export default {
id: result.item.item_id
};
switch (result.item.item_type) {
case "entite_proximite_reference":
new_hover_elmt.ref_cid = result.item.ref_cid;
new_hover_elmt.parent_eid = result.item.parent_eid;
break;
case "besoin":
new_hover_elmt.no_popup = true;
break;