From 13cb8830850606f31f082b3a78b4ff3efc0fb650 Mon Sep 17 00:00:00 2001
From: TheDevKiller <thedevkiller@protonmail.com>
Date: Fri, 9 Nov 2018 23:04:19 +0100
Subject: [PATCH] Fixed some regex

---
 fetch.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/fetch.py b/fetch.py
index 784162b..b31807a 100755
--- a/fetch.py
+++ b/fetch.py
@@ -32,12 +32,24 @@ if __name__ == '__main__':
             diclist[index][element] = re.sub("<br.{0,2}>", "\n", diclist[index][element]) # Replace <br>, <br /> and <br/> by \n
     # Make a the area
     for area in diclist:
-        # Polygons
-        if "polygone" in area["zone"] or "Polygone" in 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"])
+        # Case insensitive
+        area["zone"] = area["zone"].lower()
+        if "polygones" in area["zone"]:
+            lst = []
+            tmp = re.compile("zone . : .*").split(area["zone"])
+            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
             del lst
-        elif "cercle" in area["zone"] or "Cercle" in area["zone"]:
+            del tmp
+        # 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"]))
+            area["zone"] = lst
+            del lst
+        # Circles
+        elif "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