@abi-software/mapintegratedvuer 1.2.0-beta.3 → 1.2.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{ContentMixin-BF1AsL73.js → ContentMixin-DrXO9hYL.js} +1 -1
- package/dist/{Flatmap-B7E6CJXk.js → Flatmap-DjJ0kL-x.js} +6 -6
- package/dist/{Iframe-CuAgkNdL.js → Iframe-CDoFGJGq.js} +2 -2
- package/dist/{MultiFlatmap-DBSNZ825.js → MultiFlatmap-DztXCpBm.js} +7 -7
- package/dist/{Plot-BZRoihTL.js → Plot-CckYvHYT.js} +2 -2
- package/dist/{Scaffold-DI8TuMaq.js → Scaffold-BSeFI_hx.js} +3 -3
- package/dist/{Simulation-BwirbTjC.js → Simulation-CHqjWe4Q.js} +2 -2
- package/dist/{flatmapvuer-CWBQT6qg.js → flatmapvuer-xVtutq6J.js} +8902 -8882
- package/dist/{index-BVYbfsK6.js → index-D50UuVi7.js} +1 -1
- package/dist/mapintegratedvuer.js +1 -1
- package/dist/mapintegratedvuer.umd.cjs +366 -358
- package/dist/{style-D3tYXMtJ.js → style-CxmQHlw8.js} +26 -13
- package/dist/style.css +1 -1
- package/package.json +2 -2
- package/src/mixins/DynamicMarkerMixin.js +24 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abi-software/mapintegratedvuer",
|
|
3
|
-
"version": "1.2.0-beta.
|
|
3
|
+
"version": "1.2.0-beta.5",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"serve": "vite --host --force",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"*.js"
|
|
49
49
|
],
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"@abi-software/flatmapvuer": "^1.1.2-alpha-
|
|
51
|
+
"@abi-software/flatmapvuer": "^1.1.2-alpha-8",
|
|
52
52
|
"@abi-software/map-side-bar": "^2.2.1-alpha-3",
|
|
53
53
|
"@abi-software/plotvuer": "1.0.0",
|
|
54
54
|
"@abi-software/scaffoldvuer": "^1.2.0-beta.0",
|
|
@@ -44,9 +44,10 @@ export default {
|
|
|
44
44
|
// Set the dataset markers
|
|
45
45
|
let markers = this.settingsStore.markers;
|
|
46
46
|
markers = removeDuplicates(markers);
|
|
47
|
+
let fmMarkers = this.removeMarkersNotOnFlatmap(flatmapImp, markers);
|
|
47
48
|
flatmapImp.clearMarkers();
|
|
48
49
|
flatmapImp.clearDatasetMarkers();
|
|
49
|
-
flatmapImp.addDatasetMarkers(
|
|
50
|
+
flatmapImp.addDatasetMarkers(fmMarkers);
|
|
50
51
|
|
|
51
52
|
// Set the hovered markers
|
|
52
53
|
let hoveredMarkers = this.settingsStore.hoveredMarkers
|
|
@@ -70,6 +71,28 @@ export default {
|
|
|
70
71
|
}
|
|
71
72
|
}
|
|
72
73
|
},
|
|
74
|
+
// removeMarkersNotOnFlatmap: rewrites the dataset marker list to only include markers that are on the flatmap
|
|
75
|
+
removeMarkersNotOnFlatmap(flatmapImp, datasets) {
|
|
76
|
+
|
|
77
|
+
// dataset markers are in the form [{id: "discoverId", terms: ["term1", "term2"]}, {id:....}]
|
|
78
|
+
let fma = flatmapImp.anatomicalIdentifiers;
|
|
79
|
+
let markersOnFlatmap = []
|
|
80
|
+
|
|
81
|
+
// the block below steps through each dataset and checks each term to see if it is in the flatmap
|
|
82
|
+
for (let i = 0; i < datasets.length; i++) {
|
|
83
|
+
let dataset = datasets[i];
|
|
84
|
+
let datasetAdjusted = {id: dataset.id, terms: []};
|
|
85
|
+
for (let j = 0; j < dataset.terms.length; j++) {
|
|
86
|
+
if (fma.includes(dataset.terms[j])) {
|
|
87
|
+
datasetAdjusted.terms.push(dataset.terms[j]);
|
|
88
|
+
|
|
89
|
+
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
markersOnFlatmap.push(datasetAdjusted);
|
|
93
|
+
}
|
|
94
|
+
return markersOnFlatmap;
|
|
95
|
+
},
|
|
73
96
|
flatmapReadyForMarkerUpdates: function (flatmap) {
|
|
74
97
|
if (flatmap) {
|
|
75
98
|
flatmap.enablePanZoomEvents(true); // Use zoom events for dynamic markers
|