@eturnity/eturnity_3d 7.30.0 → 7.32.1

package/src/store/nodesEdgesCreation.js

@@ -5,7 +5,7 @@ import {
   isAlmostSameSegment2D,
   isAlmostSameSegment3D,
   isAlmostSamePoint2D,
-  verticalProjectionOnPlane
+  verticalProjectionOnPlane,
 } from '@eturnity/eturnity_maths'
 
 export function generateNodes2D(polygons) {
@@ -17,7 +17,7 @@ export function generateNodes2D(polygons) {
         'obstacle',
         'tmpModuleField',
         'moduleField',
-        'construction'
+        'construction',
       ].includes(poly.layer)
     )
     .forEach((polygon) => {
@@ -39,14 +39,14 @@ export function generateNodes2D(polygons) {
             id: node2D.id,
             itemType: 'masterHandle',
             open: null,
-            selected: null
+            selected: null,
           }
           nodes2D.push(node2D)
         }
         node2D.belongsTo.push({
           polygonId: polygon.id,
           index: i,
-          polygon
+          polygon,
         })
         node2D.id += '_' + polygon.id + '_' + i
       })
@@ -93,14 +93,14 @@ export function generateNodes3D(polygons) {
             id: node3D.id,
             itemType: 'masterHandle',
             open: null,
-            selected: null
+            selected: null,
           }
           nodes3D.push(node3D)
         }
         node3D.belongsTo.push({
           polygonId: polygon.id,
           index: i,
-          polygon
+          polygon,
         })
         node3D.id += '_' + polygon.id + '_' + i
       })
@@ -157,14 +157,14 @@ export function generateEdges2D(polygons, splitEdgesIds = []) {
         edge2D.belongsTo.push({
           polygonId: polygon.id,
           index: i,
-          polygon
+          polygon,
         })
         if (polygon.roofs && polygon.roofs.length > 0) {
           polygon.roofs.forEach((supportRoof) => {
             edge2D.belongsTo.push({
               polygonId: supportRoof.id,
               index: null,
-              polygon: supportRoof
+              polygon: supportRoof,
             })
           })
         }
@@ -270,7 +270,7 @@ export function generateEdges3D(polygons) {
         edge3D.belongsTo.push({
           polygonId: polygon.id,
           index: i,
-          polygon
+          polygon,
         })
         edge3D.id += '_' + polygon.id + '_' + i
       })

package/src/store/store.js

@@ -3,6 +3,6 @@ import threeDModule from './three-d-module'
 
 export default createStore({
   modules: {
-    threeDModule
-  }
+    threeDModule,
+  },
 })

package/src/store/three-d-module.js

@@ -2,7 +2,7 @@ import {
   generateNodes2D,
   generateNodes3D,
   generateEdges2D,
-  generateEdges3D
+  generateEdges3D,
 } from './nodesEdgesCreation'
 import { hydrateData } from './hydrateData.js'
 
@@ -23,7 +23,7 @@ const init_state = {
     layout_longitude: null,
     map_layer: 'googleLayerTerrain',
     map_zoom: 19,
-    camera_3d: {}
+    camera_3d: {},
   },
   //useless state for viewer
   pvDataMemo: [],
@@ -32,7 +32,7 @@ const init_state = {
   panelOpacity: 1,
   selectedMapLayer: null,
   globalProjectProperties: [],
-  imageOverlay: null
+  imageOverlay: null,
 }
 
 const state = init_state
@@ -101,7 +101,7 @@ const getters = {
       xMin: Infinity,
       xMax: -Infinity,
       yMin: Infinity,
-      yMax: -Infinity
+      yMax: -Infinity,
     }
     getters.getRoofs.forEach((polygon) =>
       polygon.outline.forEach((p) => {
@@ -120,7 +120,7 @@ const getters = {
       })
     )
     return bounds
-  }
+  },
 }
 
 const mutations = {
@@ -156,16 +156,16 @@ const mutations = {
   },
   mutate_selectedMapLayer(state, value) {
     state.selectedMapLayer = value
-  }
+  },
 }
 
 const actions = {
-  hydrateData
+  hydrateData,
 }
 
 export default {
   state,
   getters,
   mutations,
-  actions
+  actions,
 }

package/src/utils/constants.js

@@ -12,5 +12,5 @@ export const MAP_LAYER_TYPE = {
   IGN_SATELLITE: 'ignSpainLayer_pnoa_image',
   IGN_ROAD: 'ignSpainLayer_map',
   BKG_SATELLITE: 'bkgHexagonGermanyLayer',
-  GEOPORTAL_SATELLITE: 'geoportail_fr_wmts_ortho_layer'
+  GEOPORTAL_SATELLITE: 'geoportail_fr_wmts_ortho_layer',
 }

package/src/utils/layers.js

@@ -7,19 +7,19 @@ function getLayers() {
     type: 'hybrid',
     layerTypeAPI: 'googleLayer',
     maxNativeZoom: 25,
-    maxZoom: 25
+    maxZoom: 25,
   })
   const googleLayerRoadmap = L.gridLayer.googleMutant({
     type: 'roadmap',
     layerTypeAPI: 'googleLayerRoadmap',
     maxNativeZoom: 25,
-    maxZoom: 25
+    maxZoom: 25,
   })
   const googleLayerTerrain = L.gridLayer.googleMutant({
     type: 'terrain',
     layerTypeAPI: 'googleLayerTerrain',
     maxNativeZoom: 25,
-    maxZoom: 25
+    maxZoom: 25,
   })
   // TODO activate for different users
   const baseMapLayer = L.tileLayer(
@@ -33,7 +33,7 @@ function getLayers() {
       minZoom: leafletMapLayersConfig['baseMapLayer']['minZoom'],
       maxZoom: leafletMapLayersConfig['baseMapLayer']['maxZoom'],
       maxNativeZoom: leafletMapLayersConfig['baseMapLayer']['maxNativeZoom'],
-      layerTypeAPI: 'baseMapLayer'
+      layerTypeAPI: 'baseMapLayer',
     }
   )
   const baseMapLayerStreetNumber = L.tileLayer(
@@ -48,7 +48,7 @@ function getLayers() {
       maxZoom: leafletMapLayersConfig['baseMapLayerStreetNumber']['maxZoom'],
       maxNativeZoom:
         leafletMapLayersConfig['baseMapLayerStreetNumber']['maxNativeZoom'],
-      layerTypeAPI: 'baseMapLayerStreetNumber'
+      layerTypeAPI: 'baseMapLayerStreetNumber',
     }
   )
   const swisstopoLayer_swissimage = L.tileLayer(
@@ -61,7 +61,7 @@ function getLayers() {
       maxZoom: leafletMapLayersConfig['swisstopoLayer_swissimage']['maxZoom'],
       maxNativeZoom:
         leafletMapLayersConfig['swisstopoLayer_swissimage']['maxNativeZoom'],
-      layerTypeAPI: 'swisstopoLayer_swissimage'
+      layerTypeAPI: 'swisstopoLayer_swissimage',
     }
   )
   const swisstopoLayer_pixelkarte = L.tileLayer(
@@ -74,7 +74,7 @@ function getLayers() {
       maxZoom: leafletMapLayersConfig['swisstopoLayer_pixelkarte']['maxZoom'],
       maxNativeZoom:
         leafletMapLayersConfig['swisstopoLayer_pixelkarte']['maxNativeZoom'],
-      layerTypeAPI: 'swisstopoLayer_pixelkarte'
+      layerTypeAPI: 'swisstopoLayer_pixelkarte',
     }
   )
   const swisstopoLayer_solarenergie_fassade = L.tileLayer(
@@ -92,7 +92,7 @@ function getLayers() {
         leafletMapLayersConfig['swisstopoLayer_solarenergie_fassade'][
           'maxNativeZoom'
         ],
-      layerTypeAPI: 'swisstopoLayer_solarenergie_fassade'
+      layerTypeAPI: 'swisstopoLayer_solarenergie_fassade',
     }
   )
   const swisstopoLayer_solarenergie_roof = L.tileLayer(
@@ -108,7 +108,7 @@ function getLayers() {
         leafletMapLayersConfig['swisstopoLayer_solarenergie_roof'][
           'maxNativeZoom'
         ],
-      layerTypeAPI: 'swisstopoLayer_solarenergie_roof'
+      layerTypeAPI: 'swisstopoLayer_solarenergie_roof',
     }
   )
   const openStreetMapLayer = L.tileLayer(
@@ -121,7 +121,7 @@ function getLayers() {
       maxZoom: leafletMapLayersConfig['openStreetMapLayer']['maxZoom'],
       maxNativeZoom:
         leafletMapLayersConfig['openStreetMapLayer']['maxNativeZoom'],
-      layerTypeAPI: 'openStreetMapLayer'
+      layerTypeAPI: 'openStreetMapLayer',
     }
   )
   const ignLayerPNOAImage = L.tileLayer(
@@ -136,7 +136,7 @@ function getLayers() {
       maxZoom: leafletMapLayersConfig['ignSpainLayer_pnoa_image']['maxZoom'],
       maxNativeZoom:
         leafletMapLayersConfig['ignSpainLayer_pnoa_image']['maxNativeZoom'],
-      layerTypeAPI: 'ignSpainLayer_pnoa_image'
+      layerTypeAPI: 'ignSpainLayer_pnoa_image',
     }
   )
   const ignLayerMap = L.tileLayer(
@@ -151,7 +151,7 @@ function getLayers() {
       maxZoom: leafletMapLayersConfig['ignSpainLayer_map']['maxZoom'],
       maxNativeZoom:
         leafletMapLayersConfig['ignSpainLayer_map']['maxNativeZoom'],
-      layerTypeAPI: 'ignSpainLayer_map'
+      layerTypeAPI: 'ignSpainLayer_map',
     }
   )
   const bkgHexagonImage = L.tileLayer.wms(
@@ -164,7 +164,7 @@ function getLayers() {
       maxZoom: leafletMapLayersConfig['bkgHexagonGermanyLayer']['maxZoom'],
       maxNativeZoom:
         leafletMapLayersConfig['bkgHexagonGermanyLayer']['maxNativeZoom'],
-      layerTypeAPI: 'bkgHexagonGermanyLayer'
+      layerTypeAPI: 'bkgHexagonGermanyLayer',
     }
   )
   const GeoLayer_HR = L.tileLayer(
@@ -185,7 +185,7 @@ function getLayers() {
       maxZoom: leafletMapLayersConfig['GeoPortal']['maxZoom'],
       maxNativeZoom: leafletMapLayersConfig['GeoPortal']['maxNativeZoom'],
       tileSize: 256,
-      layerTypeAPI: 'geoportail_fr_wmts_ortho_layer'
+      layerTypeAPI: 'geoportail_fr_wmts_ortho_layer',
     }
   )
 
@@ -208,7 +208,7 @@ function getLayers() {
       // query parameters
       apiVersion: '2022-08-01',
       tilesetId: 'microsoft.imagery',
-      subscriptionKey: process.env.VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY
+      subscriptionKey: process.env.VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY,
     }
   )
 
@@ -216,78 +216,78 @@ function getLayers() {
     {
       name: 'SwissTopo (satellite)',
       key: 'swisstopoLayer_swissimage',
-      layerData: swisstopoLayer_swissimage
+      layerData: swisstopoLayer_swissimage,
     },
     {
       name: 'SwissTopo (map)',
       key: 'swisstopoLayer_pixelkarte',
-      layerData: swisstopoLayer_pixelkarte
+      layerData: swisstopoLayer_pixelkarte,
     },
     {
       name: 'SwissTopo (Solar energy: suitability of roofs)',
       key: 'swisstopoLayer_solarenergie_roof',
-      layerData: swisstopoLayer_solarenergie_roof
+      layerData: swisstopoLayer_solarenergie_roof,
     },
     {
       name: 'SwissTopo (Solarenergie: suitability of facade)',
       key: 'swisstopoLayer_solarenergie_fassade',
-      layerData: swisstopoLayer_solarenergie_fassade
+      layerData: swisstopoLayer_solarenergie_fassade,
     },
     {
       name: 'OpenStreetMap',
       key: 'openStreetMapLayer',
-      layerData: openStreetMapLayer
+      layerData: openStreetMapLayer,
     },
     {
       name: 'Google (terrain)',
       key: 'googleLayerTerrain',
-      layerData: googleLayerTerrain
+      layerData: googleLayerTerrain,
     },
     {
       name: 'Google (roadmap)',
       key: 'googleLayerRoadmap',
-      layerData: googleLayerRoadmap
+      layerData: googleLayerRoadmap,
     },
     {
       name: 'Google (satellite)',
       key: 'googleLayer',
-      layerData: googleLayer
+      layerData: googleLayer,
     },
     {
       name: 'Basemap.at (roadmap)',
       key: 'baseMapLayer',
-      layerData: baseMapLayer
+      layerData: baseMapLayer,
     },
     {
       name: 'Basemap.at (satellite)',
       key: 'baseMapLayerStreetNumber',
-      layerData: baseMapLayerStreetNumber
+      layerData: baseMapLayerStreetNumber,
     },
     {
       name: 'IGN (PNOA satellite image)',
       key: 'ignSpainLayer_pnoa_image',
-      layerData: ignLayerPNOAImage
+      layerData: ignLayerPNOAImage,
     },
     {
       name: 'IGN (roadmap)',
       key: 'ignSpainLayer_map',
-      layerData: ignLayerMap
+      layerData: ignLayerMap,
     },
     {
       name: 'BKG satellite image',
       key: 'bkgHexagonGermanyLayer',
-      layerData: bkgHexagonImage
+      layerData: bkgHexagonImage,
     },
     {
       name: 'GeoPortal France (satellite)',
       key: 'geoportail_fr_wmts_ortho_layer',
-      layerData: GeoLayer_HR
+      layerData: GeoLayer_HR,
     },
     {
       name: 'Bing (satellite)',
       key: 'azureSatelliteLayer',
-      layerData: azureSatelliteLayer
-    }
+      layerData: azureSatelliteLayer,
+    },
   ]
 }
 export default getLayers

package/src/utils/leaflet-config.service.js

@@ -3,70 +3,70 @@ export const leafletMapLayersConfig = {
     // Basemap.at
     maxZoom: 21,
     maxNativeZoom: 19,
-    minZoom: 0
+    minZoom: 0,
   },
   baseMapLayerStreetNumber: {
     // Basemap.at (satellite)
     maxZoom: 21,
     maxNativeZoom: 19,
-    minZoom: 0
+    minZoom: 0,
   },
   swisstopoLayer_swissimage: {
     // SwissTopo (satellite)
     maxZoom: 25,
     maxNativeZoom: 20,
-    minZoom: 0
+    minZoom: 0,
   },
   swisstopoLayer_pixelkarte: {
     // SwissTopo (map)
     maxZoom: 25,
     maxNativeZoom: 18,
-    minZoom: 0
+    minZoom: 0,
   },
   swisstopoLayer_solarenergie_fassade: {
     // SwissTopo (Solarenergie: Eignung Fassaden)
     maxZoom: 25,
     maxNativeZoom: 18,
-    minZoom: 0
+    minZoom: 0,
   },
   swisstopoLayer_solarenergie_roof: {
     // SwissTopo (Solar energy: suitability of roofs)
     maxZoom: 25,
     maxNativeZoom: 18,
-    minZoom: 0
+    minZoom: 0,
   },
   openStreetMapLayer: {
     // OpenStreetMap
     maxZoom: 21,
     maxNativeZoom: 19,
-    minZoom: 0
+    minZoom: 0,
   },
   ignSpainLayer_pnoa_image: {
     // Spain (satellite)
     maxZoom: 25,
     maxNativeZoom: 20,
-    minZoom: 0
+    minZoom: 0,
   },
   ignSpainLayer_map: {
     // Spain (map)
     maxZoom: 25,
     maxNativeZoom: 20,
-    minZoom: 0
+    minZoom: 0,
   },
   bkgHexagonGermanyLayer: {
     // Germany (satellite)
     maxZoom: 25,
     maxNativeZoom: 22,
-    minZoom: 0
+    minZoom: 0,
   },
   GeoPortal: {
     maxZoom: 22,
     maxNativeZoom: 19,
-    minZoom: 6
+    minZoom: 6,
   },
   azureSatelliteLayer: {
     maxZoom: 25,
     maxNativeZoom: 19,
-    minZoom: 1
-  }
+    minZoom: 1,
+  },
 }