std::array -> std::setに

reference point -> origin point

Author: sevendev

include/plateau/geometry/geo_coordinate.h

@@ -3,6 +3,7 @@
 #include "citygml/vecs.hpp"
 #include "citygml/cityobject.h"
 #include <array>
+#include <set>
 #include <utility>
 
 namespace plateau::geometry {
@@ -115,23 +116,13 @@ namespace plateau::geometry {
         static constexpr int default_epsg = 6697;
 
         // EPSGとZone IDのマッピング
-        static constexpr std::array<std::pair<int, int>, 13> epsg_to_zone = { {
-            {10162, 1}, {10163, 2}, {10164, 3}, {10165, 4}, {10166, 5},
-            {10167, 6}, {10168, 7}, {10169, 8}, {10170, 9}, {10171, 10},
-            {10172, 11}, {10173, 12}, {10174, 13}
-        } };
+        static const std::set<std::pair<int, int>> epsg_to_zone;
 
         // Zone IDごとの座標データ
-        static constexpr std::array<std::pair<int, std::array<double, 3>>, 13> zone_to_point = { {
-            {1, {33.0, 129.5, 0.0}}, {2, {33.0, 131.0, 0.0}}, {3, {36.0, 132.166667, 0.0}},
-            {4, {33.0, 133.5, 0.0}}, {5, {36.0, 134.333333, 0.0}}, {6, {36.0, 136.0, 0.0}},
-            {7, {36.0, 137.166667, 0.0}}, {8, {36.0, 138.5, 0.0}}, {9, {35.0, 139.833333, 0.0}},
-            {10, {40.0, 140.833333, 0.0}}, {11, {44.0, 140.25, 0.0}}, {12, {44.0, 142.0, 0.0}},
-            {13, {43.0, 144.0, 0.0}}
-        } };
+        static const std::set<std::pair<int, std::array<double, 3>>> zone_to_point;
 
         // EPSGごとのzone取得
-        static constexpr int GetZoneId(int epsg) {
+        static const int GetZoneId(int epsg) {
             for (const auto& pair : epsg_to_zone) {
                 if (pair.first == epsg) {
                     return pair.second;
@@ -141,7 +132,7 @@ namespace plateau::geometry {
         }
 
         // EPSGごとの基準点取得
-        static GeoCoordinate GetReferencePoint(int epsg) {
+        static GeoCoordinate GetOriginPoint(int epsg) {
             const int zone = GetZoneId(epsg);
             if (zone != 0) {
                 for (const auto& pair : zone_to_point) {
@@ -163,4 +154,20 @@ namespace plateau::geometry {
             return !(epsg >= 10162 && epsg <= 10174);
         }
     };
+
+    // EPSGとZone IDのマッピング
+    inline const std::set<std::pair<int, int>> CoordinateReferenceFactory::epsg_to_zone = {
+        {10162, 1}, {10163, 2}, {10164, 3}, {10165, 4}, {10166, 5},
+        {10167, 6}, {10168, 7}, {10169, 8}, {10170, 9}, {10171, 10},
+        {10172, 11}, {10173, 12}, {10174, 13}
+    };
+
+    // Zone IDごとの座標データ
+    inline const std::set<std::pair<int, std::array<double, 3>>> CoordinateReferenceFactory::zone_to_point = {
+        {1, {33.0, 129.5, 0.0}}, {2, {33.0, 131.0, 0.0}}, {3, {36.0, 132.166667, 0.0}},
+        {4, {33.0, 133.5, 0.0}}, {5, {36.0, 134.333333, 0.0}}, {6, {36.0, 136.0, 0.0}},
+        {7, {36.0, 137.166667, 0.0}}, {8, {36.0, 138.5, 0.0}}, {9, {35.0, 139.833333, 0.0}},
+        {10, {40.0, 140.833333, 0.0}}, {11, {44.0, 140.25, 0.0}}, {12, {44.0, 142.0, 0.0}},
+        {13, {43.0, 144.0, 0.0}}
+    };
 }

test/test_geo_coordinate.cpp

@@ -38,7 +38,7 @@ namespace plateau::geometry {
         ASSERT_FALSE(CoordinateReferenceFactory::IsPolarCoordinateSystem(10169));
         ASSERT_TRUE(CoordinateReferenceFactory::IsPolarCoordinateSystem(6697));
 
-        const auto& refPoint = CoordinateReferenceFactory::GetReferencePoint(10169);
+        const auto& refPoint = CoordinateReferenceFactory::GetOriginPoint(10169);
         ASSERT_EQ(36.0, refPoint.latitude);
         ASSERT_EQ(138.5, refPoint.longitude);
     }