AIコメント対応

Author: sevendev

include/plateau/polygon_mesh/polygon_mesh_types.h

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

include/plateau/polygon_mesh/tile_extractor.h

@@ -1,11 +1,9 @@
 #pragma once
 
 #include <plateau/polygon_mesh/mesh_extractor.h>
+#include <plateau/polygon_mesh/polygon_mesh_types.h>
 #include <libplateau_api.h>
 #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"
 
@@ -22,14 +20,14 @@ namespace plateau::polygonMesh {
          * CityModelのリストを結合し範囲内のModelを取り出します。
          */
         static std::shared_ptr<Model> extractWithCombine(
-            CityModelVector city_models, const MeshExtractOptions& options,
+            const CityModelVector& city_models, const MeshExtractOptions& options,
             const std::vector<plateau::geometry::Extent>& extents);
 
         /**
          * CityModelのリストを結合し範囲内のModelを取り出します。
          */
         static void extractWithCombine(Model& out_model,
-            CityModelVector city_models, const MeshExtractOptions& options,
+            const CityModelVector& city_models, const MeshExtractOptions& options,
             const std::vector<plateau::geometry::Extent>& extents);
 
         /**

src/c_wrapper/tile_extractor_c.cpp

@@ -61,7 +61,6 @@ extern "C"{
             if (out_model == nullptr || extents == nullptr || city_model_handle == nullptr) {
                 return APIResult::ErrorInvalidArgument;
             }
-            TileExtractor::extractWithGrid(*out_model, city_model_handle->getCityModel(), options, *extents);
             auto cityModelPtr = city_model_handle->getCityModelPtr();
             if (!cityModelPtr) {
                 return APIResult::ErrorInvalidArgument;

src/polygon_mesh/area_mesh_factory.cpp

@@ -166,7 +166,7 @@ namespace plateau::polygonMesh {
     }
 
     GridMergeResult
-        AreaMeshFactory::combine(CityModelVector city_models, const MeshExtractOptions& options, unsigned lod,
+        AreaMeshFactory::combine(const CityModelVector& city_models, const MeshExtractOptions& options, unsigned lod,
             const plateau::geometry::GeoReference& geo_reference, const std::vector<plateau::geometry::Extent>& extents) {
 
         const auto& gmlPath = city_models->empty() || city_models->front().expired() ? "" : city_models->front().lock()->getGmlPath();

src/polygon_mesh/area_mesh_factory.h

@@ -5,6 +5,9 @@
 #include <plateau/polygon_mesh/mesh.h>
 #include <plateau/polygon_mesh/mesh_extract_options.h>
 #include <plateau/polygon_mesh/polygon_mesh_types.h>
+#include <map>
+#include <memory>
+#include <utility>
 
 namespace plateau::polygonMesh {
     // グループIDとグリッドIDのペアをキーとし、その結合後Meshのmapです。
@@ -30,7 +33,7 @@ namespace plateau::polygonMesh {
          * 複数のcity_model内のメッシュを結合して返します。
          */
         static GridMergeResult
-        combine(CityModelVector city_models, const MeshExtractOptions& options, unsigned lod,
+        combine(const CityModelVector& city_models, const MeshExtractOptions& options, unsigned lod,
             const plateau::geometry::GeoReference& geo_reference, const std::vector<plateau::geometry::Extent>& extents);
     };
 }

src/polygon_mesh/tile_extractor.cpp

@@ -165,7 +165,7 @@ namespace {
 namespace plateau::polygonMesh {
 
     std::shared_ptr<Model> TileExtractor::extractWithCombine(
-        CityModelVector city_models, const MeshExtractOptions& options,
+        const CityModelVector& city_models, const MeshExtractOptions& options,
         const std::vector<plateau::geometry::Extent>& extents) {
         auto result = std::make_shared<Model>();
         extractWithCombine(*result, city_models, options, extents);
@@ -174,7 +174,7 @@ namespace plateau::polygonMesh {
 
     void TileExtractor::extractWithCombine(
         Model& out_model,
-        CityModelVector city_models, const MeshExtractOptions& options,
+        const CityModelVector& city_models, const MeshExtractOptions& options,
         const std::vector<plateau::geometry::Extent>& extents) {
         extractWithCombineInner(out_model, city_models, options, extents);
     }