@abi-software/flatmapvuer 0.2.4-beta-2 → 0.2.4-beta-3

package/package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@abi-software/flatmap-viewer": {
-      "version": "2.2.0-beta.4",
-      "resolved": "https://registry.npmjs.org/@abi-software/flatmap-viewer/-/flatmap-viewer-2.2.0-beta.4.tgz",
-      "integrity": "sha512-9r0dJ+jcsSxwP+4n6IRiZey3KWaeY3VN8MLpXtw5SLiCJWwHubh55XyXc7DuJ9glZ2G8L6BnqlMoKXmdB+0ccQ==",
+      "version": "2.2.0-beta.6",
+      "resolved": "https://registry.npmjs.org/@abi-software/flatmap-viewer/-/flatmap-viewer-2.2.0-beta.6.tgz",
+      "integrity": "sha512-R2ejDar9zs6jvizJbq8ECbeZCx2qbrNiurhjDcmNquFeyoOb6lA6wrYK9I5n5HSnXh+H1wQemvKbke+PnH1K+Q==",
       "requires": {
         "@babel/runtime": "^7.10.4",
         "@turf/area": "^6.0.1",
@@ -1298,9 +1298,9 @@
       "integrity": "sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI="
     },
     "@mapbox/tiny-sdf": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.4.tgz",
-      "integrity": "sha512-CBtL2rhZiYmdIryksp0zh4Mmx54iClYfNb0mpYeHrZnq4z84lVjre7LBWGPEjWspEn6AiF0lxC1HaZDye89m3g=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.5.tgz",
+      "integrity": "sha512-OhXt2lS//WpLdkqrzo/KwB7SRD8AiNTFFzuo9n14IBupzIMa67yGItcK7I2W9D8Ghpa4T04Sw9FWsKCJG50Bxw=="
     },
     "@mapbox/unitbezier": {
       "version": "0.0.1",
@@ -8055,9 +8055,9 @@
       }
     },
     "maplibre-gl": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-2.1.1.tgz",
-      "integrity": "sha512-FRAHc4kPYKDF0+QMm8tnkyhv65Ed5SKLbzcH6hHM20XAK+9pqHMIHxlwpxcb4zGl+czz1bUegYf/KXjJRh9aDA==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-2.1.6.tgz",
+      "integrity": "sha512-UHdw4YeCkIyfG7vMdNK6e/sDNPB7jjUN5MUytKE1DFQB7sKM9V19ar1GUyn0uYRvQwJ5iC01fWhH3r/5bbHlKQ==",
       "requires": {
         "@mapbox/geojson-rewind": "^0.5.1",
         "@mapbox/jsonlint-lines-primitives": "^2.0.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "0.2.4-beta-2",
+  "version": "0.2.4-beta-3",
   "main": "./dist/flatmapvuer.common.js",
   "files": [
     "dist/*",
@@ -16,7 +16,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@abi-software/flatmap-viewer": "2.2.0-beta.4",
+    "@abi-software/flatmap-viewer": "2.2.0-beta.6",
     "@abi-software/svg-sprite": "^0.1.14",
     "core-js": "^3.3.2",
     "css-element-queries": "^1.2.2",

package/src/App.vue

@@ -18,7 +18,8 @@
     </el-popover>
   
     <MultiFlatmapVuer ref="multi" :availableSpecies="availableSpecies" 
-    @resource-selected="FlatmapSelected" :minZoom="minZoom"
+      @resource-selected="FlatmapSelected" :minZoom="minZoom"
+      @pan-zoom-callback="panZoomcallback"
       @ready="FlatmapReady" :featureInfo="featureInfo" :searchable="searchable" 
       :initial="initial" :pathControls="pathControls" :helpMode="helpMode"
       :displayMinimap=true :flatmapAPI="flatmapAPI"/>
@@ -58,8 +59,12 @@ export default {
     FlatmapReady: function(component) {
       let taxon = component.mapImp.describes;
       let id = component.mapImp.addMarker("UBERON:0000948", "simulation");
+      component.enablePanZoomEvents(true);
       console.log(taxon, id);
     },
+    panZoomcallback: function(payload) {
+      console.log(payload);
+    }
   },
   data: function(){
     return {
@@ -73,6 +78,7 @@ export default {
         "Kember":{taxo: "ABI:1000001", displayWarning:true},
         "Pig":{taxo: "NCBITaxon:9823", iconClass:"icon-mapicon_pig", displayWarning:true}, 
         "Cat":{taxo: "NCBITaxon:9685", iconClass:"icon-mapicon_cat", displayWarning:true},
+        "digestive tract":{taxo: "digestive tract", displayWarning:true}
       },
       tooltipContent: undefined,
       tStyle: {
@@ -81,9 +87,10 @@ export default {
         position: "absolute"
       },
       displayCloseButton: false,
-      initial: "Rat",
+      initial: "digestive tract",
       helpMode: false,
-      flatmapAPI: "https://mapcore-demo.org/fccb/flatmap/"
+      //flatmapAPI: "https://mapcore-demo.org/fccb/flatmap/"
+      flatmapAPI: "https://mapcore-demo.org/devel/flatmap/v3/"
     }
   },
   mounted: function() {

package/src/components/FlatmapVuer.vue

@@ -338,24 +338,31 @@ export default {
         this.mapImp.showPaths(this.checkedItems);
       }
     },
+    enablePanZoomEvents: function(flag) {
+      this.mapImp.enablePanZoomEvents(flag);
+    },
     eventCallback: function() {
-      return (eventType, feature, ...args) => {
-        const label = feature.label;
-        const resource = [feature.models];
-        const taxonomy = this.entry;
-        const data = {
-          dataset: feature.dataset,
-          taxonomy: taxonomy,
-          resource: resource,
-          label: label,
-          feature: feature,
-          userData: args,
-          eventType: eventType
-        };
-        // Disable the nueron pop up for now.
-        if (feature && feature.type !== "marker")
-          this.checkAndCreatePopups(data);
-        this.$emit("resource-selected", data);
+      return (eventType, data, ...args) => {
+        if (eventType !== "pan-zoom") {
+          const label = data.label;
+          const resource = [data.models];
+          const taxonomy = this.entry;
+          const payload = {
+            dataset: data.dataset,
+            taxonomy: taxonomy,
+            resource: resource,
+            label: label,
+            feature: data,
+            userData: args,
+            eventType: eventType
+          };
+          // Disable the nueron pop up for now.
+          if (data && data.type !== "marker")
+            this.checkAndCreatePopups(data);
+          this.$emit("resource-selected", payload);
+        } else {
+          this.$emit("pan-zoom-callback", data);
+        }
       };
     },
     // checkNeuronClicked shows a neuron path pop up if a path was recently clicked

package/src/components/MultiFlatmapVuer.vue

@@ -36,6 +36,7 @@
       :ref="key"
       @resource-selected="FlatmapSelected"
       @ready="FlatmapReady"
+      @pan-zoom-callback="panZoomCallback"
       :featureInfo="featureInfo"
       :minZoom="minZoom"
       :pathControls="pathControls"
@@ -119,6 +120,9 @@ export default {
     getCurrentFlatmap: function() {
       return this.$refs[this.activeSpecies][0];
     },
+    panZoomCallback: function(payload) {
+      this.$emit("pan-zoom-callback", payload);
+    },
     showPopup: function(featureId, node, options) {
       let map = this.getCurrentFlatmap();
       map.showPopup(featureId, node, options);