diff --git a/fetch.py b/fetch.py index b31807a..a4afed9 100755 --- a/fetch.py +++ b/fetch.py @@ -36,7 +36,7 @@ if __name__ == '__main__': area["zone"] = area["zone"].lower() if "polygones" in area["zone"]: lst = [] - tmp = re.compile("zone . : .*").split(area["zone"]) + tmp = re.compile("zone . : .*").split(area["zone"]) # List of polygons for polygon in tmp: lst.append(re.findall(".{0,35} ?:? ?.? ?: ?(\d{1,3}° \d{2}' \d{2},?\d{0,2}(?:\"|”) .) ?\/ ?(\d{1,3}° \d{2}' \d{2},?\d{0,2}(?:\"|”) .)", area["zone"])) area["zone"] = lst @@ -54,11 +54,15 @@ if __name__ == '__main__': lst[0] = re.search(r"(.{6}) .{0,5}?(\d{1,3},?\d{0,2} ?.{1,2}) .{1,35} ?(\d{3}° \d{1,2}' \d{1,2}” .) ?\/ ?(\d{1,3}° \d{1,2}' \d{1,2}” .)", area["zone"], re.S).groups() area["zone"] = lst del lst + # Atolls + elif area["zone"].strip() == "atolls et eaux territoriales incluses": + area["zone"] = [("cercle", "35KM", "138° 54' 8,01\"", "21° 49' 44,64\""), ("cercle", "27KM", "138° 44' 33.01\"", "22° 14' 7.38\"")] # Print the dict (keep this code in the end of the file) print("===== Dict =====") for index, area in enumerate(diclist): - print(f"\n-------------{index}----------------\n") - for element in area: - print(f" {element}: {diclist[index][element]}") + if index == 277: + print(f"\n-------------{index}----------------\n") + for element in area: + print(f" {element}: {diclist[index][element]}") print("\n") \ No newline at end of file