@ohuoy/easymap 1.1.11 → 1.1.13

package/index.js

@@ -127,7 +127,7 @@ export class EasyMap {
         })       
     }
 
-
+    mapStyleTimer = null
     setMapStyle(style){
       let map = this.map;
       const layerIds = map.style.order 
@@ -143,38 +143,60 @@ export class EasyMap {
         layers.push(layer)
         map.removeLayer(id)
       });
-      const handleStyleLoad = () => {
-        // Object.keys(sources).forEach(key => {
-        //   if (!map.getSource(key)) {
-        //     map.addSource(key, sources[key]);
-        //   }
-        // }
-      // );
-       
-        sources.forEach(source=>{
-          if (!map.getSource(source.id)) {
-            map.addSource(source.id,source._options);
-          }
-        })
-        layers.forEach(layer=>{
-          if (!map.getLayer(layer.id)) {
-            map.addLayer(layer);
-          }
-        })
-        if(layerIds.indexOf("tiandi") >= 0){
-          map.theme.value ="light"
-        }
-        else if(layerIds.indexOf("yingxiang") >= 0){
-          map.theme.value ="dark"
-        }else{
-          map.theme.value = map.style.stylesheet.theme
-        }        
+      // const handleStyleLoad = () => {
+      //   console.log(222)
+      //   sources.forEach(source=>{
+      //     if (!map.getSource(source.id)) {
+      //       map.addSource(source.id,source._options);
+      //     }
+      //   })
+      //   layers.forEach(layer=>{
+      //     if (!map.getLayer(layer.id)) {
+      //       map.addLayer(layer);
+      //     }
+      //   })
+
+      //   if(layerIds.indexOf("tiandi") >= 0){
+      //     map.theme.value ="light"
+      //   }
+      //   else if(layerIds.indexOf("yingxiang") >= 0){
+      //     map.theme.value ="dark"
+      //   }else{
+      //     map.theme.value = map.style.stylesheet.theme
+      //   }        
       
-        map.off('style.load', handleStyleLoad);
-      };
+      //   map.off('style.load', handleStyleLoad);
+      // };
       
-      map.on('style.load', handleStyleLoad);
-      map.setStyle(style);
+      // this.map.on('style.load', handleStyleLoad);
+      this.map.on('styledata', ()=>{
+        if(this.mapStyleTimer){
+          clearTimeout(this.mapStyleTimer)
+        }
+          this.mapStyleTimer = setTimeout(() => {
+            sources.forEach(source=>{
+              if (!map.getSource(source.id)) {
+                map.addSource(source.id,source._options);
+              }
+            })
+            layers.forEach(layer=>{
+              if (!map.getLayer(layer.id)) {
+                map.addLayer(layer);
+              }
+            })
+    
+            if(layerIds.indexOf("tiandi") >= 0){
+              map.theme.value ="light"
+            }
+            else if(layerIds.indexOf("yingxiang") >= 0){
+              map.theme.value ="dark"
+            }else{
+              map.theme.value = map.style.stylesheet.theme
+            }    
+            this.mapStyleTimer = null    
+          }, 1000);        
+      });
+      this.map.setStyle(style);
     }
 
     async setStyle(url){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohuoy/easymap",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "self map easy use",
   "main": "main.js",
   "scripts": {
@@ -45,3 +45,4 @@
     "webpack-cli": "^5.1.4"
   }
 }
+

package/src/components/layer/ThreeScanLayer.js

@@ -129,8 +129,11 @@ export default class ThreeScanLayer{
             await sleep(500)
         }        
         let elList = this.map._container.getElementsByClassName('esm-font-time')
-        this.map.theme = this.map.theme ? this.map.theme :this.map.style.stylesheet.theme
-        console.log('theme:'+this.map.theme.value)
+        // this.map.theme = this.map.theme ? this.map.theme :this.map.style.stylesheet.theme
+        if(!this.map.theme){
+            this.map.theme = this.map.theme ? this.map.theme :this.map.style.stylesheet.theme
+        }
+        // console.log('theme:'+this.map.theme.value)
         let color = this.map.theme.value == "dark"?"#fff" : "#000"
         if(elList.length == 0){
             await sleep(200)

package/src/components/layer/ThreeWallLayer.js

@@ -233,7 +233,7 @@ export default class ThreeWallLayer{
                 // normals.push(_n.x,_n.y,_n.z)   
                 // let arrowHelper = new THREE.ArrowHelper( new THREE.Vector3(_n.x, _n.y, _n.z), new THREE.Vector3( 0, 0, 0 ), 100, 0xffff00 );
                 // this.scene.add(arrowHelper)
-                console.log(_n)
+                // console.log(_n)
 
                 for(let j in item.data){
                     let h = (j * 1 -1 +noDataLenth) * this.scale