Merge pull request #60 from Alex-NRCan/feat-more-states-enhancements-…

…validations Datasets/Legend now appearing for all data. Added OGC Feature support sample... (#60)
Canadian-Geospatial-Platform · Dec 8, 2023 · dd7bd11 · dd7bd11
2 parents 8443649 + 6b80882
commit dd7bd11
Show file tree

Hide file tree

Showing 11 changed files with 1,505 additions and 804 deletions.
diff --git a/index.html b/index.html
@@ -216,7 +216,7 @@
         }]
       };
 
-      const DATA_INPUT_LINE_3 = {
+      const DATA_INPUT_BAR_3 = {
         chart: 'bar',
         title: 'Bar Chart with OGC Features',
         query: {
@@ -251,6 +251,40 @@
         }]
       };
 
+      const DATA_INPUT_LINE_3 = {
+        chart: 'line',
+        title: 'Line Chart with OGC Features',
+        query: {
+          type: "ogcAPIFeatures",
+          url: "https://api.czs-dev.services.geo.ca/collections/sante_canada_tab",
+          queryOptions: {
+            whereClauses: [
+              {
+                field: "location_name",
+                prefix: "'",
+                valueIs: "8000_8_45.1134_-66.8242",
+                suffix: "'"
+              }]
+          }
+        },
+        geochart: {
+          xAxis: {
+            type: 'time',
+            property: 'start_time',
+          },
+          yAxis: {
+            property: 'value_nsvhr'
+          }
+        },
+        ui: {
+          resetStates: true,
+          download: true
+        },
+        datasources: [{
+          display: "Data",
+        }]
+      };
+
       const DATA_INPUT_2 = {
         chart: 'bar',
         title: 'Bar Chart',
@@ -712,7 +746,8 @@
             <button onclick="importDataInputs(DATA_INPUT_LINE_1)">Import Chart w/ time w/steps</button>
             <button onclick="importDataInputs(DATA_INPUT_LINE_2)">Import Chart w/ time logar. w/tension</button>
             <button onclick="importDataInputs(DATA_INPUT_LINE_2_SLIM)">Import Chart slim</button>
-            <button onclick="importDataInputs(DATA_INPUT_LINE_3)">Import Chart w/ OGC Features simple</button>
+            <button onclick="importDataInputs(DATA_INPUT_LINE_3)">Imp. OGC Line</button>
+            <button onclick="importDataInputs(DATA_INPUT_BAR_3)">Imp. OGC Bar</button>
             <br/>
             <button onclick="importDataInputs(DATA_INPUT_2)">Import Data BAR</button>
             <button onclick="importDataInputs(DATA_INPUT_3)">Import Data PIE</button>
@@ -857,7 +892,7 @@
       }
 
       // Load data 1
-      importDataInputs(DATA_INPUT_LINE_1);
+      importDataInputs(DATA_INPUT_LINE_1); // DATA_INPUT_LINE_3
       importDataParsed(DATA_NATIVE_1);
       importOptionsParsed(OPTIONS_NATIVE_1);
 

diff --git a/locales/en/translation.json b/locales/en/translation.json
@@ -6,6 +6,7 @@
     "parsingError": "There was an error parsing the Chart inputs.",
     "viewConsoleDetails": "View console for details.",
     "downloadFiltered": "Download visible",
-    "downloadAll": "Download all"
+    "downloadAll": "Download all",
+    "resetStates": "Reset states"
   }
 }
diff --git a/locales/fr/translation.json b/locales/fr/translation.json
@@ -6,6 +6,7 @@
     "parsingError": "Une erreur est survenue lors de la lecture des paramètres.",
     "viewConsoleDetails": "Voir détails dans la console.",
     "downloadFiltered": "Télécharger visuel",
-    "downloadAll": "Télécharger tout"
+    "downloadAll": "Télécharger tout",
+    "resetStates": "Réinitialiser états"
   }
 }
diff --git a/schema-chartjs-options.json b/schema-chartjs-options.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "GeoChart Options Schema",
-  "description": "This Schema validator validates the ChartJS options. ABSOLUTELY UNFINISHED.",
+  "description": "This Schema validator validates the ChartJS options.",
   "type": "object",
   "properties": {
     "responsive": { "type": "boolean" },
@@ -15,6 +15,9 @@
           }
         }
       }
+    },
+    "scales": {
+      "type": "object"
     }
   },
   "required": ["responsive", "plugins"]