@eturnity/eturnity_3d 8.31.1 → 8.34.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "8.31.1",
+  "version": "8.34.1",
   "files": [
     "dist",
     "src"

package/src/config.js

@@ -293,3 +293,9 @@ export const fittingPanelsColorMap = {
   white: '#ffffff',
   default: '#0068DE',
 }
+
+export const defaultTextureColorMap = {
+  0: 'blue',
+  1: 'black',
+  2: 'black',
+}

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -7,7 +7,7 @@ import {
   isPolygonInsidePolygon,
   getConcaveOutlines,
 } from '@eturnity/eturnity_maths'
-import { fittingPanelsColorMap } from '../config'
+import { defaultTextureColorMap, fittingPanelsColorMap } from '../config'
 //this function just update the "roof" and "moduleField(s)" properties of panels,moduleFields and roofs
 export function UpdateRoofModuleFieldRelations(state) {
   let moduleFields = state.polygons.filter(
@@ -106,9 +106,12 @@ export function updateModuleFieldFittingPanels(moduleField) {
     })
   })
 
-  // map backsheet color to hex color
-  const backSheetColor = moduleField.pvData?.backsheet_color || 'default'
-  const mappedColor = fittingPanelsColorMap[backSheetColor]
+  const hasCustomTexture = moduleField.pvData?.texture_img_url
+  const defaultTextureIndex = moduleField.pvData?.module_texture_version_id || 0
+  const color = hasCustomTexture
+    ? moduleField.pvData?.backsheet_color
+    : defaultTextureColorMap[defaultTextureIndex]
+  const mappedColor = fittingPanelsColorMap[color || 'default']
 
   moduleField.fittingPanels = {
     polygons,

package/src/helper/customProvider.js

@@ -1,15 +1,13 @@
+import * as L from 'leaflet'
 import { MapProvider } from 'geo-three'
-import getLayers from '../utils/layers'
 import ImageHelper from './ImageHelper'
 import { MAP_LAYER_TYPE } from '../utils/constants'
 
 export class CustomProvider extends MapProvider {
-  constructor(address, map_layer) {
+  constructor(address, layer) {
     super()
-
-    const layer = getLayers().find((layer) => layer.key == map_layer)
     this.layer = layer
-    this.mapLayer = map_layer
+    this.mapLayer = layer.key
     this.maxZoom = this.layer.layerData.options.maxNativeZoom || 20
     this.minZoom = this.layer.layerData.options.minZoom || 17
     const imgSrc = require('../assets/images/white_tile.png')
@@ -23,7 +21,7 @@ export class CustomProvider extends MapProvider {
   getImageSrc(layerKey, layer, position) {
     const { x, y, zoom } = position
     let imageSrc = layer._url
-    if (layerKey == 'bkgHexagonGermanyLayer') {
+    if (layerKey == MAP_LAYER_TYPE.HEXAGON_SATELLITE) {
       const numTiles = Math.pow(2, zoom)
       const tileX = x
       const tileY = numTiles - 1 - y
@@ -48,7 +46,7 @@ export class CustomProvider extends MapProvider {
         '&height=256' +
         '&crs=EPSG%3A3857' +
         `&bbox=${xMin},${yMin},${xMax},${yMax}`
-    } else if (layerKey == 'azureSatelliteLayer') {
+    } else if (layerKey == MAP_LAYER_TYPE.AZURE_SATELLITE) {
       const { apiVersion, tilesetId, subscriptionKey } = layer.options
       imageSrc = imageSrc
         .replace('{x}', x)
@@ -83,9 +81,10 @@ export class CustomProvider extends MapProvider {
         y,
         zoom,
       }
+      const isLayerGroup = this.layer.layerData instanceof L.LayerGroup
       if (zoom < minZoomLayer) {
         return this.defaultImage
-      } else if (this.layer.key === MAP_LAYER_TYPE.HEXAGON_SATELLITE) {
+      } else if (isLayerGroup) {
         const layerGroup = this.layer.layerData
         const layers = layerGroup
           .getLayers()

package/src/helper/threeMixin.js

@@ -1,4 +1,5 @@
 import * as THREE from 'three'
+import { mapState } from 'vuex'
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
 import { Sky } from 'three/examples/jsm/objects/Sky.js'
 import { CustomProvider } from './customProvider'
@@ -33,6 +34,11 @@ export default {
       DOMElement: null,
     }
   },
+  computed: {
+    ...mapState({
+      buildingLocation: (state) => state.threeDModule.buildingLocation,
+    }),
+  },
   mixins: [initializeThree, renderMixin, materialMixin],
   methods: {
     initialiseThree({
@@ -206,12 +212,12 @@ export default {
       if (!this.selectedMapLayer) {
         this.initialiseMapLayer()
       }
-      this.provider = new CustomProvider('', this.selectedMapLayer.key)
+      this.provider = new CustomProvider('', this.selectedMapLayer)
       this.renderTiles()
     },
     initialiseMapLayer(layerKey = null) {
       if (!this.layers || this.layers.length == 0) {
-        this.layers = getLayers()
+        this.layers = getLayers(this.buildingLocation)
       }
       this.setSelectedMapLayer(null)
 

package/src/utils/constants.js

@@ -13,4 +13,5 @@ export const MAP_LAYER_TYPE = {
   IGN_ROAD: 'ignSpainLayer_map',
   HEXAGON_SATELLITE: 'bkgHexagonGermanyLayer',
   GEOPORTAL_SATELLITE: 'geoportail_fr_wmts_ortho_layer',
+  AZURE_SATELLITE: 'azureSatelliteLayer',
 }

package/src/utils/layers.js

@@ -158,7 +158,7 @@ const ignLayerMap = L.tileLayer(
   }
 )
 
-const getHexagonLayer = (url, params) => {
+const createHexagonLayer = (url, params) => {
   const options = {
     kid: params.kid,
     format: 'image/png',
@@ -177,7 +177,7 @@ const getHexagonLayer = (url, params) => {
   return L.tileLayer.wms(url, options)
 }
 
-const hexagonImageDop20 = getHexagonLayer(
+const hexagonLayerDop20 = createHexagonLayer(
   'https://geodaten-vertrieb.de/Proxy/DOP20/wms',
   {
     layers: 'DOP20',
@@ -186,7 +186,7 @@ const hexagonImageDop20 = getHexagonLayer(
   }
 )
 
-const hexagonImageDop10 = getHexagonLayer(
+const hexagonLayerDop10 = createHexagonLayer(
   'https://geodaten-vertrieb.de/Proxy/DOP10/wms',
   {
     layers: 'DOP10',
@@ -195,7 +195,7 @@ const hexagonImageDop10 = getHexagonLayer(
   }
 )
 
-const hexagonLayerGroup = L.layerGroup([hexagonImageDop20, hexagonImageDop10], {
+const hexagonLayerGroup = L.layerGroup([hexagonLayerDop20, hexagonLayerDop10], {
   attribution: `© GeoBasis-DE/BKG ${new Date().getFullYear()}, powered by HxGN`,
   maxZoom: leafletMapLayersConfig['bkgHexagonGermanyLayer']['maxZoom'],
   maxNativeZoom:
@@ -203,6 +203,15 @@ const hexagonLayerGroup = L.layerGroup([hexagonImageDop20, hexagonImageDop10], {
   layerTypeAPI: 'bkgHexagonGermanyLayer',
 })
 
+const getHexagonLayer = (location = {}) => {
+  const {
+    country_short: country,
+    administrative_area_level_1: administrativeAreaLevel,
+  } = location
+  const supportsDop10 = country === 'DE' && administrativeAreaLevel === 'NRW'
+  return supportsDop10 ? hexagonLayerGroup : hexagonLayerDop20
+}
+
 const GeoLayer_HR = L.tileLayer(
   'https://data.geopf.fr/wmts?' +
     '&REQUEST=GetTile&SERVICE=WMTS&VERSION=1.0.0' +
@@ -290,7 +299,7 @@ const azureSatelliteLayer = L.tileLayer(
   }
 )
 
-function getLayers() {
+function getLayers(location) {
   return [
     {
       name: 'SwissTopo (satellite)',
@@ -375,7 +384,7 @@ function getLayers() {
     {
       name: 'BKG (satellite)',
       key: 'bkgHexagonGermanyLayer',
-      layerData: hexagonLayerGroup,
+      layerData: getHexagonLayer(location),
     },
   ]
 }