unordered mapに変更

Author: sevendev

include/plateau/geometry/geo_coordinate.h

@@ -3,7 +3,7 @@
 #include "citygml/vecs.hpp"
 #include "citygml/cityobject.h"
 #include <array>
-#include <set>
+#include <unordered_map>
 #include <utility>
 
 namespace plateau::geometry {
@@ -109,65 +109,53 @@ namespace plateau::geometry {
         }
     };
 
-	/**
-	 * 平面直角座標系の判定、平面直角座標の基準点取得
-	 */
+    /**
+     * 平面直角座標系の判定、平面直角座標の基準点取得
+     */
     struct CoordinateReferenceFactory {
         static constexpr int default_epsg = 6697;
-
         // EPSGとZone IDのマッピング
-        static const std::set<std::pair<int, int>> epsg_to_zone;
-
+        static const std::unordered_map<int, int> epsg_to_zone;
         // Zone IDごとの座標データ
-        static const std::set<std::pair<int, std::array<double, 3>>> zone_to_point;
-
+        static const std::unordered_map<int, std::array<double, 3>> zone_to_point;
         // EPSGごとのzone取得
-        static const int GetZoneId(int epsg) {
-            for (const auto& pair : epsg_to_zone) {
-                if (pair.first == epsg) {
-                    return pair.second;
-                }
+        static int GetZoneId(int epsg) {
+            auto it = epsg_to_zone.find(epsg);
+            if (it != epsg_to_zone.end()) {
+                return it->second;
             }
             return 0;
         }
-
         // EPSGごとの基準点取得
         static GeoCoordinate GetOriginPoint(int epsg) {
             const int zone = GetZoneId(epsg);
             if (zone != 0) {
-                for (const auto& pair : zone_to_point) {
-                    if (pair.first == zone) {
-                        const auto& coords = pair.second;
-                        return GeoCoordinate(coords[0], coords[1], coords[2]);
-                    }
+                auto it = zone_to_point.find(zone);
+                if (it != zone_to_point.end()) {
+                    const auto& coords = it->second;
+                    return GeoCoordinate(coords[0], coords[1], coords[2]);
                 }
             }
             return GeoCoordinate();
         }
-
         // 極座標系・平面直角座標系判定
-        // 平面直角座標系の区分についてはこちらを参照してください :
-        // https://www.mlit.go.jp/plateaudocument/toc9/toc9_08/toc9_08_04/
-        // “該当範囲でなければ極座標” と単純化していますが、
-        // EPSG 4301(JGD2000) 等の別 CRS を誤って極座標と判定する恐れがあります。
         static bool IsPolarCoordinateSystem(int epsg) {
-            return !(epsg >= 10162 && epsg <= 10174);
+            // 平面直角座標系（EPSG 10162～10174）かどうかを明示的に確認
+            return epsg_to_zone.find(epsg) == epsg_to_zone.end();
         }
     };
-
     // EPSGとZone IDのマッピング
-    inline const std::set<std::pair<int, int>> CoordinateReferenceFactory::epsg_to_zone = {
+    inline const std::unordered_map<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}},
+    inline const std::unordered_map<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}}
     };
 }