bool isPolarCoordinateSystem() に変更

Author: sevendev

include/plateau/dataset/gml_file.h

@@ -22,7 +22,7 @@ namespace plateau::dataset {
         void setPath(const std::string& path);
         MeshCode getMeshCode() const;
         double getEpsg() const;
-        double usePolarConversion() const;
+        bool isPolarCoordinateSystem() const;
         const std::string& getFeatureType() const;
         PredefinedCityModelPackage getPackage() const;
         std::string getAppearanceDirectoryPath() const;

src/dataset/gml_file.cpp

@@ -60,7 +60,7 @@ namespace plateau::dataset {
         }
     }
 
-    double GmlFile::usePolarConversion() const {
+    bool GmlFile::isPolarCoordinateSystem() const {
         double epsg = getEpsg();
         // 平面直角座標系の区分についてはこちらを参照してください :
         // https://www.mlit.go.jp/plateaudocument/toc9/toc9_08/toc9_08_04/

src/polygon_mesh/mesh_factory.cpp

@@ -56,7 +56,7 @@ namespace plateau::polygonMesh {
             auto& out_vertices = out_mesh.getVertices();
             out_vertices.reserve(vertices_lat_lon.size());
             for (const auto& lat_lon : vertices_lat_lon) {
-                auto xyz = geo_reference.convert(lat_lon, false, gml.usePolarConversion());
+                auto xyz = geo_reference.convert(lat_lon, false, gml.isPolarCoordinateSystem());
                 out_vertices.push_back(xyz);
             }
             assert(out_vertices.size() == vertices_lat_lon.size());

src/polygon_mesh/polygon_mesh_utils.cpp

@@ -62,7 +62,7 @@ namespace plateau::polygonMesh {
         }
         const auto& gml = plateau::dataset::GmlFile(city_model.getGmlPath());
         auto city_center = (envelope.getLowerBound() + envelope.getUpperBound()) / 2.0;
-        return geometry::GeoReference(coordinate_zone_id).convert(city_center, true, gml.usePolarConversion());
+        return geometry::GeoReference(coordinate_zone_id).convert(city_center, true, gml.isPolarCoordinateSystem());
     }
 
     /**

test/test_gml_file.cpp

@@ -16,11 +16,11 @@ namespace plateau::dataset {
     TEST_F(GmlFileTest, get_epsg) { // NOLINT
         auto info1 = GmlFile(std::string("foobar/udx/unf/08EE751_unf_10169_water_op.gml"));
         ASSERT_EQ(10169, info1.getEpsg());
-        ASSERT_FALSE(info1.usePolarConversion());
+        ASSERT_FALSE(info1.isPolarCoordinateSystem());
 
         auto info2 = GmlFile(std::string("foobar/udx/bldg/53392546_bldg_6697_2_op.gml"));
         ASSERT_EQ(6697, info2.getEpsg());
-        ASSERT_TRUE(info2.usePolarConversion());     
+        ASSERT_TRUE(info2.isPolarCoordinateSystem());     
     }
 
     // fetch のテストは test_dataset.cpp にあります。

test/test_mesh_extractor.cpp

@@ -224,7 +224,7 @@ namespace plateau::polygonMesh {
         const std::shared_ptr<const CityModel> city_model = load(gml_path, params);
 
         const auto& gml = plateau::dataset::GmlFile((city_model->getGmlPath()));
-        ASSERT_FALSE(gml.usePolarConversion());
+        ASSERT_FALSE(gml.isPolarCoordinateSystem());
 
         auto model = MeshExtractor::extract(*city_model, mesh_extract_options);
         const auto& lod_node = model->getRootNodeAt(0);