Sfoglia il codice sorgente

fix(修复两个bug)

wzh 4 mesi fa
parent
commit
473dcac0f9
2 ha cambiato i file con 18 aggiunte e 18 eliminazioni
  1. 11 11
      app.py
  2. 7 7
      video_location.py

+ 11 - 11
app.py

@@ -14,19 +14,19 @@ from video_location import process_geojson_for_frontend
 from pixel_to_lonlat import pixel_to_lonlat
 import logging
 # 配置全局日志
-# logging.basicConfig(
-#     filename='app.log',  # 日志文件
-#     level=logging.INFO,  # 记录 DEBUG 及以上级别日志
-#     format='%(asctime)s [%(levelname)s] %(name)s: %(message)s'
-# )
 logging.basicConfig(
-    level=logging.INFO,
-    format='%(asctime)s [%(levelname)s] %(name)s: %(message)s',
-    handlers=[
-        logging.FileHandler('app.log'),  # 日志文件
-        logging.StreamHandler()  # 控制台输出
-    ]
+    filename='app.log',  # 日志文件
+    level=logging.INFO,  # 记录 DEBUG 及以上级别日志
+    format='%(asctime)s [%(levelname)s] %(name)s: %(message)s'
 )
+# logging.basicConfig(
+#     level=logging.INFO,
+#     format='%(asctime)s [%(levelname)s] %(name)s: %(message)s',
+#     handlers=[
+#         logging.FileHandler('app.log'),  # 日志文件
+#         logging.StreamHandler()  # 控制台输出
+#     ]
+# )
 
 print("app init")
 

+ 7 - 7
video_location.py

@@ -143,17 +143,17 @@ def process_geojson_for_frontend(geojson_data, camera_params, calibrated_params)
     for lon, lat in geo_coords:
         u, v, is_visible = project_lonlat_to_pixel(
             lon, lat,
-            resolution_w=camera_params['resolution_w'], resolution_h=camera_params['resolution_h'],
-            cam_lon=camera_params['cam_lon'], cam_lat=camera_params['cam_lat'],
-            cam_height=calibrated_params['cam_height'], p=camera_params['p'],
-            t=camera_params['t'], hfov=calibrated_params['hfov'],
-            north_p_value=camera_params['north_p_value']
+            resolution_w=int(camera_params['resolution_w']), resolution_h=int(camera_params['resolution_h']),
+            cam_lon=float(camera_params['cam_lon']), cam_lat=float(camera_params['cam_lat']),
+            cam_height=float(calibrated_params['cam_height']), p=float(camera_params['p']),
+            t=float(camera_params['t']), hfov=float(calibrated_params['hfov']),
+            north_p_value=float(camera_params['north_p_value'])
         )
         raw_pixel_points.append([int(u), int(v)])
 
     visible_segments = []
-    screen_w = camera_params['resolution_w']
-    screen_h = camera_params['resolution_h']
+    screen_w = int(camera_params['resolution_w'])
+    screen_h = int(camera_params['resolution_h'])
 
     for i in range(len(raw_pixel_points) - 1):
         p1 = raw_pixel_points[i]