Merge pull request #793 from alan-wu/maps

Maps

package.json

@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@abi-software/gallery": "0.3.2",
-    "@abi-software/mapintegratedvuer": "^0.6.5",
+    "@abi-software/mapintegratedvuer": "0.6.7",
     "@abi-software/plotvuer": "^0.3.0",
     "@abi-software/simulationvuer": "0.6.5",
     "@aws-amplify/auth": "^4.4.4",

pages/maps/index.vue

@@ -252,6 +252,7 @@ export default {
   watch: {
     currentEntry: 'currentEntryUpdated',
     facets: 'facetsUpdated',
+    isLandingPage: 'openViewWithQuery',
   },
   fetchOnServer: false,
   created: function () {
@@ -413,7 +414,7 @@ export default {
         }
       }
       if (this.$route.query.type === 'ac' || this.$route.query.type === 'flatmap') {
-        this.startingType = "AC"
+        this.startingMap = "AC"
         return
       }
       if (this.$route.query.type === 'fc') {
@@ -425,7 +426,8 @@ export default {
       //Open the map with specific view defined by the query.
       //First get the bucket and facets information if available
       let s3Bucket = undefined
-
+      this.startingMap = "AC"
+      
       if (this.$route.query.dataset_id && this.$route.query.dataset_version) {
         const datasetInfo = await this.getDatasetInfo(
           this.$axios,

yarn.lock

@@ -92,10 +92,10 @@
     element-ui "^2.15.0"
     vue "^2.6.11"
 
-"@abi-software/map-side-bar@^1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@abi-software/map-side-bar/-/map-side-bar-1.5.4.tgz#8fa920047c83f69e36809fe51d4f29369250dacd"
-  integrity sha512-ESRASY9HQ+pJVtoLiY/N8DQdQDbRq+BIBQ+zcHIZQMXA8cQlD0fF1PolzuBLhEzG4cFmb9V2TtJQGiJG1hki2w==
+"@abi-software/map-side-bar@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@abi-software/map-side-bar/-/map-side-bar-1.6.0.tgz#e3ea3be4bde3b89d219370807466fd2077c541a2"
+  integrity sha512-+QBtFy1b3gDfHsKmdBziS8RbcspPE+JKguRCTpV2+KHt8D5JQmiT8tD671ts9kRjSmdBgH67CN7uLvAxrAullg==
   dependencies:
     "@abi-software/gallery" "^0.4.1-beta.1"
     "@abi-software/svg-sprite" "^0.2.0"
@@ -105,13 +105,13 @@
     vue "^2.6.10"
     xss "^1.0.14"
 
-"@abi-software/mapintegratedvuer@^0.6.5":
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/@abi-software/mapintegratedvuer/-/mapintegratedvuer-0.6.5.tgz#edc8aab184652ea2fe9569692eb37711ade82cc8"
-  integrity sha512-3D3GNU8XjDMwVOWn37twnXD1f/5ylqK8epuQiXhjC4Enp7PxFZ0YjE+0Vycb4V/F32erU6gnJx7cDiSnp/llxQ==
+"@abi-software/[email protected].7":
+  version "0.6.7"
+  resolved "https://registry.yarnpkg.com/@abi-software/mapintegratedvuer/-/mapintegratedvuer-0.6.7.tgz#62264e55b626c48b2cb4f531b687d73202a5b323"
+  integrity sha512-iVc+UMf6pFyz5pVfShBg90MRe/e6xwFR3QAYJzshGFVDCF0Rhz1rK+XLsc59KprAE8RGvJvj1Mx/1xCGRC+9tA==
   dependencies:
     "@abi-software/flatmapvuer" "^0.5.10"
-    "@abi-software/map-side-bar" "^1.5.4"
+    "@abi-software/map-side-bar" "^1.6.0"
     "@abi-software/plotvuer" "^0.3.9"
     "@abi-software/scaffoldvuer" "^0.3.2"
     "@abi-software/simulationvuer" "^0.6.5"