LCI/defi-rendu-legifrance
1
0
Fork 0
Code Issues Pull Requests Activity

Added regex to match with circles and corrected polygons regex

Browse Source
This commit is contained in:
TheDevKiller 2018-11-08 21:22:44 +01:00
parent 11fbb27fbb
commit 046c3d92da
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fetch.py
View File

@ -33,15 +33,21 @@ if __name__ == '__main__':
# Make a the area # Make a the area
for area in diclist: for area in diclist:
# Polygons # Polygons
if "polygone" in area["zone"]: if "polygone" in area["zone"] or "Polygone" in area["zone"]:
lst = re.findall(".{0,35} ?:? ?.? ?: ?(\d{3}° \d{2}' \d{2},?\d{0,2}” .) ?\/ ?(\d{2}° \d{2}' \d{2},?\d{0,2}” .)", area["zone"]) lst = 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
del lst
elif "cercle" in area["zone"] or "Cercle" in area["zone"]:
lst = [()]
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 area["zone"] = lst
print(lst)
del lst del lst
# Print the dict (keep this code in the end of the file) # Print the dict (keep this code in the end of the file)
print("===== Dict =====") print("===== Dict =====")
for index, area in enumerate(diclist): for index, area in enumerate(diclist):
print(f"\n-------------{index}----------------\n") if index == 129:
for element in area: print(f"\n-------------{index}----------------\n")
print(f" {element}: {diclist[index][element]}") for element in area:
print(f" {element}: {diclist[index][element]}")
print("\n")