@ohuoy/easymap 1.1.10 → 1.1.12

package/data/gis_weather.sql

@@ -0,0 +1,37 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 90
+ Source Server Type    : PostgreSQL
+ Source Server Version : 120000 (120000)
+ Source Host           : 192.168.11.90:5432
+ Source Catalog        : sdgydb
+ Source Schema         : public
+
+ Target Server Type    : PostgreSQL
+ Target Server Version : 120000 (120000)
+ File Encoding         : 65001
+
+ Date: 30/09/2025 13:44:37
+*/
+
+
+-- ----------------------------
+-- Table structure for gis_weather
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."gis_weather";
+CREATE TABLE "public"."gis_weather" (
+  "gw_type" int2 NOT NULL,
+  "gw_json" jsonb NOT NULL,
+  "gw_name" varchar COLLATE "pg_catalog"."default" NOT NULL,
+  "gw_code" varchar COLLATE "pg_catalog"."default" NOT NULL,
+  "gw_update_time" timestamptz(6) NOT NULL,
+  "gw_level" int2 NOT NULL,
+  "gw_create_time" timestamptz(6) NOT NULL
+)
+;
+
+-- ----------------------------
+-- Primary Key structure for table gis_weather
+-- ----------------------------
+ALTER TABLE "public"."gis_weather" ADD CONSTRAINT "gis_weather_pkey" PRIMARY KEY ("gw_code", "gw_create_time");

package/index.js

@@ -161,7 +161,14 @@ export class EasyMap {
             map.addLayer(layer);
           }
         })
-        map.theme.value = map.style.stylesheet.theme
+        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);
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohuoy/easymap",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "self map easy use",
   "main": "main.js",
   "scripts": {

package/src/components/layer/AnimationLayer.js

@@ -18,6 +18,7 @@ export default class AnimationLayer{
     itemList = []
     oldItem ={}
     opacity = 0.8
+    textureLoading = false
     obj = {}
     status = actionStatus.Pause
     current = 0
@@ -30,6 +31,9 @@ export default class AnimationLayer{
     }
     setProgress=()=>{
 
+    }
+    textureLoadingFun = ()=>{
+
     }
 
     destory(){
@@ -47,6 +51,9 @@ export default class AnimationLayer{
       this.getProgress = config.getProgress
       this.setProgress = config.setProgress
       this.textClass = config.textClass
+      if(config.textureLoadingFun){
+        this.textureLoadingFun = config.textureLoadingFun
+      }
        this.progress = new Proxy(this.progress,{
         set:(target, property, value)=>{
           target[property] = value                    
@@ -95,7 +102,7 @@ export default class AnimationLayer{
     }
   
     loadMesh(){      
-      let texture = this.itemList[0].texture
+      let texture = this.itemList[0].texture      
       let _item = this.itemList[0].item;
       let geometry = new THREE.PlaneGeometry(_item.width *20,_item.width*20);        
       //geometry.setAttribute('position', new THREE.BufferAttribute(vertices, 3));
@@ -180,7 +187,9 @@ export default class AnimationLayer{
           }else{            
             this.animate()
             this.getProgress(this.progress.value,this.status,this.current)
-            this.current++;
+            if(!this.textureLoading){
+              this.current++;
+            }            
           }                    
         }
         this.updateStyleByTheme()
@@ -210,6 +219,14 @@ export default class AnimationLayer{
     }
 
     animate(){
+      let item = this.itemList[this.current].texture
+      if(!item.image){
+        this.textureLoading = true
+        this.textureLoadingFun(true)
+      }else{
+        this.textureLoading = false
+        this.textureLoadingFun(false)
+      }
       this.obj.model.material.map = this.itemList[this.current].texture
       let _item = this.itemList[this.current].item   
       this.obj.label.element.innerHTML = _item.text

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