diff --git a/fetch.py b/fetch.py index d849ff0..acd9599 100755 --- a/fetch.py +++ b/fetch.py @@ -29,7 +29,7 @@ def runfetch(url='https://www.legifrance.gouv.fr/eli/arrete/2018/10/12/PRMD18245 def dms2dd(dms): - coordslst = re.search("(\d{1,3})° (\d{2})' (\d{2},?\d{0,2})(?:\"|”|\'\')", dms).groups() + coordslst = re.search("(\d{1,3})° (\d{2})(?:'|′) (\d{2},?\d{0,2})(?:\"|”|\'\')", dms).groups() dd = float(coordslst[0].replace(",", ".")) + float(coordslst[1].replace(",", "."))/60 + float(coordslst[2].replace(",", "."))/3600 return dd @@ -50,7 +50,7 @@ def fetch(url='https://www.legifrance.gouv.fr/eli/arrete/2018/10/12/PRMD1824595A tmp = re.compile(".*zone.*").split(area["zone"]) # List of polygons del tmp[0] 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}(?:\"|”) .)", polygon)) + 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}(?:\"|”) .)", polygon)) area["zone"] = [] for index, polygon in enumerate(lst): area["zone"].append([]) @@ -64,7 +64,7 @@ def fetch(url='https://www.legifrance.gouv.fr/eli/arrete/2018/10/12/PRMD1824595A # Polygons elif "polygone" in area["zone"]: lst = [] - 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"])) + 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"] = [] for index, polygon in enumerate(lst): area["zone"].append([]) @@ -93,7 +93,7 @@ if __name__ == '__main__': # Print the dict (keep this code in the end of the file) print("===== Dict =====") for index, area in enumerate(diclist): - if index == 277: + if index == 30: print(f"\n-------------{index}----------------\n") for element in area: print(f" {element}: {diclist[index][element]}")