Resolve conflict.

akhuoa · Nov 14, 2024 · 6697dea · 6697dea
2 parents 2d68450 + eee7bd2
commit 6697dea
Show file tree

Hide file tree

Showing 6 changed files with 245 additions and 75 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@abi-software/gallery": "^1.1.2",
-    "@abi-software/map-utilities": "^1.2.0-beta.8",
+    "@abi-software/map-utilities": "^1.2.0",
     "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",
     "algoliasearch": "^4.10.5",

diff --git a/src/App.vue b/src/App.vue
@@ -29,6 +29,7 @@
       @tabClicked="tabClicked"
       @search-changed="searchChanged($event)"
       @hover-changed="hoverChanged($event)"
+      @connectivity-component-click="onConnectivityComponentClick"
       @actionClick="action"
     />
   </div>
@@ -123,6 +124,7 @@ export default {
         BL_SERVER_URL: import.meta.env.VITE_APP_BL_SERVER_URL,
         NL_LINK_PREFIX: import.meta.env.VITE_APP_NL_LINK_PREFIX,
         ROOT_URL: import.meta.env.VITE_APP_ROOT_URL,
+        FLATMAPAPI_LOCATION: import.meta.env.VITE_FLATMAPAPI_LOCATION,
       },
       connectivityInput: exampleConnectivityInput,
       activeId: 1,
@@ -252,6 +254,9 @@ export default {
       } else {
         this.createData = null
       }
+    },
+    onConnectivityComponentClick: function(data) {
+      console.log("onConnectivityComponentClick" , data)
     }
   },
   mounted: function () {