AIコメント対応

Author: sevendev

include/plateau/polygon_mesh/polygon_mesh_types.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include "citygml/citymodel.h"
+#include <map>
+#include <memory>
+#include <utility>
+#include <vector>
+
+namespace plateau::polygonMesh {
+    using CityModelVector = std::shared_ptr<std::vector<std::weak_ptr<const citygml::CityModel>>>;
+}

include/plateau/polygon_mesh/tile_extractor.h

@@ -5,13 +5,12 @@
 #include <memory>
 #include <plateau/polygon_mesh/mesh.h>
 #include <plateau/geometry/geo_coordinate.h>
+#include <plateau/polygon_mesh/polygon_mesh_types.h>
 #include "citygml/citymodel.h"
 #include "model.h"
 
 namespace plateau::polygonMesh {
 
-    using CityModelVector = std::shared_ptr<std::vector<std::weak_ptr<const citygml::CityModel>>>;
-
     /**
 	 * TileExtractorは、複数のCityModelからメッシュを抽出し、指定された範囲(extents)に基づいて結合メッシュを抽出するクラスです。
      * 

src/c_wrapper/tile_extractor_c.cpp

@@ -8,7 +8,7 @@ using namespace plateau::polygonMesh;
 extern "C"{
 
     LIBPLATEAU_C_EXPORT APIResult LIBPLATEAU_C_API plateau_tile_extractor_extract_with_combine(
-        const CityModelHandle** const city_model_handles,
+        const CityModelHandle* const* city_model_handles,
         const int city_model_size,
         const MeshExtractOptions options,
         const std::vector<plateau::geometry::Extent>* extents,
@@ -62,6 +62,11 @@ extern "C"{
                 return APIResult::ErrorInvalidArgument;
             }
             TileExtractor::extractWithGrid(*out_model, city_model_handle->getCityModel(), options, *extents);
+            auto cityModelPtr = city_model_handle->getCityModelPtr();
+            if (!cityModelPtr) {
+                return APIResult::ErrorInvalidArgument;
+            }
+            TileExtractor::extractWithGrid(*out_model, *cityModelPtr, options, *extents);
             return APIResult::Success;
         }
         API_CATCH;

src/polygon_mesh/area_mesh_factory.h

@@ -4,10 +4,9 @@
 #include "plateau/geometry/geo_reference.h"
 #include <plateau/polygon_mesh/mesh.h>
 #include <plateau/polygon_mesh/mesh_extract_options.h>
+#include <plateau/polygon_mesh/polygon_mesh_types.h>
 
 namespace plateau::polygonMesh {
-    using CityModelVector = std::shared_ptr<std::vector<std::weak_ptr<const citygml::CityModel>>>;
-
     // グループIDとグリッドIDのペアをキーとし、その結合後Meshのmapです。
     // キー: std::pair<group_id, grid_id>
     using GridMergeResult = std::map<std::pair<unsigned, unsigned>, std::unique_ptr<Mesh>>;