Merge pull request #40 from eukarya-inc/fix_bug_for_ranges

fix bugs for ranges

Author: smellman

plateauutils/mesh_geocorder/polygon_to_meshcode_list.py

@@ -101,7 +101,10 @@ def _meshcode_range(start_mesh: int, end_mesh: int) -> list:
     matrix = []
     # 開始メッシュコードと終了メッシュコードの各桁の範囲をリストに格納
     for i in range(len(start_pos)):
-        matrix.append(range(int(start_pos[i]), int(end_pos[i]) + 1))
+        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)
     # 各組み合わせを文字列として結合

plateauutils/parser/city_gml_parser.py

@@ -49,7 +49,7 @@ def parse(self, target_path: str = "") -> list:
             for name in zip_file.namelist():
                 for target in self.targets:
                     path = os.path.join("udx", "bldg", target + "_bldg")
-                    if name.find(path) >= 0:
+                    if name.find(path) >= 0 and name.endswith(".gml"):
                         hit_targets.append(name)
         if len(hit_targets) == 0:
             raise ValueError(f"target_path: {target_path} is not target")