feat: navigation bar now includes 2D/3D buton and dense location input

closes #129
kalisio · Nov 28, 2019 · ead4917 · ead4917
1 parent 3c547fd
commit ead4917
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/client/i18n/kMap_en.json b/src/client/i18n/kMap_en.json
@@ -42,6 +42,8 @@
       "TOGGLE_SIDENAV": "Menu",
       "TOGGLE_FULLSCREEN": "Fullscreen",
       "TOGGLE_CATALOG": "Catalog",
+      "TOGGLE_MAP": "2D",
+      "TOGGLE_GLOBE": "3D",
       "TOGGLE_VR": "VR",
       "TRACK_LOCATION": "Track location",
       "PROBE": "Probe"

diff --git a/src/client/i18n/kMap_fr.json b/src/client/i18n/kMap_fr.json
@@ -42,6 +42,8 @@
       "TOGGLE_SIDENAV": "Menu",
       "TOGGLE_FULLSCREEN": "Plein écran",
       "TOGGLE_CATALOG": "Catalogue",
+      "TOGGLE_MAP": "2D",
+      "TOGGLE_GLOBE": "3D",
       "TOGGLE_VR": "VR",
       "TRACK_LOCATION": "Suivi de coordonnées",
       "PROBE": "Sonder"

diff --git a/src/client/mixins/mixin.activity.js b/src/client/mixins/mixin.activity.js
@@ -66,9 +66,12 @@ export default function (name) {
         }
         // Nav bar
         let defaultTools = ['side-nav', 'zoom', 'track-location', 'location-bar', 'fullscreen', 'catalog']
-        if (this.engine === 'cesium') defaultTools = defaultTools.concat(['vr'])
+        if (this.engine === 'cesium') defaultTools = defaultTools.concat(['globe', 'vr'])
+        else defaultTools = defaultTools.concat(['map'])
         const tools = _.get(this, 'activityOptions.tools', defaultTools)
         const hasSideNavTool = tools.includes('side-nav')
+        const hasMapTool = tools.includes('map')
+        const hasGlobeTool = tools.includes('globe')
         const hasVrTool = tools.includes('vr')
         const hasFullscreenTool = (typeof this.onToggleFullscreen === 'function') && tools.includes('fullscreen')
         const hasZoomTool = tools.includes('zoom')
@@ -100,9 +103,19 @@ export default function (name) {
           })
         }
         const afterActions = []
+        if (hasMapTool) {
+          afterActions.push({
+            name: 'map-toggle', label: this.$t('mixins.activity.TOGGLE_MAP'), icon: 'map', route: { name: 'map', query: true }
+          })
+        }
+        if (hasGlobeTool) {
+          afterActions.push({
+            name: 'globe-toggle', label: this.$t('mixins.activity.TOGGLE_GLOBE'), icon: 'terrain', route: { name: 'globe', query: true }
+          })
+        }
         if (hasVrTool) {
           afterActions.push({
-            name: 'vr-toggle', label: this.$t('mixins.activity.TOGGLE_VR'), icon: 'terrain', handler: this.onToggleVr
+            name: 'vr-toggle', label: this.$t('mixins.activity.TOGGLE_VR'), icon: 'burst_mode', handler: this.onToggleVr
           })
         }
         if (hasFullscreenTool) {