[BUGFIX] Enable canary islands processing. Mapping in constants.py an…

…d movement of .json content (#169) * add canary islands json * remove canary islands tiles from spain json * constants mapping changes for canary_islands Co-authored-by: masc4ii <[email protected]>
treee111 · Nov 7, 2022 · 88a51ec · 88a51ec
1 parent 6cde44e
commit 88a51ec
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 79 deletions.
diff --git a/wahoomc/constants.py b/wahoomc/constants.py
@@ -31,6 +31,7 @@
     'british_indian_ocean_territory':   'asia',
     'brunei':                           'malaysia-singapore-brunei',
     'burkina_faso':                     'burkina-faso',
+    'canary_islands':					'canary-islands',
     'cape_verde':                       'cape-verde',
     'christmas_island':                 'indonesia',
     'cocos_islands':                    'australia',
@@ -96,7 +97,7 @@
               'africa', 'antarctica']
 
 africa = ['algeria', 'angola', 'benin', 'botswana', 'burkina_faso', 'burundi',
-          'cameroon', 'cape_verde', 'central_african_republic', 'chad', 'comoros',
+          'cameroon', 'canary_islands', 'cape_verde', 'central_african_republic', 'chad', 'comoros',
           'cote_d_ivoire', 'democratic_republic_of_the_congo', 'djibouti', 'egypt',
           'equatorial_guinea', 'eritrea', 'ethiopia', 'french_southern_territories', 'gabon',
           'gambia', 'ghana', 'guinea-bissau', 'guinea', 'kenya', 'lesotho', 'liberia',
@@ -161,7 +162,7 @@
                 'vermont', 'virginia', 'washington', 'west_virginia', 'wisconsin', 'wyoming']
 
 africa_geofabrik = ['algeria', 'angola', 'benin', 'botswana', 'burkina-faso', 'burundi',
-                    'cameroon', 'Canary Islands', 'cape-verde', 'central african republic', 'chad',
+                    'cameroon', 'canary-islands', 'cape-verde', 'central african republic', 'chad',
                     'comores', 'Congo (Republic/Brazzaville)', 'congo-democratic-republic', 'djibouti',
                     'egypt', 'Equatorial Guinea', 'eritrea', 'ethiopia', 'gabon', 'ghana', 'guinea',
                     'guinea-bissau', 'ivory-coast', 'kenya', 'lesotho', 'liberia', 'libya', 'madagascar',

diff --git a/wahoomc/resources/json/africa/canary_islands.json b/wahoomc/resources/json/africa/canary_islands.json
@@ -0,0 +1,79 @@
+[
+	{
+        "x": 115,
+        "y": 106,
+        "left": -18.28125,
+        "top": 29.53523,
+        "right": -16.875,
+        "bottom": 28.304381,
+        "countries": [
+            "canary-islands"
+        ]
+    },
+    {
+        "x": 116,
+        "y": 106,
+        "left": -16.875,
+        "top": 29.53523,
+        "right": -15.46875,
+        "bottom": 28.304381,
+        "countries": [
+            "canary-islands"
+        ]
+    },
+    {
+        "x": 117,
+        "y": 106,
+        "left": -15.46875,
+        "top": 29.53523,
+        "right": -14.0625,
+        "bottom": 28.304381,
+        "countries": [
+            "canary-islands"
+        ]
+    },
+    {
+        "x": 118,
+        "y": 106,
+        "left": -14.0625,
+        "top": 29.53523,
+        "right": -12.65625,
+        "bottom": 28.304381,
+        "countries": [
+            "canary-islands"
+        ]
+    },
+    {
+        "x": 115,
+        "y": 107,
+        "left": -18.28125,
+        "top": 28.304381,
+        "right": -16.875,
+        "bottom": 27.059126,
+        "countries": [
+            "canary-islands"
+        ]
+    },
+    {
+        "x": 116,
+        "y": 107,
+        "left": -16.875,
+        "top": 28.304381,
+        "right": -15.46875,
+        "bottom": 27.059126,
+        "countries": [
+            "canary-islands"
+        ]
+    },
+    {
+        "x": 117,
+        "y": 107,
+        "left": -15.46875,
+        "top": 28.304381,
+        "right": -14.0625,
+        "bottom": 27.059126,
+        "countries": [
+            "canary-islands"
+        ]
+    }
+]
diff --git a/wahoomc/resources/json/europe/spain.json b/wahoomc/resources/json/europe/spain.json
@@ -740,82 +740,5 @@
         "countries": [
             "spain"
         ]
-    },
-    {
-        "x": 115,
-        "y": 106,
-        "left": -18.28125,
-        "top": 29.53523,
-        "right": -16.875,
-        "bottom": 28.304381,
-        "countries": [
-            "spain"
-        ]
-    },
-    {
-        "x": 116,
-        "y": 106,
-        "left": -16.875,
-        "top": 29.53523,
-        "right": -15.46875,
-        "bottom": 28.304381,
-        "countries": [
-            "spain"
-        ]
-    },
-    {
-        "x": 117,
-        "y": 106,
-        "left": -15.46875,
-        "top": 29.53523,
-        "right": -14.0625,
-        "bottom": 28.304381,
-        "countries": [
-            "spain"
-        ]
-    },
-    {
-        "x": 118,
-        "y": 106,
-        "left": -14.0625,
-        "top": 29.53523,
-        "right": -12.65625,
-        "bottom": 28.304381,
-        "countries": [
-            "spain"
-        ]
-    },
-    {
-        "x": 115,
-        "y": 107,
-        "left": -18.28125,
-        "top": 28.304381,
-        "right": -16.875,
-        "bottom": 27.059126,
-        "countries": [
-            "spain"
-        ]
-    },
-    {
-        "x": 116,
-        "y": 107,
-        "left": -16.875,
-        "top": 28.304381,
-        "right": -15.46875,
-        "bottom": 27.059126,
-        "countries": [
-            "spain"
-        ]
-    },
-    {
-        "x": 117,
-        "y": 107,
-        "left": -15.46875,
-        "top": 28.304381,
-        "right": -14.0625,
-        "bottom": 27.059126,
-        "countries": [
-            "spain"
-        ]
     }
 ]