3dtiles地图数据预加载接口，terrain3d_analyzer_color移动到slope_aspect_img

b3dm/earthwork_api.py

@@ -3,10 +3,10 @@ from sanic import Blueprint, Request, json
 from sanic.response import text
 from typing import Dict, Any
 import logging
-from earthwork_calculator_point_cloud import EarthworkCalculatorPointCloud
+from b3dm.earthwork_calculator_point_cloud import EarthworkCalculatorPointCloud
 # 导入计算模块
-from earthwork_calculator_3d_tiles import EarthworkCalculator3dTiles, AlgorithmType, EarthworkResult3dTiles
+from b3dm.earthwork_calculator_3d_tiles import EarthworkCalculator3dTiles, AlgorithmType, EarthworkResult3dTiles
-from tileset_data_source import TilesetDataSource
+from b3dm.tileset_data_source import TilesetDataSource
 
 earthwork_bp = Blueprint("earthwork", url_prefix="")
 

b3dm/slope_aspect_img.py

@@ -1,4 +1,4 @@
-# terrain3d_analyzer_color13
+# slope_aspect_img13
 import numpy as np
 import matplotlib.pyplot as plt
 from scipy.ndimage import sobel

b3dm/terrain_api.py

@@ -7,7 +7,8 @@ import time
 import uuid
 import urllib.parse
 import threading
-from terrain_calculator import TerrainCalculator
+import os
+from b3dm.terrain_calculator import TerrainCalculator
 
 terrain_bp = Blueprint("terrain", url_prefix="")
 MINIO_SUB_PATH = "slopeAspectPng"
@@ -54,7 +55,6 @@ class PointItem(BaseModel):
     z: float = Field(..., description="z坐标")
 
 class PointRequest(BaseModel):
-    """使用Pydantic HttpUrl类型的严格点批量请求模型"""
     points: List[PointItem] = Field(..., description="点列表")
     url: str = Field(..., description="URL地址")
     
@@ -64,6 +64,9 @@ class PointRequest(BaseModel):
             raise ValueError("批量处理最多支持10个点")
         return v
     
+class PreloadRequest(BaseModel):
+    url: str = Field(..., description="URL地址")
+
 class AnalysisConfig(BaseModel):
     """分析配置"""
     classify: bool = Field(default=True, description="是否进行分类")
@@ -155,6 +158,42 @@ async def calculate_aspect1(request: Request):
             "success": False
         }, status=500)
 
+@terrain_bp.post("/api/v1/calculate/preload3dTiles")
+async def preload_3dtiles(request: Request):
+    """预加载3dtiles地图数据"""
+    try:
+        data = request.json
+        if not data:
+            return json({"error": "请求体不能为空"}, status=400)
+        
+        # 验证输入
+        try:
+            vector = PreloadRequest(**data)
+        except Exception as e:
+            return json({"error": f"输入验证失败: {str(e)}"}, status=400)
+        
+        # 创建并启动线程
+        script_dir = os.path.dirname(os.path.abspath(__file__))
+        thread1 = threading.Thread(target=TerrainCalculator.preload_3dtiles, args=(vector.url))
+        # 启动线程
+        thread1.start()
+        url_prefix = extract_and_rebuild_url(vector.url)
+        return json({
+            "success": True,
+            "data": f"{script_dir}/data_3dtiles",
+            "request": {
+                "input_vector": vector.model_dump(),
+                "timestamp": time.time()
+            }
+        })
+        
+    except Exception as e:
+        logger.error(f"坡向计算API错误: {e}")
+        return json({
+            "error": f"服务器内部错误: {str(e)}",
+            "success": False
+        }, status=500)
+
 @terrain_bp.post("/api/v1/calculate/slopeAspect")
 async def calculate_slopeAspect(request: Request):
     """生成坡向坡度俯视图"""

b3dm/terrain_calculator.py

@@ -3,20 +3,40 @@ from typing import List, Tuple, Dict, Any
 import logging
 import os
 import uuid
-from data_3dtiles_manager import MinIO3DTilesManager
+from b3dm.data_3dtiles_manager import MinIO3DTilesManager
-import data_3dtiles_to_dem
+import b3dm.data_3dtiles_to_dem as data_3dtiles_to_dem
-import terrain3d_analyzer_color
+import b3dm.slope_aspect_img as slope_aspect_img
 
 logger = logging.getLogger(__name__)
 
+ENDPOINT_URL = "222.212.85.86:9000"
+ACCESS_KEY = "WuRenJi"
+SECRET_KEY = "WRJ@2024"
+
+
 class TerrainCalculator:
     """地形坡度和坡向计算器"""
 
+    def preload_3dtiles(url) :
+        # 下载3dtiles地图数据
+        manager = MinIO3DTilesManager(
+            endpoint_url=ENDPOINT_URL,
+            access_key=ACCESS_KEY,
+            secret_key=SECRET_KEY,
+            secure=False
+        )
+        script_dir = os.path.dirname(os.path.abspath(__file__))
+        success, entry_local_path = manager.download_full_tileset(
+            tileset_url=url,
+            save_dir=f"{script_dir}/data_3dtiles",
+            region_filter=None
+        )
+        if not success :
+            logger.info(f"下载地图数据失败: {url}")
+            return "下载地图数据失败", None
+
     def generate_slopeAspect_3d_overlook(region_coords, url, overall_3d_png_name, minio_sub_path) :
         # 下载3dtiles地图数据
-        ENDPOINT_URL = "222.212.85.86:9000"
-        ACCESS_KEY = "WuRenJi"
-        SECRET_KEY = "WRJ@2024"
         manager = MinIO3DTilesManager(
             endpoint_url=ENDPOINT_URL,
             access_key=ACCESS_KEY,
@@ -35,14 +55,14 @@ class TerrainCalculator:
         
         tileset_path = entry_local_path
         dem_path = os.path.join(script_dir, f"o_dem_{uuid.uuid4().hex[:8]}.tif")
-        data_3dtiles_to_dem.generate_dem(region_coords, tileset_path, dem_path)
+        data_3dtiles_to_dem.generate_dem(tileset_path, dem_path, region_coords)
 
         if not os.path.exists(dem_path) :
             logger.info(f"生成坡度坡向俯视图失败: {url},{region_coords}")
             return "生成坡度坡向俯视图失败", None
         
         overall_3d_png_path = os.path.join(script_dir, overall_3d_png_name)
-        terrain3d_analyzer_color.read_slope_aspect_by_dem(dem_path, overall_3d_png_path)
+        slope_aspect_img.read_slope_aspect_by_dem(dem_path, overall_3d_png_path)
         logger.info(f"生成成功: {url},{region_coords},{overall_3d_png_path}")
 
         entry_bucket, _ = manager.parse_minio_url(url);