Merge pull request #42 from eukarya-inc/fixes-41

fixes #41 fixes range missing case

Author: smellman

plateauutils/mesh_geocorder/polygon_to_meshcode_list.py

@@ -96,16 +96,19 @@ def _meshcode_range(start_mesh: int, end_mesh: int) -> list:
     list
         メッシュコードのリスト
     """
-    start_pos = str(start_mesh)
-    end_pos = str(end_mesh)
-    matrix = []
-    # 開始メッシュコードと終了メッシュコードの各桁の範囲をリストに格納
-    for i in range(len(start_pos)):
-        if int(start_pos[i]) <= int(end_pos[i]):
-            matrix.append(range(int(start_pos[i]), int(end_pos[i]) + 1))
-        else:
-            matrix.append(range(0, 10))
-    # 全ての組み合わせを生成
-    combinations = product(*matrix)
-    # 各組み合わせを文字列として結合
-    return ["".join(map(str, combo)) for combo in combinations]
+    # start_pos = str(start_mesh)
+    # end_pos = str(end_mesh)
+    # print(start_pos, end_pos)
+    # matrix = []
+    # # 開始メッシュコードと終了メッシュコードの各桁の範囲をリストに格納
+    # for i in range(len(start_pos)):
+    #     if int(start_pos[i]) < int(end_pos[i]):
+    #         matrix.append(range(int(start_pos[i]), int(end_pos[i]) + 1))
+    #     else:
+    #         matrix.append(range(0, 10))
+    # # 全ての組み合わせを生成
+    # combinations = product(*matrix)
+    # # 各組み合わせを文字列として結合
+    # return ["".join(map(str, combo)) for combo in combinations]
+    combinations = range(start_mesh, end_mesh + 1)
+    return [str(combo) for combo in combinations]

plateauutils/mesh_geocorder/tests/test_polygon_to_meshcode_list.py

@@ -1,21 +1,7 @@
-from plateauutils.mesh_geocorder.polygon_to_meshcode_list import (
-    PolygonToMeshCodeList,
-    _meshcode_range,
-)
+from plateauutils.mesh_geocorder.polygon_to_meshcode_list import PolygonToMeshCodeList
 from shapely import from_wkt
 
 
-def test_meshcode_range():
-    assert _meshcode_range(5136, 5238) == [
-        "5136",
-        "5137",
-        "5138",
-        "5236",
-        "5237",
-        "5238",
-    ]
-
-
 def test_polygon_to_list():
     polygon = from_wkt(
         "POLYGON ((136.312866 34.930979, 136.345825 35.670685, 137.416992 35.661759, 136.312866 34.930979))%"
@@ -56,3 +42,8 @@ def test_polygon_to_list():
     assert polygon_to_list.output() == sorted(
         ["5336247314", "5336247323", "5336247332", "5336247341"]
     )
+    polygon = from_wkt(
+        "POLYGON ((130.41249721501615 33.224722548534864, 130.41249721501615 33.348, 130.59 33.348, 130.59 33.224722548534864, 130.41249721501615 33.224722548534864))"
+    )
+    polygon_to_list = PolygonToMeshCodeList(polygon, "3")
+    assert "49307460" in polygon_to_list.output()

pyproject.toml

@@ -11,7 +11,7 @@ classifiers = [
     "Development Status :: 2 - Pre-Alpha",
     "Programming Language :: Python :: 3",
 ]
-version = "0.0.8"
+version = "0.0.9"
 dependencies = [
     "click",
     "numpy",