@eturnity/eturnity_3d 7.10.2 → 7.14.0

package/jsconfig.json

@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  },
+  "exclude": ["node_modules", "dist"]
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "7.10.2",
+  "version": "7.14.0",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",

package/src/helper/threeMixin.js

@@ -5,6 +5,7 @@ import { CustomProvider } from './customProvider'
 import getLayers from '../utils/layers'
 import materialMixin from './materialMixin'
 import renderMixin from './renderMixin'
+import { MAP_LAYER_TYPE } from '../utils/constants'
 export default {
   data() {
     return {
@@ -159,18 +160,25 @@ export default {
       this.setSelectedMapLayer(null)
 
       if (this.selectedMapLayer === null) {
-        for (var i in this.layers) {
+        let selectedLayer = null
+        for (let i = 0; i < this.layers.length; i++) {
+          const layer = this.layers[i]
           if (
             this.globalProjectProperties &&
-            this.layers[i].key === this.globalProjectProperties.map_type
+            layer.key === this.globalProjectProperties.map_type
           ) {
-            this.setSelectedMapLayer(this.layers[i])
+            selectedLayer = layer
+            break
           }
         }
-      }
 
-      if (this.selectedMapLayer === null) {
-        this.setSelectedMapLayer(this.layers[7])
+        if (!selectedLayer) {
+          selectedLayer = this.layers.find(
+            (layer) => layer.key === MAP_LAYER_TYPE.GOOGLE_SATELLITE
+          )
+        }
+
+        this.setSelectedMapLayer(selectedLayer)
       }
     },
     render() {

package/src/utils/constants.js

@@ -0,0 +1,16 @@
+export const MAP_LAYER_TYPE = {
+  SWISSTOPO_SATELLITE: 'swisstopoLayer_swissimage',
+  SWISSTOPO_MAP: 'swisstopoLayer_pixelkarte',
+  SWISSTOPO_SOLAR_ROOF: 'swisstopoLayer_solarenergie_roof',
+  SWISSTOPO_SOLAR_FACADE: 'swisstopoLayer_solarenergie_fassade',
+  OPENSTREET_MAP: 'openStreetMapLayer',
+  GOOGLE_TERRAIN: 'googleLayerTerrain',
+  GOOGLE_ROAD: 'googleLayerRoadmap',
+  GOOGLE_SATELLITE: 'googleLayer',
+  BASEMAP_ROAD: 'baseMapLayer',
+  BASEMAP_SATELLITE: 'baseMapLayerStreetNumber',
+  IGN_SATELLITE: 'ignSpainLayer_pnoa_image',
+  IGN_ROAD: 'ignSpainLayer_map',
+  BKG_SATELLITE: 'bkgHexagonGermanyLayer',
+  GEOPORTAL_SATELLITE: 'geoportail_fr_wmts_ortho_layer'
+}