initial vector data implementation

ECCC-MSC · Jul 26, 2022 · 7eb9459 · 7eb9459
1 parent 936b783
commit 7eb9459
Show file tree

Hide file tree

Showing 10 changed files with 2,175 additions and 2,072 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,3 @@
 include README.md LICENSE requirements.txt
-recursive-include geomet_mapfile *.inc *.json *.yml *.mcf epsg
+recursive-include geomet_mapfile *.inc *.json *.yml *.mcf *.ttf epsg fonts.txt
 
diff --git a/geomet-mapfile-config.yml b/geomet-mapfile-config.yml
diff --git a/geomet_mapfile/mapfile.py b/geomet_mapfile/mapfile.py
diff --git a/geomet_mapfile/resources/mapserv/class/ALERTES.json b/geomet_mapfile/resources/mapserv/class/ALERTES.json
@@ -3,7 +3,7 @@
         "__type__": "class",
         "name": "alertes",
         "group": "ALERTES",
-        "expression": "( '[alert_type]' = 'warning' )",
+        "expression": "( '[properties.alert_type]' = 'warning' )",
         "styles": [
             {
                 "__type__": "style",
@@ -25,7 +25,7 @@
         "__type__": "class",
         "name": "sous surveillance",
         "group": "ALERTES",
-        "expression": "( '[alert_type]' = 'watch' )",
+        "expression": "( '[properties.alert_type]' = 'watch' )",
         "styles": [
             {
                 "__type__": "style",
@@ -47,7 +47,7 @@
         "__type__": "class",
         "name": "veille",
         "group": "ALERTES",
-        "expression": "( '[alert_type]' = 'statement' )",
+        "expression": "( '[properties.alert_type]' = 'statement' )",
         "styles": [
             {
                 "__type__": "style",
@@ -69,7 +69,7 @@
         "__type__": "class",
         "name": "bulletin",
         "group": "ALERTES",
-        "expression": "( '[alert_type]' = 'advisory' )",
+        "expression": "( '[properties.alert_type]' = 'advisory' )",
         "styles": [
             {
                 "__type__": "style",

diff --git a/geomet_mapfile/resources/mapserv/class/ALERTS.json b/geomet_mapfile/resources/mapserv/class/ALERTS.json
@@ -3,7 +3,7 @@
         "__type__": "class",
         "name": "warning",
         "group": "ALERTS",
-        "expression": "( '[alert_type]' = 'warning' )",
+        "expression": "( '[properties.alert_type]' = 'warning' )",
         "styles": [
             {
                 "__type__": "style",
@@ -25,7 +25,7 @@
         "__type__": "class",
         "name": "watch",
         "group": "ALERTS",
-        "expression": "( '[alert_type]' = 'watch' )",
+        "expression": "( '[properties.alert_type]' = 'watch' )",
         "styles": [
             {
                 "__type__": "style",
@@ -47,7 +47,7 @@
         "__type__": "class",
         "name": "statement",
         "group": "ALERTS",
-        "expression": "( '[alert_type]' = 'statement' )",
+        "expression": "( '[properties.alert_type]' = 'statement' )",
         "styles": [
             {
                 "__type__": "style",
@@ -69,7 +69,7 @@
         "__type__": "class",
         "name": "advisory",
         "group": "ALERTS",
-        "expression": "( '[alert_type]' = 'advisory' )",
+        "expression": "( '[properties.alert_type]' = 'advisory' )",
         "styles": [
             {
                 "__type__": "style",

diff --git a/geomet_mapfile/resources/mapserv/class/WEATHER.json b/geomet_mapfile/resources/mapserv/class/WEATHER.json
@@ -3,19 +3,19 @@
         "__type__": "class",
         "name": "Single symbol",
         "maxscaledenom": 10000000,
-        "expression": "( \"[temp]\" ~ \"[0-9]$\" )",
+        "expression": "( \"[properties.temp]\" ~ \"[0-9]$\" )",
         "labels": [
             {
                 "__type__": "label",
                 "font": "arial",
                 "type": "TRUETYPE",
-                "text": "[temp]\u00b0C",
+                "text": "[properties.temp]\u00b0C",
                 "size": 9,
                 "position": "cr",
                 "styles": [
                     {
                         "__type__": "style",
-                        "symbol": "[icon]",
+                        "symbol": "[properties.icon]",
                         "size": 25
                     }
                 ]
@@ -26,7 +26,7 @@
         "__type__": "class",
         "name": "Single symbol",
         "minscaledenom": 10000000,
-        "expression": "( \"[temp]\" ~ \"[0-9]$\" )",
+        "expression": "( \"[properties.temp]\" ~ \"[0-9]$\" )",
         "labels": [
             {
                 "__type__": "label",
@@ -36,7 +36,7 @@
                 "styles": [
                     {
                         "__type__": "style",
-                        "symbol": "[icon]",
+                        "symbol": "[properties.icon]",
                         "size": 25
                     }
                 ]