AIコメント対応

Author: sevendev

src/c_wrapper/tile_extractor_c.cpp

@@ -16,6 +16,16 @@ extern "C"{
         Model* const out_model) {
         API_TRY{
 
+            if (out_model == nullptr || extents == nullptr) {
+                return APIResult::ErrorInvalidArgument;
+            }
+            if (city_model_size < 0) {
+                return APIResult::ErrorInvalidArgument;
+            }
+                if (city_model_size > 0 && city_model_handles == nullptr) {
+                return APIResult::ErrorInvalidArgument;
+            }
+
             CityModelVector city_models = std::make_shared<std::vector<std::weak_ptr<const citygml::CityModel>>>();
             for (int i = 0; i < city_model_size; ++i) {
                 if (!city_model_handles[i]) {
@@ -26,6 +36,11 @@ extern "C"{
                 city_models->push_back(weak);
             }
 
+            if (city_models->empty()) {
+                // 入力に有効な CityModel が含まれていない
+                return APIResult::ErrorInvalidArgument;   
+            }
+
             TileExtractor::extractWithCombine(*out_model, city_models, options, *extents);
             return APIResult::Success;
 
@@ -40,6 +55,9 @@ extern "C"{
         const std::vector<plateau::geometry::Extent>* extents,
         Model* const out_model) {
         API_TRY{
+            if (out_model == nullptr || extents == nullptr || city_model_handle == nullptr) {
+                return APIResult::ErrorInvalidArgument;
+            }
             TileExtractor::extractWithGrid(*out_model, city_model_handle->getCityModel(), options, *extents);
             return APIResult::Success;
         }

src/polygon_mesh/tile_extractor.cpp

@@ -58,15 +58,16 @@ namespace {
             packer.process(out_model);
         }
 
-        const auto& gmlPath = (!city_models || city_models->empty() || city_models->front().expired()) ? "" : city_models->front().lock()->getGmlPath();
-
+        const auto & gmlPath = (!city_models || city_models->empty() || city_models->front().expired()) ? "" : city_models->front().lock()->getGmlPath();
+        
         // 現在の都市モデルが地形であるなら、衛星写真または地図用のUVを付与し、地図タイルをダウンロードします。
-        auto package = GmlFile(gmlPath).getPackage();
-        if (package == PredefinedCityModelPackage::Relief && options.attach_map_tile) {
-            const auto gml_path = fs::u8path(gmlPath);
-            const auto map_download_dest = gml_path.parent_path() / (gml_path.filename().u8string() + "_map");
-            MapAttacher().attach(out_model, options.map_tile_url, map_download_dest, options.map_tile_zoom_level,
-                geo_reference);
+        if (!gmlPath.empty()) {
+            auto package = GmlFile(gmlPath).getPackage();
+            if (package == PredefinedCityModelPackage::Relief && options.attach_map_tile) {
+                const auto gml_path = fs::u8path(gmlPath);
+                const auto map_download_dest = gml_path.parent_path() / (gml_path.filename().u8string() + "_map");
+                MapAttacher().attach(out_model, options.map_tile_url, map_download_dest, options.map_tile_zoom_level, geo_reference);
+            }
         }
     }