refactor(style): update style to match new config (#2614)

Closes #2540
Canadian-Geospatial-Platform · Nov 26, 2024 · 9007ef1 · 9007ef1
1 parent e667188
commit 9007ef1
Show file tree

Hide file tree

Showing 59 changed files with 2,200 additions and 1,972 deletions.
diff --git a/packages/geoview-core/public/configs/OSDP/datasets/OSDP-metadata.json b/packages/geoview-core/public/configs/OSDP/datasets/OSDP-metadata.json
@@ -19,21 +19,29 @@
           ]
         }
       },
-      "style": {
+      "layerStyle": {
         "Polygon": {
-          "styleType": "simple",
-          "label": "LineString label",
-          "settings": {
-            "type": "filledPolygon",
-            "color": "rgba(0,0,255,0.5)",
-            "paternSize": 10,
-            "paternWidth": 2,
-            "fillStyle": "diagonalCross",
-            "stroke": {
-              "color": "rgba(128,0,0,1)",
-              "lineStyle": "dot"
+          "type": "simple",
+          "fields": [],
+          "hasDefault": false,
+          "info": [
+            {
+              "visible": true,
+              "label": "Polygon label",
+              "values": [],
+              "settings": {
+                "type": "filledPolygon",
+                "color": "rgba(0,0,255,0.5)",
+                "paternSize": 10,
+                "paternWidth": 2,
+                "fillStyle": "diagonalCross",
+                "stroke": {
+                  "color": "rgba(128,0,0,1)",
+                  "lineStyle": "dot"
+                }
+              }
             }
-          }
+          ]
         }
       }
     }

diff --git a/packages/geoview-core/public/configs/navigator/10-package-time-slider.json b/packages/geoview-core/public/configs/navigator/10-package-time-slider.json
@@ -59,7 +59,7 @@
           {
             "layerId": "msi-94-or-more",
             "source": {
-              "style": "msi-binary"
+              "wmsStyle": "msi-binary"
             }
           }
         ]

diff --git a/packages/geoview-core/public/configs/navigator/13-all-layers.json b/packages/geoview-core/public/configs/navigator/13-all-layers.json
@@ -145,7 +145,7 @@
             "layerId": "msi-94-or-more",
             "layerName": "Permanent Snow",
             "source": {
-              "style": "msi-binary",
+              "wmsStyle": "msi-binary",
               "featureInfo": {
                 "queryable": true,
                 "nameField": "band-0-pixel-value",

diff --git a/packages/geoview-core/public/configs/navigator/14-wms-layer.json b/packages/geoview-core/public/configs/navigator/14-wms-layer.json
@@ -43,7 +43,7 @@
                 "layerFilter": "time = date'2023-04-18T07:00:00-04:00'",
                 "layerName": "Ice Cover",
                 "source": {
-                  "style": "SEA_ICECONC"
+                  "wmsStyle": "SEA_ICECONC"
                 }
               }
             ]
@@ -60,7 +60,7 @@
             "layerId": "msi-94-or-more",
             "layerName": "Permanent Snow",
             "source": {
-              "style": "msi-binary",
+              "wmsStyle": "msi-binary",
               "featureInfo": {
                 "queryable": true,
                 "nameField": "band-0-pixel-value",
@@ -87,7 +87,7 @@
             "layerId": "RADAR_1KM_RSNO",
             "layerName": "Test Spatiotemporel",
             "source": {
-              "style": "Radar-Snow_14colors"
+              "wmsStyle": "Radar-Snow_14colors"
             }
           }
         ]

diff --git a/packages/geoview-core/public/configs/navigator/16-esri-dynamic.json b/packages/geoview-core/public/configs/navigator/16-esri-dynamic.json
diff --git a/packages/geoview-core/public/configs/validator/01-simple-esri-feature.json b/packages/geoview-core/public/configs/validator/01-simple-esri-feature.json
@@ -19,7 +19,6 @@
         "listOfLayerEntryConfig": [
           {
             "layerId": "0",
-            "geometryType": "point",
             "layerName": "stations-Temporal",
             "initialSettings": {
               "controls": {
@@ -50,29 +49,32 @@
             "source": {
               "layerFilter": "Province = \\'Alberta\\' or Province = \\'Manitoba\\'"
             },
-            "style": {
-              "type": "simple",
-              "hasDefault": false,
-              "info": [
-                {
-                  "visible": true,
-                  "label": "",
-                  "values": [],
-                  "settings": {
-                    "type": "simpleSymbol",
-                    "rotation": 0,
-                    "color": "rgba(156,0,130,1)",
-                    "stroke": {
-                      "color": "rgba(0,0,0,1)",
-                      "lineStyle": "solid",
-                      "width": 1
-                    },
-                    "size": 2.668,
-                    "symbol": "square",
-                    "offset": [0, 0]
+            "layerStyle": {
+              "Point": {
+                "type": "simple",
+                "hasDefault": false,
+                "fields": [],
+                "info": [
+                  {
+                    "visible": true,
+                    "label": "",
+                    "values": [],
+                    "settings": {
+                      "type": "simpleSymbol",
+                      "rotation": 0,
+                      "color": "rgba(156,0,130,1)",
+                      "stroke": {
+                        "color": "rgba(0,0,0,1)",
+                        "lineStyle": "solid",
+                        "width": 1
+                      },
+                      "size": 2.668,
+                      "symbol": "square",
+                      "offset": [0, 0]
+                    }
                   }
-                }
-              ]
+                ]
+              }
             }
           }
         ]

diff --git a/packages/geoview-core/public/configs/validator/04-geocore.json b/packages/geoview-core/public/configs/validator/04-geocore.json
@@ -23,7 +23,6 @@
         "listOfLayerEntryConfig": [
           {
             "layerId": "0",
-            "geometryType": "point",
             "layerName": "stations-Temporal",
             "initialSettings": {
               "controls": {

diff --git a/packages/geoview-core/public/configs/validator/05-esri-feature-and-dynamic.json b/packages/geoview-core/public/configs/validator/05-esri-feature-and-dynamic.json
@@ -19,7 +19,6 @@
         "listOfLayerEntryConfig": [
           {
             "layerId": "0",
-            "geometryType": "point",
             "layerName": "stations-Temporal",
             "initialSettings": {
               "controls": {
@@ -50,21 +49,25 @@
             "source": {
               "layerFilter": "Province = \\'Alberta\\' or Province = \\'Manitoba\\'"
             },
-            "style": {
-              "type": "simple",
-              "hasDefault": false,
-              "info": [
-                {
-                  "label": "",
-                  "visible": false,
-                  "settings": {
-                    "symbol": "square",
-                    "stroke": {
-                      "color": "rgba(128,128,128,1)"
+            "layerStyle": {
+              "Point": {
+                "type": "simple",
+                "hasDefault": false,
+                "fields": [],
+                "info": [
+                  {
+                    "label": "",
+                    "visible": false,
+                    "values": [],
+                    "settings": {
+                      "symbol": "square",
+                      "stroke": {
+                        "color": "rgba(128,128,128,1)"
+                      }
                     }
                   }
-                }
-              ]
+                ]
+              }
             }
           }
         ]

diff --git a/packages/geoview-core/public/datasets/geojson/hydro-metadata.meta b/packages/geoview-core/public/datasets/geojson/hydro-metadata.meta
@@ -263,18 +263,26 @@
       "initialSettings": {
         "extent": [-177.29275972275843, 34.301384132573055, -9.977229778239453, 84.400481529465]
       },
-      "style": {
+      "layerStyle": {
         "LineString": {
-          "styleType": "simple",
-          "label": "Downstream Analysis",
-          "settings": {
-            "type": "lineString",
-            "stroke": {
-              "color": "rgba(230,123,38,1)",
-              "lineStyle": "shortDash-dot-dot",
-              "width": 2
+          "type": "simple",
+          "hasDefault": false,
+          "fields": [],
+          "info": [
+            {
+              "label": "Downstream Analysis",
+              "visible": true,
+              "values": [],
+              "settings": {
+                "type": "lineString",
+                "stroke": {
+                  "color": "rgba(230,123,38,1)",
+                  "lineStyle": "shortDash-dot-dot",
+                  "width": 2
+                }
+              }
             }
-          }
+          ]
         }
       }
     }

diff --git a/packages/geoview-core/public/datasets/geojson/lines.json b/packages/geoview-core/public/datasets/geojson/lines.json
@@ -1,52 +1,52 @@
-{
-  "type": "FeatureCollection",
-  "features": [
-    {
-      "type": "Feature",
-      "properties": {
-        "Road_Number": 55,
-        "Province": "Quebec",
-        "creationDate": "28/05/2020T12:00:00-05:00"
-      },
-      "geometry": {
-        "type": "LineString",
-        "coordinates": [
-          [-79, 49],
-          [-78, 46]
-        ]
-      }
-    },
-    {
-      "type": "Feature",
-      "properties": {
-        "Road_Number": 55,
-        "Province": "Quebec",
-        "creationDate": "14/09/2021T13:00:00-05:00"
-      },
-      "geometry": {
-        "type": "LineString",
-        "coordinates": [
-          [-78, 49],
-          [-76, 46],
-          [-77, 49]
-        ]
-      }
-    },
-    {
-      "type": "Feature",
-      "properties": {
-        "Road_Number": 20,
-        "Province": "Ontario",
-        "creationDate": "25/12/2020T12:00:00-05:00"
-      },
-      "geometry": {
-        "type": "LineString",
-        "coordinates": [
-          [-81, 51],
-          [-80.5, 46],
-          [-80, 49]
-        ]
-      }
-    }
-  ]
-}
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {
+        "Road_Number": 55,
+        "Province": "Quebec",
+        "creationDate": "28/05/2020T12:00:00-05:00"
+      },
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [-79, 49],
+          [-78, 46]
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "Road_Number": 55,
+        "Province": "Quebec",
+        "creationDate": "14/09/2021T13:00:00-05:00"
+      },
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [-78, 49],
+          [-76, 46],
+          [-77, 49]
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "Road_Number": 20,
+        "Province": "Ontario",
+        "creationDate": "25/12/2020T12:00:00-05:00"
+      },
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [-81, 51],
+          [-80.5, 46],
+          [-80, 49]
+        ]
+      }
+    }
+  ]
+}
diff --git a/packages/geoview-core/public/datasets/geojson/metadata-blank.meta b/packages/geoview-core/public/datasets/geojson/metadata-blank.meta
@@ -19,14 +19,22 @@
           ]
         }
       },
-      "style": {
+      "layerStyle": {
         "Point": {
-          "styleType": "simple",
-          "label": "Point label",
-          "settings": {
-            "type": "simpleSymbol",
-            "symbol": "star"
-          }
+          "type": "simple",
+          "hasDefault": false,
+          "fields": [],
+          "info": [
+            {
+              "label": "Point label",
+              "visible": true,
+              "values": [],
+              "settings": {
+                "type": "simpleSymbol",
+                "symbol": "star"
+              }
+            }
+          ]
         }
       }
     }