@eturnity/eturnity_3d 6.34.0 → 6.34.1

package/src/helper/MapView.js

@@ -1,5 +1,5 @@
-import {Mesh, MeshBasicMaterial} from 'three';
-import {MapNode,LODRaycast,MapPlaneNode} from 'geo-three';
+import { Mesh, MeshBasicMaterial } from 'three'
+import { MapNode, LODRaycast, MapPlaneNode } from 'geo-three'
 /**
  * Map viewer is used to read and display map tiles from a server.
  *
@@ -7,242 +7,215 @@ import {MapNode,LODRaycast,MapPlaneNode} from 'geo-three';
  *
  * The map is drawn in plane map nodes using a quad tree that is subdivided as necessary to guaratee good map quality.
  */
-export class MapView extends Mesh 
-{
-	/**
-	 * Planar map projection.
-	 */
-	PLANAR = 200;
-
-	
-	mapModes = new Map([
-		[MapView.PLANAR, MapPlaneNode]
-	]);
-
-	/**
-	 * LOD control object used to defined how tiles are loaded in and out of memory.
-	 */
-    lod = null;
-
-	/**
-	 * Map tile color layer provider.
-	 */
-	provider = null;
-
-	/**
-	 * Map height (terrain elevation) layer provider.
-	 * 
-	 * Only used for HEIGHT, HEIGHT_SHADER and MARTINI map modes.
-	 */
-	heightProvider = null;
-
-	/**
-	 * Define the type of map node in use, defined how the map is presented.
-	 *
-	 * Should only be set on creation.
-	 */
-	root = null;
-
-	/**
-	 * Indicate if the nodes should cache its children when it is simplified. Nodes that are no longer in use should be kept in memory.
-	 * 
-	 * Usefull for fast moving scenarios to prevent reparsing data in fast moving scenes.
-	 * 
-	 * Should only be used if the child generation process is time consuming. Should be kept off unless required.
-	 */
-	cacheTiles= false;
-
-	/**
-	 * Constructor for the map view objects.
-	 *
-	 * @param root - Map view node modes can be SPHERICAL, HEIGHT or PLANAR. PLANAR is used by default. Can also be a custom MapNode instance.
-	 * @param provider - Map color tile provider by default a OSM maps provider is used if none specified.
-	 * @param heightProvider - Map height tile provider, by default no height provider is used.
-	 */
-	constructor(root = MapView.PLANAR, provider = new OpenStreetMapsProvider(), heightProvider = null) 
-	{
-		super(undefined, new MeshBasicMaterial({transparent: true, opacity: 0.0}));
-		this.lod = new LODRaycast();
-		this.provider = provider;
-		this.heightProvider = heightProvider;
-		this.setRoot(root);
-		this.preSubdivide();
-	}
-
-	/**
-	 * Ajust node configuration depending on the camera distance.
-	 *
-	 * Called everytime automatically before render by the renderer.
-	 */
-	onBeforeRender=(renderer, scene, camera) => 
-	{
-		this.lod.updateLOD(this, camera, renderer, scene);
-	};
-
-	/**
-	 * Set the root of the map view.
-	 *
-	 * Is set by the constructor by default, can be changed in runtime.
-	 *
-	 * @param root - Map node to be used as root.
-	 */
-	setRoot(root)
-	{
-
-		if (typeof root === 'number') 
-		{
-			const rootConstructor = MapPlaneNode//MapView.mapModes.get(root);
-			// @ts-ignore
-			root = new rootConstructor(null, this);
-		}
-
-		// Remove old root
-		if (!!this.root ) 
-		{
-			this.remove(this.root);
-			this.root = null;
-		}
-
-		// @ts-ignore
-		this.root = root;
-
-		// Initialize root node
-		if (!!this.root ) 
-		{
-			// @ts-ignore
-			this.geometry = this.root.constructor.baseGeometry;
-			// // @ts-ignore
-			this.scale.copy(this.root.constructor.baseScale);
-
-			 this.root.mapView = this;
-			 this.add(this.root);
-			 this.root.initialize();
-		}
-	}
-
-	/**
-	 * Pre-subdivide map tree to create nodes of levels not available in the provider.
-	 * 
-	 * Checks for the minimum zoom level in the providers attached to the map view.
-	 */
-	preSubdivide() 
-	{
-		const minZoom = this.provider.minZoom
-		const maxZoom = this.provider.maxZoom
-		function subdivide(node, depth) 
-		{
-			if (depth <= 0) 
-			{
-				return;
-			}
-
-
-			node.subdivide();
-
-			for (let i = 0; i < node.children.length; i++) 
-			{
-				if (node.children[i] instanceof MapNode) 
-				{
-					const child = node.children[i];
-					subdivide(child, depth - 1);
-				}
-			}
-		}
-
-		
-		if (minZoom > 0) 
-		{  
-			subdivide(this.root, minZoom);
-		}
-	}
-
-	/**
-	 * Change the map provider of this map view.
-	 *
-	 * Will discard all the tiles already loaded using the old provider.
-	 */
-	 setProvider(provider)
-	{
-		if (provider !== this.provider) 
-		{
-			this.provider = provider;
-			this.clear();
-		}
-	}
-
-	/**
-	 * Change the map height provider of this map view.
-	 *
-	 * Will discard all the tiles already loaded using the old provider.
-	 */
-	 setHeightProvider(heightProvider)
-	{
-		if (heightProvider !== this.heightProvider) 
-		{
-			this.heightProvider = heightProvider;
-			this.clear();
-		}
-	}
-
-	/**
-	 * Clears all tiles from memory and reloads data. Used when changing the provider.
-	 *
-	 * Should be called manually if any changed to the provider are made without setting the provider.
-	 */
-	 clear()
-	{
-		this.traverse(function(children)
-		{
-			// @ts-ignore
-			if (children.childrenCache) 
-			{
-				// @ts-ignore
-				children.childrenCache = null;
-			}
-
-			// @ts-ignore
-			if (children.initialize) 
-			{
-				// @ts-ignore
-				children.initialize();
-			}
-		});
-
-		return this;
-	}
-
-	/**
-	 * Get the minimum zoom level available in the providers attached to the map view.
-	 * 
-	 * @returns Minimum zoom level available.
-	 */
-	 minZoom() 
-	{
-		return 15
-		return Math.max(this.provider.minZoom, -Infinity);
-	}
-
-	/**
-	 * Get the maximum zoom level available in the providers attached to the map view.
-	 * 
-	 * @returns Maximum zoom level available.
-	 */
-	 maxZoom() 
-	{
-		return 18
-		return Math.min(this.provider.maxZoom,  Infinity);
-	}
-
-	/**
-	 * Get map meta data from server if supported.
-	 */
-	 getMetaData()
-	{
-		this.provider.getMetaData();
-	}
-
-	 raycast(raycaster, intersects)
-	{
-		return false;
-	}
-}
+export class MapView extends Mesh {
+  /**
+   * Planar map projection.
+   */
+  PLANAR = 200
+
+  mapModes = new Map([[MapView.PLANAR, MapPlaneNode]])
+
+  /**
+   * LOD control object used to defined how tiles are loaded in and out of memory.
+   */
+  lod = null
+
+  /**
+   * Map tile color layer provider.
+   */
+  provider = null
+
+  /**
+   * Map height (terrain elevation) layer provider.
+   *
+   * Only used for HEIGHT, HEIGHT_SHADER and MARTINI map modes.
+   */
+  heightProvider = null
+
+  /**
+   * Define the type of map node in use, defined how the map is presented.
+   *
+   * Should only be set on creation.
+   */
+  root = null
+
+  /**
+   * Indicate if the nodes should cache its children when it is simplified. Nodes that are no longer in use should be kept in memory.
+   *
+   * Usefull for fast moving scenarios to prevent reparsing data in fast moving scenes.
+   *
+   * Should only be used if the child generation process is time consuming. Should be kept off unless required.
+   */
+  cacheTiles = false
+
+  /**
+   * Constructor for the map view objects.
+   *
+   * @param root - Map view node modes can be SPHERICAL, HEIGHT or PLANAR. PLANAR is used by default. Can also be a custom MapNode instance.
+   * @param provider - Map color tile provider by default a OSM maps provider is used if none specified.
+   * @param heightProvider - Map height tile provider, by default no height provider is used.
+   */
+  constructor(
+    root = MapView.PLANAR,
+    provider = new OpenStreetMapsProvider(),
+    heightProvider = null
+  ) {
+    super(undefined, new MeshBasicMaterial({ transparent: true, opacity: 0.0 }))
+    this.lod = new LODRaycast()
+    this.provider = provider
+    this.heightProvider = heightProvider
+    this.setRoot(root)
+    this.preSubdivide()
+  }
+
+  /**
+   * Ajust node configuration depending on the camera distance.
+   *
+   * Called everytime automatically before render by the renderer.
+   */
+  onBeforeRender = (renderer, scene, camera) => {
+    this.lod.updateLOD(this, camera, renderer, scene)
+  }
+
+  /**
+   * Set the root of the map view.
+   *
+   * Is set by the constructor by default, can be changed in runtime.
+   *
+   * @param root - Map node to be used as root.
+   */
+  setRoot(root) {
+    if (typeof root === 'number') {
+      const rootConstructor = MapPlaneNode //MapView.mapModes.get(root);
+      // @ts-ignore
+      root = new rootConstructor(null, this)
+    }
+
+    // Remove old root
+    if (!!this.root) {
+      this.remove(this.root)
+      this.root = null
+    }
+
+    // @ts-ignore
+    this.root = root
+
+    // Initialize root node
+    if (!!this.root) {
+      // @ts-ignore
+      this.geometry = this.root.constructor.baseGeometry
+      // // @ts-ignore
+      this.scale.copy(this.root.constructor.baseScale)
+
+      this.root.mapView = this
+      this.add(this.root)
+      this.root.initialize()
+    }
+  }
+
+  /**
+   * Pre-subdivide map tree to create nodes of levels not available in the provider.
+   *
+   * Checks for the minimum zoom level in the providers attached to the map view.
+   */
+  preSubdivide() {
+    const minZoom = this.provider.minZoom
+    const maxZoom = this.provider.maxZoom
+    function subdivide(node, depth) {
+      if (depth <= 0) {
+        return
+      }
+
+      node.subdivide()
+
+      for (let i = 0; i < node.children.length; i++) {
+        if (node.children[i] instanceof MapNode) {
+          const child = node.children[i]
+          subdivide(child, depth - 1)
+        }
+      }
+    }
+
+    if (minZoom > 0) {
+      subdivide(this.root, minZoom)
+    }
+  }
+
+  /**
+   * Change the map provider of this map view.
+   *
+   * Will discard all the tiles already loaded using the old provider.
+   */
+  setProvider(provider) {
+    if (provider !== this.provider) {
+      this.provider = provider
+      this.clear()
+    }
+  }
+
+  /**
+   * Change the map height provider of this map view.
+   *
+   * Will discard all the tiles already loaded using the old provider.
+   */
+  setHeightProvider(heightProvider) {
+    if (heightProvider !== this.heightProvider) {
+      this.heightProvider = heightProvider
+      this.clear()
+    }
+  }
+
+  /**
+   * Clears all tiles from memory and reloads data. Used when changing the provider.
+   *
+   * Should be called manually if any changed to the provider are made without setting the provider.
+   */
+  clear() {
+    this.traverse(function (children) {
+      // @ts-ignore
+      if (children.childrenCache) {
+        // @ts-ignore
+        children.childrenCache = null
+      }
+
+      // @ts-ignore
+      if (children.initialize) {
+        // @ts-ignore
+        children.initialize()
+      }
+    })
+
+    return this
+  }
+
+  /**
+   * Get the minimum zoom level available in the providers attached to the map view.
+   *
+   * @returns Minimum zoom level available.
+   */
+  minZoom() {
+    return 15
+    return Math.max(this.provider.minZoom, -Infinity)
+  }
+
+  /**
+   * Get the maximum zoom level available in the providers attached to the map view.
+   *
+   * @returns Maximum zoom level available.
+   */
+  maxZoom() {
+    return 18
+    return Math.min(this.provider.maxZoom, Infinity)
+  }
+
+  /**
+   * Get map meta data from server if supported.
+   */
+  getMetaData() {
+    this.provider.getMetaData()
+  }
+
+  raycast(raycaster, intersects) {
+    return false
+  }
+}

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -9,7 +9,7 @@ export function UpdateRoofModuleFieldRelations(state) {
   const roofPolygons = state.polygons.filter((poly) => poly.layer == 'roof')
   const moduleFieldPolygons = state.polygons.filter(
     (poly) => poly.layer == 'moduleField'
-    )
+  )
   const panelPolygons = state.polygons.filter((poly) =>
     ['panel', 'user_deactivated_panel'].includes(poly.layer)
   )
@@ -30,20 +30,14 @@ export function UpdateRoofModuleFieldRelations(state) {
 
   for (let k in moduleFieldPolygons) {
     const moduleField = moduleFieldPolygons[k]
-    const moduleFieldArea=calculateArea(moduleField.outline)
+    const moduleFieldArea = calculateArea(moduleField.outline)
     //check if everypoint is in the same roof and if they are not too far from the flat surface.(at least above)
-    let roofPolygonCandidates = roofPolygons.filter((roof) =>
-      {
-        const intersection=intersectOutlines(
-          moduleField.outline,
-          roof.outline
-        )
-        if(intersection.length==0) return false
-        const intersectionArea=calculateArea(intersection[0])
-        return intersectionArea>0.9*moduleFieldArea
-
-      }
-    )
+    let roofPolygonCandidates = roofPolygons.filter((roof) => {
+      const intersection = intersectOutlines(moduleField.outline, roof.outline)
+      if (intersection.length == 0) return false
+      const intersectionArea = calculateArea(intersection[0])
+      return intersectionArea > 0.9 * moduleFieldArea
+    })
     //roofs on roof can lead to multiple roof under a point. moduleField is in the smallest
     let smallestRoof = null
     for (let roof of roofPolygonCandidates) {
@@ -56,14 +50,14 @@ export function UpdateRoofModuleFieldRelations(state) {
       //no roof found under first node of moduleField => moduleField will be deleted
       continue
     }
-      roofPolygon.moduleFields.push(moduleField)
-      moduleField.roof = roofPolygon
-      moduleField.panels.forEach((panel) => (panel.roof = roofPolygon))
-      panelPolygons.forEach((p) => {
-        if (p.moduleField.id == moduleField.id) {
-          p.roof = roofPolygon
-        }
-      })
+    roofPolygon.moduleFields.push(moduleField)
+    moduleField.roof = roofPolygon
+    moduleField.panels.forEach((panel) => (panel.roof = roofPolygon))
+    panelPolygons.forEach((p) => {
+      if (p.moduleField.id == moduleField.id) {
+        p.roof = roofPolygon
+      }
+    })
     //}
   }
 
@@ -98,7 +92,7 @@ export function removeModuleFieldAndPanelsOnNoOrMultipleRoofs(state) {
   const remainingUserDeactivatedPanels = state.polygons.filter(
     (polygon) => polygon.layer == 'user_deactivated_panel' && !!polygon.roof
   )
-  
+
   state.polygons = [
     ...remainingPolygons,
     ...remainingModuleFields,

package/src/helper/UpdateRoofObstacleRelations.js

@@ -2,17 +2,15 @@ import {
   verticalProjectionOnPlane,
   calculateArea
 } from '@eturnity/eturnity_maths'
-import {
-  intersectOutlines
-} from '@eturnity/eturnity_maths'
+import { intersectOutlines } from '@eturnity/eturnity_maths'
 //this function just update the "roof" and "holes" properties of roofs and obstacles
-export function UpdateRoofObstacleRelations(state,updateVersionEnable=true) {
+export function UpdateRoofObstacleRelations(state, updateVersionEnable = true) {
   //let's remove all holes from roofs which are not obstacle then check for every obstacle and add them to roofs
   const roofPolygons = state.polygons.filter((poly) => poly.layer == 'roof')
-  const initialRelation={}
+  const initialRelation = {}
 
   roofPolygons.forEach((roofPolygon) => {
-    initialRelation[roofPolygon.id]=[]
+    initialRelation[roofPolygon.id] = []
     //breaking circular reference for memory management
     for (let k in roofPolygon.holes) {
       initialRelation[roofPolygon.id].push(roofPolygon.holes.id)
@@ -21,60 +19,69 @@ export function UpdateRoofObstacleRelations(state,updateVersionEnable=true) {
     roofPolygon.holes = []
   })
   const holePolygons = state.polygons.filter((poly) =>
-    ['roof','obstacle'].includes(poly.layer)
+    ['roof', 'obstacle'].includes(poly.layer)
   )
-  
+
   holePolygons.forEach((obstacle) => {
     //breaking circular reference for memory management
     for (let k in obstacle.roofs) {
       obstacle.roofs[k] = null
     }
     obstacle.roofs = []
-    
-    let roofsWithObstacle=roofPolygons.filter(roof=>{
-      let intersection=intersectOutlines(obstacle.outline,roof.outline)[0]||[]
-      if(intersection.length==0)return false
-      if(obstacle.layer=='obstacle')return true
 
-      let deltaArea=calculateArea(roof.outline)-calculateArea(intersection)
-      if(deltaArea<100)return false
+    let roofsWithObstacle = roofPolygons.filter((roof) => {
+      let intersection =
+        intersectOutlines(obstacle.outline, roof.outline)[0] || []
+      if (intersection.length == 0) return false
+      if (obstacle.layer == 'obstacle') return true
+
+      let deltaArea = calculateArea(roof.outline) - calculateArea(intersection)
+      if (deltaArea < 100) return false
       return true
     })
-    
-    let heightReference = 0      
-      for (let roof of roofsWithObstacle) {
-        
-        heightReference = obstacle.outline.reduce((acc,cur)=>{
-          acc=Math.max(
-            acc,
-            verticalProjectionOnPlane(cur, roof.normalVector, roof.flatOutline[0])
-              .z
-          )
-          return acc
-        },0)
-        
-        if (!obstacle.roofs.map((r) => r.id).includes(roof.id) && obstacle.id!=roof.id) {
-          obstacle.roofs.push(roof)
-        }
-        if (!roof.holes.map((h) => h.id).includes(obstacle.id) && obstacle.id!=roof.id) {
-          roof.holes.push(obstacle)
-        }
+
+    let heightReference = 0
+    for (let roof of roofsWithObstacle) {
+      heightReference = obstacle.outline.reduce((acc, cur) => {
+        acc = Math.max(
+          acc,
+          verticalProjectionOnPlane(cur, roof.normalVector, roof.flatOutline[0])
+            .z
+        )
+        return acc
+      }, 0)
+
+      if (
+        !obstacle.roofs.map((r) => r.id).includes(roof.id) &&
+        obstacle.id != roof.id
+      ) {
+        obstacle.roofs.push(roof)
+      }
+      if (
+        !roof.holes.map((h) => h.id).includes(obstacle.id) &&
+        obstacle.id != roof.id
+      ) {
+        roof.holes.push(obstacle)
       }
-      obstacle.heightReference = heightReference
-    
-    
+    }
+    obstacle.heightReference = heightReference
   })
 
-  roofPolygons.forEach((roof)=>{
-    if(roof.holes.map(h=>h.id).sort().join()!=initialRelation[roof.id].sort().join()){
-      if(updateVersionEnable){
+  roofPolygons.forEach((roof) => {
+    if (
+      roof.holes
+        .map((h) => h.id)
+        .sort()
+        .join() != initialRelation[roof.id].sort().join()
+    ) {
+      if (updateVersionEnable) {
         roof.version++
       }
     }
   })
 
   state = removeStandaloneObstacles(state)
-  
+
   return state
 }