From 07a9c3f6dd2f60a6a5fbf0f98962f354310dad13 Mon Sep 17 00:00:00 2001 From: SuiteForge Date: Tue, 21 Jul 2026 00:19:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=89=93=E5=8C=85=E8=BF=9B=E5=A5=97=E4=BB=B6=20data/=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=96=E9=83=A8=E8=BE=93=E5=85=A5=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 去掉 province/cities 参数，只保留 output_path - GeoJSON 数据放在 data/ 目录，脚本自动读取 - 版本升到 1.0.1 - MEMORY.md / TOOLS.md 补充 platform 发布参数说明 Ref: SuiteHub/agent-profiles#22 --- suites/test-linux/scripts/convert.py | 62 +++++++++--------- suites/test-linux/scripts/overlay.py | 10 ++- suites/test-linux/workflow.yaml | 14 +---- suites/test-windows/scripts/arcpy_convert.py | 66 ++++++++++---------- suites/test-windows/workflow.yaml | 14 +---- 5 files changed, 71 insertions(+), 95 deletions(-) diff --git a/suites/test-linux/scripts/convert.py b/suites/test-linux/scripts/convert.py index 23f90ab..f7a9ca6 100644 --- a/suites/test-linux/scripts/convert.py +++ b/suites/test-linux/scripts/convert.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ Step 1: GeoJSON → SHP -将省界和城市 GeoJSON 文件转换为 Shapefile +从内置 data/ 目录读取 GeoJSON，转为 Shapefile """ import sys import json @@ -9,47 +9,47 @@ import os import geopandas as gpd +def get_data_dir(): + """返回内置 data/ 目录路径（相对脚本位置）""" + script_dir = os.path.dirname(os.path.abspath(__file__)) + return os.path.normpath(os.path.join(script_dir, "..", "data")) + + def main(): - province_path = os.environ.get("PARAM_PROVINCE", "") - cities_param = os.environ.get("PARAM_CITIES", "") output_dir = os.environ.get("PARAM_OUTPUT_DIR", "/tmp/output/shp") - - if not province_path: - print(json.dumps({"error": "缺少 province 参数", "success": False})) - sys.exit(1) - if not cities_param: - print(json.dumps({"error": "缺少 cities 参数", "success": False})) - sys.exit(1) - os.makedirs(output_dir, exist_ok=True) - # 读取并转换省界 - print(json.dumps({"msg": f"读取省界: {province_path}"})) - province_gdf = gpd.read_file(province_path) - province_shp = os.path.join(output_dir, "province.shp") - province_gdf.to_file(province_shp, driver="ESRI Shapefile") - print(json.dumps({"msg": f"省界已转为 SHP: {province_shp}", "count": len(province_gdf)})) + data_dir = get_data_dir() + + # 数据文件映射 + geo_files = { + "province": "yunnan.geojson", + "kunming": "kunming.geojson", + "dali": "dali.geojson", + "baise": "baise.geojson", + } - # 读取并转换每个城市 GeoJSON - city_files = [c.strip() for c in cities_param.split(",") if c.strip()] converted = [] - for cf in city_files: - if not os.path.isfile(cf): - print(json.dumps({"warn": f"文件不存在，跳过: {cf}"})) + for name, filename in geo_files.items(): + filepath = os.path.join(data_dir, filename) + if not os.path.isfile(filepath): + print(json.dumps({"warn": f"内置数据文件不存在，跳过: {filepath}"})) continue - print(json.dumps({"msg": f"读取城市: {cf}"})) - gdf = gpd.read_file(cf) - base = os.path.splitext(os.path.basename(cf))[0] - shp_path = os.path.join(output_dir, f"{base}.shp") + print(json.dumps({"msg": f"读取内置数据: {filename}"})) + gdf = gpd.read_file(filepath) + shp_path = os.path.join(output_dir, f"{name}.shp") gdf.to_file(shp_path, driver="ESRI Shapefile") - converted.append(base) - print(json.dumps({"msg": f"已转换: {cf} → {shp_path}", "count": len(gdf)})) + converted.append(name) + print(json.dumps({"msg": f"已转换: {filename} → {shp_path}", "count": len(gdf)})) + + if not converted: + print(json.dumps({"error": "未找到任何内置 GeoJSON 数据", "success": False})) + sys.exit(1) result = { "success": True, - "province_shp": province_shp, - "city_count": len(converted), - "cities": converted + "output_dir": output_dir, + "converted": converted } print(json.dumps(result)) diff --git a/suites/test-linux/scripts/overlay.py b/suites/test-linux/scripts/overlay.py index ff102e3..d883498 100644 --- a/suites/test-linux/scripts/overlay.py +++ b/suites/test-linux/scripts/overlay.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ Step 2: 叠加分析 -判断各城市是否在省界内（spatial join），输出分析结果 +判断各城市是否在省界内（使用投影坐标系避免 CRS 警告） """ import sys import json @@ -29,9 +29,7 @@ def main(): print(json.dumps({"error": "省界数据为空", "success": False})) sys.exit(1) - # 确保坐标系一致 - source_crs = province.crs or "EPSG:4326" - # 使用投影坐标系（墨卡托）计算中心点以避免 geographic CRS 警告 + # 使用投影坐标系（墨卡托）计算中心点 projected_crs = "EPSG:3857" province_proj = province.to_crs(projected_crs) @@ -58,11 +56,11 @@ def main(): city = city.to_crs(projected_crs) - # 空间判断：城市中心点是否在省界内（使用投影坐标系避免 CRS 警告） + # 空间判断：城市中心点是否在省界内 city_centroid = city.geometry.centroid.iloc[0] in_province = province_proj.geometry.contains(city_centroid).any() - # 也检查 intersect 作为辅助判断 + # 检查 intersect 作为辅助判断 intersects = province_proj.geometry.intersects(city.geometry).any() status = "通过 ✅" if in_province else "不通过 ❌" diff --git a/suites/test-linux/workflow.yaml b/suites/test-linux/workflow.yaml index 426d17f..8abb70c 100644 --- a/suites/test-linux/workflow.yaml +++ b/suites/test-linux/workflow.yaml @@ -1,6 +1,6 @@ name: 云南省界叠加分析（Linux 测试） -description: 验证 GIS Actions 4.0 Linux 双平台执行链路的测试套件。将示例 GeoJSON 转为 SHP → 叠加分析（判断城市是否在省内）→ 输出 Excel -version: 1.0.0 +description: 验证 GIS Actions 4.0 Linux 双平台执行链路的测试套件。内置云南/昆明/大理/百色 GeoJSON 示例数据，开箱即用。 +version: 1.0.1 author: SuiteForge platform: linux slug: test-yunnan-overlay-linux @@ -8,14 +8,6 @@ tags: [测试, 叠加分析, Linux, 云南省] category: 测试验证 params: - province: - type: string - required: true - desc: 省界 GeoJSON 文件路径 - cities: - type: string - required: true - desc: 待分析城市 GeoJSON 文件路径，多个文件用逗号分隔 output_path: type: string required: true @@ -29,8 +21,6 @@ steps: runtime: docker script_id: convert params: - province: $params.province - cities: $params.cities output_dir: /tmp/output/shp - id: overlay diff --git a/suites/test-windows/scripts/arcpy_convert.py b/suites/test-windows/scripts/arcpy_convert.py index 7cd0267..aa73d9c 100644 --- a/suites/test-windows/scripts/arcpy_convert.py +++ b/suites/test-windows/scripts/arcpy_convert.py @@ -1,60 +1,58 @@ #!/usr/bin/env python """ Step 1: GeoJSON → SHP (arcpy) -将省界和城市 GeoJSON 文件转换为 Shapefile -使用 arcpy 的 JSON To Feature Class 工具 +从内置 data/ 目录读取 GeoJSON，转为 Shapefile """ import sys import json import os import arcpy -# 允许覆写输出 arcpy.env.overwriteOutput = True -def main(): - province_path = os.environ.get("PARAM_PROVINCE", "") - cities_param = os.environ.get("PARAM_CITIES", "") - output_dir = os.environ.get("PARAM_OUTPUT_DIR", r"C:\temp\output\shp") +def get_data_dir(): + """返回内置 data/ 目录路径（相对脚本位置）""" + script_dir = os.path.dirname(os.path.abspath(__file__)) + return os.path.normpath(os.path.join(script_dir, "..", "data")) - if not province_path: - print json.dumps({"error": "缺少 province 参数", "success": False}) - sys.exit(1) - if not cities_param: - print json.dumps({"error": "缺少 cities 参数", "success": False}) - sys.exit(1) + +def main(): + output_dir = os.environ.get("PARAM_OUTPUT_DIR", r"C:\temp\output\shp") if not os.path.isdir(output_dir): os.makedirs(output_dir) - # 转换省界 - print json.dumps({"msg": "转换省界: " + province_path}) - province_name = os.path.splitext(os.path.basename(province_path))[0] - province_shp = os.path.join(output_dir, "province.shp") - # GeoJSON → Feature Class → Shapefile - arcpy.JSONToFeatures_conversion(province_path, province_shp) - print json.dumps({"msg": "省界已转为 SHP: " + province_shp}) + data_dir = get_data_dir() + + # 数据文件映射 + geo_files = { + "province": "yunnan.geojson", + "kunming": "kunming.geojson", + "dali": "dali.geojson", + "baise": "baise.geojson", + } - # 转换每个城市 - city_files = [c.strip() for c in cities_param.split(",") if c.strip()] converted = [] - for cf in city_files: - if not os.path.isfile(cf): - print json.dumps({"warn": "文件不存在，跳过: " + cf}) + for name, filename in geo_files.items(): + filepath = os.path.join(data_dir, filename) + if not os.path.isfile(filepath): + print json.dumps({"warn": u"内置数据文件不存在，跳过: " + filepath}) continue - print json.dumps({"msg": "转换城市: " + cf}) - base = os.path.splitext(os.path.basename(cf))[0] - shp_path = os.path.join(output_dir, base + ".shp") - arcpy.JSONToFeatures_conversion(cf, shp_path) - converted.append(base) - print json.dumps({"msg": "已转换: " + cf + " -> " + shp_path}) + print json.dumps({"msg": u"读取内置数据: " + filename}) + shp_path = os.path.join(output_dir, name + ".shp") + arcpy.JSONToFeatures_conversion(filepath, shp_path) + converted.append(name) + print json.dumps({"msg": u"已转换: " + filename + u" → " + shp_path}) + + if not converted: + print json.dumps({"error": u"未找到任何内置 GeoJSON 数据", "success": False}) + sys.exit(1) result = { "success": True, - "province_shp": province_shp, - "city_count": len(converted), - "cities": converted + "output_dir": output_dir, + "converted": converted } print json.dumps(result) diff --git a/suites/test-windows/workflow.yaml b/suites/test-windows/workflow.yaml index bde4778..38d7e0f 100644 --- a/suites/test-windows/workflow.yaml +++ b/suites/test-windows/workflow.yaml @@ -1,6 +1,6 @@ name: 云南省界叠加分析（Windows 测试） -description: 验证 GIS Actions 4.0 Windows 执行链路的测试套件。将示例 GeoJSON 转为 SHP → 叠加分析（arcpy）→ 输出 Excel -version: 1.0.0 +description: 验证 GIS Actions 4.0 Windows 执行链路的测试套件。内置云南/昆明/大理/百色 GeoJSON 示例数据，开箱即用。 +version: 1.0.1 author: SuiteForge platform: windows slug: test-yunnan-overlay-windows @@ -8,14 +8,6 @@ tags: [测试, 叠加分析, Windows, 云南省] category: 测试验证 params: - province: - type: string - required: true - desc: 省界 GeoJSON 文件路径 - cities: - type: string - required: true - desc: 待分析城市 GeoJSON 文件路径，多个文件用逗号分隔 output_path: type: string required: true @@ -27,8 +19,6 @@ steps: runtime: arcpy script_id: arcpy_convert params: - province: $params.province - cities: $params.cities output_dir: /tmp/output/shp - id: overlay