epsg double => int に変更

sevendev · sevendev · commit 46601fd6a7c2 · 2025-04-21T11:32:01.000+09:00
diff --git a/include/plateau/geometry/geo_coordinate.h b/include/plateau/geometry/geo_coordinate.h
@@ -82,8 +82,8 @@ namespace plateau::geometry {
          * 平面直角座標系の判定を含む処理です
          * 平面直角座標の場合はunprojectして緯度経度に変換してから判定します。
          */
-        bool containsInPolar(TVec3d point,const double epsg, bool ignore_height = true) const;
-        bool containsInPolar(const citygml::CityObject& city_obj,const double epsg, bool ignore_height = true) const;
+        bool containsInPolar(TVec3d point,const int epsg, bool ignore_height = true) const;
+        bool containsInPolar(const citygml::CityObject& city_obj,const int epsg, bool ignore_height = true) const;
 
         /**
          * other と交わる箇所があるかどうかを返します。
@@ -111,8 +111,11 @@ namespace plateau::geometry {
     * 平面直角座標判定、平面直角座標の基準点取得
     */
     struct CoordinateReferenceFactory {
+
+        static constexpr int default_epsg_ = 6697;
+
         // EPSGごとのzone取得
-        static int GetZoneId(double epsg) {
+        static int GetZoneId(int epsg) {
             // 日本測地系2011（JGD2011）に基づく平面直角座標系
             if (epsg == 10162) {
                 return 1; // 1系
@@ -157,7 +160,7 @@ namespace plateau::geometry {
         }
 
         // EPSGごとの基準点取得
-        static GeoCoordinate GetReferencePoint(double epsg) {
+        static GeoCoordinate GetReferencePoint(int epsg) {
             const int zone = GetZoneId(epsg);
             if (zone != 0)
                 return GetReferencePointByZone(zone);
@@ -212,7 +215,7 @@ namespace plateau::geometry {
         }
 
         // 極座標系・平面直角座標系判定
-        static bool IsPolarCoordinateSystem(double epsg) {
+        static bool IsPolarCoordinateSystem(int epsg) {
             // 平面直角座標系の区分についてはこちらを参照してください :
             // https://www.mlit.go.jp/plateaudocument/toc9/toc9_08/toc9_08_04/
             if (epsg >= 10162 && epsg <= 10174) {
diff --git a/include/plateau/geometry/geo_reference.h b/include/plateau/geometry/geo_reference.h
@@ -26,7 +26,7 @@ namespace plateau::geometry {
         /// project の座標軸変換をしない版です。座標軸は ENU → ENU であるとします。 reference_point_ は ENUに変換されます。
         TVec3d projectWithoutAxisConvert(const TVec3d& lat_lon) const;
         TVec3d convertAxisToENU(const TVec3d& vertex) const;
-        TVec3d convert(const TVec3d& lat_lon, const bool convert_axis = true, const double epsg = 6697) const;
+        TVec3d convert(const TVec3d& lat_lon, const bool convert_axis = true, const int epsg = CoordinateReferenceFactory::default_epsg_) const;
         static TVec3d convertAxisFromENUTo(CoordinateSystem axis, const TVec3d& vertex);
         static TVec3d convertAxisToENU(CoordinateSystem axis, const TVec3d& vertex); 
 
diff --git a/include/plateau/polygon_mesh/mesh_extract_options.h b/include/plateau/polygon_mesh/mesh_extract_options.h
@@ -38,7 +38,7 @@ namespace plateau::polygonMesh {
                 attach_map_tile(true),
                 map_tile_zoom_level(15),
                 map_tile_url("https://cyberjapandata.gsi.go.jp/xyz/seamlessphoto/{z}/{x}/{y}.jpg"),
-                epsg_code(6697)
+                epsg_code(plateau::geometry::CoordinateReferenceFactory::default_epsg_)
                 {}
 
     public:
@@ -116,6 +116,6 @@ namespace plateau::polygonMesh {
         /**
          * 平面直角座標系は、EPSGコードに応じて基準点を取得します。
          */
-        double epsg_code;
+        int epsg_code;
     };
 }
diff --git a/src/c_wrapper/geo_reference_c.cpp b/src/c_wrapper/geo_reference_c.cpp
@@ -49,7 +49,7 @@ extern "C" {
                 GeoReference,
                 TVec3d,
                 handle->convert(point, convert_axis, epsg),
-                , TVec3d point, bool convert_axis, double epsg)
+                , TVec3d point, bool convert_axis, int epsg)
 
     DLL_VALUE_FUNC(plateau_geo_reference_get_reference_point,
                   GeoReference,
diff --git a/src/c_wrapper/geometry_utils_c.cpp b/src/c_wrapper/geometry_utils_c.cpp
@@ -15,7 +15,7 @@ DLL_VALUE_FUNC(plateau_geometry_utils_get_center_point,
                ,int coordinate_zone_id)
 
 LIBPLATEAU_C_EXPORT APIResult LIBPLATEAU_C_API plateau_geometry_utils_is_polar_coordinate_system(
-    double epsg,
+    int epsg,
     bool* out
 ) {
 API_TRY{
diff --git a/src/c_wrapper/gml_file_c.cpp b/src/c_wrapper/gml_file_c.cpp
@@ -50,7 +50,7 @@ extern "C" {
 
     DLL_VALUE_FUNC(plateau_gml_file_get_epsg,
                     GmlFile,
-                    double,
+                    int,
                     handle->getEpsg())
 
     LIBPLATEAU_C_EXPORT APIResult LIBPLATEAU_C_API plateau_gml_file_fetch(
diff --git a/src/geometry/geo_coordinate.cpp b/src/geometry/geo_coordinate.cpp
@@ -64,7 +64,7 @@ namespace plateau::geometry {
         }
     }
 
-    bool Extent::containsInPolar(TVec3d point, const double epsg, bool ignore_height) const {
+    bool Extent::containsInPolar(TVec3d point, const int epsg, bool ignore_height) const {
 
         if (!CoordinateReferenceFactory::IsPolarCoordinateSystem(epsg)) {
             // 平面直角座標系の判定
@@ -74,7 +74,7 @@ namespace plateau::geometry {
         return contains(GeoCoordinate(point.x, point.y, point.z), ignore_height);
     }
 
-    bool Extent::containsInPolar(const CityObject& city_obj, const double epsg, bool ignore_height) const {
+    bool Extent::containsInPolar(const CityObject& city_obj, const int epsg, bool ignore_height) const {
 
         if (!CoordinateReferenceFactory::IsPolarCoordinateSystem(epsg)) {
             // 平面直角座標系の判定
diff --git a/src/geometry/geo_reference.cpp b/src/geometry/geo_reference.cpp
@@ -25,7 +25,7 @@ namespace plateau::geometry {
     }
 
     //平面直角座標判定を含むproject, projectWithoutAxisConvert処理と同様の処理
-    TVec3d GeoReference::convert(const TVec3d& lat_lon, const bool convert_axis, const double epsg) const {
+    TVec3d GeoReference::convert(const TVec3d& lat_lon, const bool convert_axis, const int epsg) const {
         //平面直角座標変換、座標軸変換をフラグに応じてスキップします。
         TVec3d point = lat_lon;
 
diff --git a/src/polygon_mesh/mesh_factory.cpp b/src/polygon_mesh/mesh_factory.cpp
@@ -32,7 +32,7 @@ namespace plateau::polygonMesh {
          */
         void cityGmlPolygonToMesh(
             const Polygon& polygon, const std::string& gml_path,
-            const GeoReference& geo_reference, Mesh& out_mesh, double epsg) {
+            const GeoReference& geo_reference, Mesh& out_mesh, int epsg) {
 
             // マージ対象の情報を取得します。ここでの頂点は極座標です。
             const auto& vertices_lat_lon = polygon.getVertices();
diff --git a/wrappers/csharp/LibPLATEAU.NET/CSharpPLATEAU.Test/Dataset/GmlFileTest.cs b/wrappers/csharp/LibPLATEAU.NET/CSharpPLATEAU.Test/Dataset/GmlFileTest.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PLATEAU.Dataset;
+using PLATEAU.Geometries;
 using PLATEAU.Network;
 
 namespace PLATEAU.Test.Dataset
@@ -42,7 +43,7 @@ public void TestEpsgCode()
             string path = "data/udx/bldg/53392642_bldg_6697_op2.gml";
             var info = GmlFile.Create(path);
             Assert.AreEqual(6697, info.Epsg);
-            Assert.IsTrue(info.isPolarCoordinateSystem);
+            Assert.IsTrue(CoordinateReferenceFactory.IsPolarCoordinateSystem(info.Epsg));
             info.Dispose();
         }
 
@@ -53,7 +54,7 @@ public void TestEpsgCodePlane()
             string path = "data/udx/unf/08EE763_unf_10169_sewer_op.gml";
             var info = GmlFile.Create(path);
             Assert.AreEqual(10169, info.Epsg);
-            Assert.IsFalse(info.isPolarCoordinateSystem);
+            Assert.IsFalse(CoordinateReferenceFactory.IsPolarCoordinateSystem(info.Epsg));
             info.Dispose();
         }
 
diff --git a/wrappers/csharp/LibPLATEAU.NET/CSharpPLATEAU/Dataset/GmlFile.cs b/wrappers/csharp/LibPLATEAU.NET/CSharpPLATEAU/Dataset/GmlFile.cs
@@ -100,33 +100,17 @@ public GridCode GridCode
         /// GMLファイルのEPSGコードを返します。
         /// 取得失敗時のデフォルト値はEPSG:6697です。
         /// </summary>
-        public double Epsg
+        public int Epsg
         {
             get
             {
                 ThrowIfDisposed();
-                var epsg = DLLUtil.GetNativeValue<double>(Handle,
+                var epsg = DLLUtil.GetNativeValue<int>(Handle,
                     NativeMethods.plateau_gml_file_get_epsg);
                 return epsg;
             }
         }
 
-        /// <summary>
-        /// 平面直角座標系への変換が必要なGMLファイルかどうかを返します。
-        /// 取得失敗時のデフォルト値はtrueです。
-        /// </summary>
-        public bool isPolarCoordinateSystem
-        {
-            get
-            {
-                ThrowIfDisposed();
-                var result = NativeMethods.plateau_geometry_utils_is_polar_coordinate_system(Epsg, out var isPolar);
-                DLLUtil.CheckDllError(result);
-                return isPolar;
-            }
-        }
-
-
         public string[] SearchAllCodelistPathsInGml()
         {
             var nativePaths = NativeVectorString.Create();
@@ -249,12 +233,7 @@ internal static extern APIResult plateau_gml_file_get_grid_code(
             [DllImport(DLLUtil.DllName)]
             internal static extern APIResult plateau_gml_file_get_epsg(
                 [In] IntPtr gmlFilePtr,
-                out double outEpsg);
-
-            [DllImport(DLLUtil.DllName)]
-            internal static extern APIResult plateau_geometry_utils_is_polar_coordinate_system(
-                double epsg,
-                [MarshalAs(UnmanagedType.U1)] out bool outBool);
+                out int outEpsg);
 
             [DllImport(DLLUtil.DllName, CharSet = CharSet.Ansi)]
             internal static extern APIResult plateau_gml_file_fetch(
diff --git a/wrappers/csharp/LibPLATEAU.NET/CSharpPLATEAU/Geometries/CoordinateReferenceFactory.cs b/wrappers/csharp/LibPLATEAU.NET/CSharpPLATEAU/Geometries/CoordinateReferenceFactory.cs
@@ -0,0 +1,34 @@
+﻿using System;
+using System.Runtime.InteropServices;
+using PLATEAU.Dataset;
+using PLATEAU.Interop;
+using PLATEAU.Native;
+
+namespace PLATEAU.Geometries
+{
+    public static class CoordinateReferenceFactory
+    {
+
+        public static readonly int DEFAULT_EPSG = 6697;
+
+        /// <summary>
+        /// 平面直角座標系への変換が必要なGMLファイルかどうかを返します。
+        /// 取得失敗時のデフォルト値はtrueです。
+        /// </summary>
+        public static bool IsPolarCoordinateSystem(int Epsg)
+        {
+            var result = NativeMethods.plateau_geometry_utils_is_polar_coordinate_system(Epsg, out var isPolar);
+            DLLUtil.CheckDllError(result);
+            return isPolar;
+        }
+
+        internal static class NativeMethods
+        {
+            [DllImport(DLLUtil.DllName)]
+            internal static extern APIResult plateau_geometry_utils_is_polar_coordinate_system(
+                int epsg,
+                [MarshalAs(UnmanagedType.U1)] out bool outBool);
+        }
+    }
+}
+
diff --git a/wrappers/csharp/LibPLATEAU.NET/CSharpPLATEAU/Geometries/GeoReference.cs b/wrappers/csharp/LibPLATEAU.NET/CSharpPLATEAU/Geometries/GeoReference.cs
@@ -142,7 +142,7 @@ public GeoCoordinate Unproject(PlateauVector3d point)
             return outLatLon;
         }
 
-        public PlateauVector3d Convert(PlateauVector3d point, bool convertAxis, double epsg)
+        public PlateauVector3d Convert(PlateauVector3d point, bool convertAxis, int epsg)
         {
             var result = NativeMethods.plateau_geo_reference_convert(
                 Handle, out var outXyz,
@@ -256,7 +256,7 @@ internal static extern APIResult plateau_geo_reference_project_without_axis_conv
             internal static extern APIResult plateau_geo_reference_convert(
             [In] IntPtr geoReferencePtr,
             out PlateauVector3d outXyz,
-            PlateauVector3d point, [MarshalAs(UnmanagedType.U1)] bool convertAxis, double epsg);
+            PlateauVector3d point, [MarshalAs(UnmanagedType.U1)] bool convertAxis, int epsg);
 
             [DllImport(DLLUtil.DllName)]
             internal static extern APIResult plateau_geo_reference_get_reference_point(
diff --git a/wrappers/csharp/LibPLATEAU.NET/CSharpPLATEAU/PolygonMesh/MeshExtractOptions.cs b/wrappers/csharp/LibPLATEAU.NET/CSharpPLATEAU/PolygonMesh/MeshExtractOptions.cs
@@ -72,7 +72,7 @@ public static ConvertGranularity ToConvertGranularity(this MeshGranularity g)
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
     public struct MeshExtractOptions
     {
-        public MeshExtractOptions(PlateauVector3d referencePoint, CoordinateSystem meshAxes, MeshGranularity meshGranularity, uint minLOD, uint maxLOD, bool exportAppearance, int gridCountOfSide, float unitScale, int coordinateZoneID, bool excludeCityObjectOutsideExtent, bool excludePolygonsOutsideExtent, bool enableTexturePacking, uint texturePackingResolution, bool attachMapTile, int mapTileZoomLevel, string mapTileURL, double epsgCode)
+        public MeshExtractOptions(PlateauVector3d referencePoint, CoordinateSystem meshAxes, MeshGranularity meshGranularity, uint minLOD, uint maxLOD, bool exportAppearance, int gridCountOfSide, float unitScale, int coordinateZoneID, bool excludeCityObjectOutsideExtent, bool excludePolygonsOutsideExtent, bool enableTexturePacking, uint texturePackingResolution, bool attachMapTile, int mapTileZoomLevel, string mapTileURL, int epsgCode)
         {
             this.ReferencePoint = referencePoint;
             this.MeshAxes = meshAxes;
@@ -225,7 +225,7 @@ public string MapTileURL
             }
         }
 
-        public double epsgCode;
+        public int epsgCode;
 
         /// <summary> デフォルト値の設定を返します。 </summary>
         internal static MeshExtractOptions DefaultValue()

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ namespace plateau::geometry {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- bool Extent::containsInPolar(TVec3d point, const double epsg, bool ignore_height) const {`
	`67`	`+ bool Extent::containsInPolar(TVec3d point, const int epsg, bool ignore_height) const {`
`68`	`68`
`69`	`69`	`if (!CoordinateReferenceFactory::IsPolarCoordinateSystem(epsg)) {`
`70`	`70`	`// 平面直角座標系の判定`
`@@ -74,7 +74,7 @@ namespace plateau::geometry {`
`74`	`74`	`return contains(GeoCoordinate(point.x, point.y, point.z), ignore_height);`
`75`	`75`	`}`
`76`	`76`
`77`		`- bool Extent::containsInPolar(const CityObject& city_obj, const double epsg, bool ignore_height) const {`
	`77`	`+ bool Extent::containsInPolar(const CityObject& city_obj, const int epsg, bool ignore_height) const {`
`78`	`78`
`79`	`79`	`if (!CoordinateReferenceFactory::IsPolarCoordinateSystem(epsg)) {`
`80`	`80`	`// 平面直角座標系の判定`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace plateau::geometry {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`//平面直角座標判定を含むproject, projectWithoutAxisConvert処理と同様の処理`
`28`		`- TVec3d GeoReference::convert(const TVec3d& lat_lon, const bool convert_axis, const double epsg) const {`
	`28`	`+ TVec3d GeoReference::convert(const TVec3d& lat_lon, const bool convert_axis, const int epsg) const {`
`29`	`29`	`//平面直角座標変換、座標軸変換をフラグに応じてスキップします。`
`30`	`30`	`TVec3d point = lat_lon;`
`31`	`31`