GridCode移行2

Author: linoal

src/c_wrapper/vector_c.cpp

@@ -100,7 +100,7 @@ LIBPLATEAU_C_EXPORT APIResult LIBPLATEAU_API plateau_create_vector_ ## FUNC_NAME
     }
 
     PLATEAU_VECTOR_GET_BY_PTR(gml_file, GmlFile)
-    PLATEAU_VECTOR_GET_BY_VALUE(grid_code, GridCode*) // TODO クリーンアップ
+    PLATEAU_VECTOR_GET_BY_VALUE(grid_code, GridCode*)
     CLEANUP(grid_code, GridCode*)
     PLATEAU_VECTOR_GET_BY_PTR(dataset_metadata_group, DatasetMetadataGroup)
     PLATEAU_VECTOR_GET_BY_PTR(dataset_metadata, DatasetMetadata)

src/dataset/local_dataset_accessor.cpp

@@ -201,7 +201,7 @@ namespace plateau::dataset {
             for (; !next_grid_code->isLargestLevel(); ) {
                 if (!grid_code->isValid())
                     break;
-                mesh_codes_str_set.insert(grid_code->get());
+                mesh_codes_str_set.insert(next_grid_code->get());
 
                 next_grid_code = next_grid_code->upper();
             }

src/dataset/mesh_code.cpp

@@ -259,7 +259,7 @@ namespace plateau::dataset {
         return new_mesh_code;
     }
 
-    GridCode* MeshCode::upperRaw() const { ||
+    GridCode* MeshCode::upperRaw() const {
         // レベル2以上の範囲で１段階上のレベルの地域メッシュに変換
         auto new_mesh_code = new MeshCode(*this);
         new_mesh_code->level_ = std::max(1, level_ - 1);

src/dataset/server_dataset_accessor.cpp

@@ -123,7 +123,7 @@ namespace plateau::dataset {
             for (; !next_grid_code->isLargestLevel(); ) {
                 if (!grid_code->isValid())
                     break;
-                mesh_codes_str_set.insert(grid_code->get());
+                mesh_codes_str_set.insert(next_grid_code->get());
 
                 next_grid_code = next_grid_code->upper();
             }

wrappers/csharp/LibPLATEAU.NET/CSharpPLATEAU/Dataset/GridCode.cs

@@ -14,11 +14,11 @@ private GridCode(IntPtr handle, bool autoDispose = true) : base(handle, autoDisp
         {
         }
 
-        public static GridCode Create(string code)
+        public static GridCode Create(string code, bool autoDispose = true)
         {
             var result = NativeMethods.plateau_grid_code_parse(code, out var gridCodePtr);
             DLLUtil.CheckDllError(result);
-            return new GridCode(gridCodePtr);
+            return new GridCode(gridCodePtr, autoDispose);
         }
 
         public static GridCode CopyFrom(IntPtr otherGridCodePtr)