@abi-software/flatmapvuer 0.5.9-beta.2 → 0.5.9-beta.3

package/package-lock.json

@@ -10,9 +10,9 @@
       "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA=="
     },
     "@abi-software/flatmap-viewer": {
-      "version": "2.4.2-b.4",
-      "resolved": "https://registry.npmjs.org/@abi-software/flatmap-viewer/-/flatmap-viewer-2.4.2-b.4.tgz",
-      "integrity": "sha512-6fc+pVcY3mJremZtNC4y9bT3l/CXAhYkXWg7z3zW+IX9qLNLzHWmYU1XH8voJXCpr7zT+0SYVJiKaUDSYk8hZw==",
+      "version": "2.4.2-b.5",
+      "resolved": "https://registry.npmjs.org/@abi-software/flatmap-viewer/-/flatmap-viewer-2.4.2-b.5.tgz",
+      "integrity": "sha512-fDKfYqytHPnXZqOvMMG4CULyHaQhpTECfedNDIASabWpPvjluXPSPJXNk8deibMaUz/UbCo7CV0hjeBHoQ67JA==",
       "requires": {
         "@babel/runtime": "^7.10.4",
         "@fortawesome/fontawesome-free": "^6.4.0",
@@ -1347,9 +1347,9 @@
       "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA=="
     },
     "@fortawesome/fontawesome-free": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
-      "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg=="
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz",
+      "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw=="
     },
     "@frogcat/ttl2jsonld": {
       "version": "0.0.9",
@@ -1765,9 +1765,9 @@
       }
     },
     "@types/geojson": {
-      "version": "7946.0.12",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.12.tgz",
-      "integrity": "sha512-uK2z1ZHJyC0nQRbuovXFt4mzXDwf27vQeUWNhfKGwRcWW429GOhP8HxUHlM6TLH4bzmlv/HlEjpvJh3JfmGsAA=="
+      "version": "7946.0.13",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz",
+      "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ=="
     },
     "@types/glob": {
       "version": "7.2.0",
@@ -1804,14 +1804,14 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
     },
     "@types/mapbox__point-geometry": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.3.tgz",
-      "integrity": "sha512-2W46IOXlu7vC8m3+M5rDqSnuY22GFxxx3xhkoyqyPWrD+eP2iAwNst0A1+umLYjCTJMJTSpiofphn9h9k+Kw+w=="
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz",
+      "integrity": "sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA=="
     },
     "@types/mapbox__vector-tile": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.3.tgz",
-      "integrity": "sha512-d263B3KCQtXKVZMHpMJrEW5EeLBsQ8jvAS9nhpUKC5hHIlQaACG9PWkW8qxEeNuceo9120AwPjeS91uNa4ltqA==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz",
+      "integrity": "sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==",
       "requires": {
         "@types/geojson": "*",
         "@types/mapbox__point-geometry": "*",
@@ -1849,9 +1849,9 @@
       "dev": true
     },
     "@types/pbf": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.4.tgz",
-      "integrity": "sha512-SOFlLGZkLbEXJRwcWCqeP/Koyaf/uAqLXHUsdo/nMfjLsNd8kqauwHe9GBOljSmpcHp/LC6kOjo3SidGjNirVA=="
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.5.tgz",
+      "integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA=="
     },
     "@types/q": {
       "version": "1.5.5",
@@ -1888,9 +1888,9 @@
       "dev": true
     },
     "@types/supercluster": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.2.tgz",
-      "integrity": "sha512-qMhofL945Z4njQUuntadexAgPtpiBC014WvVqU70Prj42LC77Xgmz04us7hSMmwjs7KbgAwGBmje+FSOvDbP0Q==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz",
+      "integrity": "sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==",
       "requires": {
         "@types/geojson": "*"
       }
@@ -10404,9 +10404,9 @@
       }
     },
     "maplibre-gl": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.5.2.tgz",
-      "integrity": "sha512-deqYA/RiEyXMGroZMDbOWNQTLnFsxREC+mDkQnuyCUNdBWm1KHafsXJYZP7rlLa5RLQNq05IAUAizY9aHTpIUw==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.6.2.tgz",
+      "integrity": "sha512-krg2KFIdOpLPngONDhP6ixCoWl5kbdMINP0moMSJFVX7wX1Clm2M9hlNKXS8vBGlVWwR5R3ZfI6IPrYz7c+aCQ==",
       "requires": {
         "@mapbox/geojson-rewind": "^0.5.2",
         "@mapbox/jsonlint-lines-primitives": "^2.0.2",
@@ -10416,11 +10416,11 @@
         "@mapbox/vector-tile": "^1.3.1",
         "@mapbox/whoots-js": "^3.1.0",
         "@maplibre/maplibre-gl-style-spec": "^19.3.3",
-        "@types/geojson": "^7946.0.12",
-        "@types/mapbox__point-geometry": "^0.1.3",
-        "@types/mapbox__vector-tile": "^1.3.3",
-        "@types/pbf": "^3.0.4",
-        "@types/supercluster": "^7.1.2",
+        "@types/geojson": "^7946.0.13",
+        "@types/mapbox__point-geometry": "^0.1.4",
+        "@types/mapbox__vector-tile": "^1.3.4",
+        "@types/pbf": "^3.0.5",
+        "@types/supercluster": "^7.1.3",
         "earcut": "^2.2.4",
         "geojson-vt": "^3.2.1",
         "gl-matrix": "^3.4.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "0.5.9-beta.2",
+  "version": "0.5.9-beta.3",
   "license": "Apache-2.0",
   "main": "./dist/flatmapvuer.common.js",
   "files": [
@@ -27,7 +27,7 @@
     "version": "npm run build-bundle;npm run changelog; git add CHANGELOG.md"
   },
   "dependencies": {
-    "@abi-software/flatmap-viewer": "^2.4.2-b.4",
+    "@abi-software/flatmap-viewer": "^2.4.2-b.5",
     "@abi-software/sparc-annotation": "0.0.5",
     "@abi-software/svg-sprite": "^0.3.0",
     "core-js": "^3.3.2",

package/src/components/FlatmapVuer.vue

@@ -197,6 +197,19 @@
           v-popover:checkBoxPopover
         >
           <svg-legends v-if="!isFC" class="svg-legends-container" />
+          <el-popover
+            content="Location of the featured dataset"
+            placement="right"
+            :appendToBody="false"
+            trigger="hover"
+            popper-class="flatmap-popper popper-bump-right right-popper"
+            v-model="hoverVisibilities[9].value"
+            ref="featuredMarkerPopover"
+          >
+          </el-popover>
+          <div v-show="showStarInLegend" v-popover:featuredMarkerPopover class="yellow-star-legend" v-html="yellowstar"></div>
+          <!-- The line below places the yellowstar svg on the left, and the text "Featured markers on the right" with css so they are both centered in the div -->
+
           <el-popover
             content="Find these markers for data"
             placement="right"
@@ -418,7 +431,6 @@
         ref="tooltip"
         class="tooltip"
         :annotationEntry="annotationEntry"
-        @onClose="closeTooltip"
         :entry="tooltipEntry"
         :annotationDisplay="viewingMode === 'Annotation'"
       />
@@ -446,10 +458,8 @@ import {
 import lang from "element-ui/lib/locale/lang/en";
 import locale from "element-ui/lib/locale";
 import flatmapMarker from "../icons/flatmap-marker";
-import {
-  FlatmapQueries,
-  findTaxonomyLabel,
-} from "../services/flatmapQueries.js";
+import {FlatmapQueries, findTaxonomyLabel} from "../services/flatmapQueries.js";
+import yellowstar from "../icons/yellowstar";
 
 locale.use(lang);
 Vue.use(Button);
@@ -1220,6 +1230,10 @@ export default {
         ];
       },
     },
+    showStarInLegend: {
+      type: Boolean,
+      default: false
+    },
     isLegacy: {
       type: Boolean,
       default: false,
@@ -1290,7 +1304,9 @@ export default {
         { value: false },
         { value: false },
         { value: false },
+        { value: false },
       ],
+      yellowstar: yellowstar,
       isFC: false,
       inHelp: false,
       currentBackground: "white",
@@ -1605,6 +1621,11 @@ export default {
   padding-left: 8px;
 }
 
+.yellow-star-legend {
+  width: 130px;
+  cursor: pointer;
+}
+
 .settings-group {
   bottom: 16px;
   position: absolute;

package/src/components/MultiFlatmapVuer.vue

@@ -53,6 +53,7 @@
       :helpMode="helpMode"
       :renderAtMounted="renderAtMounted"
       :displayMinimap="displayMinimap"
+      :showStarInLegend="showStarInLegend"
       style="height:100%"
       :flatmapAPI="flatmapAPI"
       :sparcAPI="sparcAPI"
@@ -386,6 +387,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showStarInLegend: {
+      type: Boolean,
+      default: false
+    },
     /**
      * Flag to determine rather open map UI should be
      * presented or not.

package/src/components/legends/SvgLegends.vue

@@ -17,6 +17,7 @@
       <text transform="matrix(0.9908 0 0 1 118.0903 345.5266)" class="st3 st4 st5" style="white-space: pre;">Ganglia</text>
       <text transform="matrix(0.9908 0 0 1 118.0903 433.1613)" class="st3 st4 st5" style="white-space: pre;">Ganglionated nerve plexus</text>
     </svg>
+    <svg width="72px" height="72px" viewBox="0 0 24 24" fill="yellow"></svg>
   </div>
 </template>
 

package/src/icons/yellowstar.js

@@ -0,0 +1,5 @@
+export default '<svg width="160px" height="24px" viewBox="0 0 160 24" fill="yellow">' +
+  '<path d="M22.0748 3.25583C22.4141 2.42845 23.5859 2.42845 23.9252 3.25583L25.6493 7.45955C25.793 7.80979 26.1221 8.04889 26.4995 8.07727L31.0303 8.41798C31.922 8.48504 32.2841 9.59942 31.6021 10.1778L28.1369 13.1166C27.8482 13.3614 27.7225 13.7483 27.8122 14.1161L28.8882 18.5304C29.1 19.3992 28.152 20.0879 27.3912 19.618L23.5255 17.2305C23.2034 17.0316 22.7966 17.0316 22.4745 17.2305L18.60881 19.618C17.84796 20.0879 16.9 19.3992 17.1118 18.5304L18.18785 14.1161C18.2775 13.7483 18.1518 13.3614 17.86309 13.1166L14.3979 10.1778C13.71588 9.59942 14.07796 8.48504 14.96971 8.41798L19.50046 8.07727C19.87794 8.04889 20.20704 7.80979 20.35068 7.45955L22.0748 3.25583Z" stroke="#000000" stroke-width="2"/>' +
+  // Adjusting the x attribute and adding padding for the text element
+  '<text x="42" y="50%" dominant-baseline="middle" text-anchor="start" font-family="Asap, sans-serif" font-size="12" fill="#000000">Featured marker</text>' +
+'</svg>';