Merge branch 'development' into 'master'

Added Meteo components

See merge request !33

CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.  
 Changes before version 3.1.0 is not included
 
+## [3.1.4] - 2024-10-24
+
+### Added
+
+- A technical overview. See [file here](guides/technical_overview.md)
+- Meteo components to the eea_pollutants table.
+- A [sql file](sql/meteo.sql) required to be run in order for meteo components to be available.
+
 ## [3.1.3] - 2024-09-27
 
 ### Added

README.md

@@ -27,6 +27,7 @@ git clone https://git.nilu.no/raven/raven-administration
 4. Run the `sql\data.sql` script
 5. Run the `sql\pre_aggregates.sql` script
 6. Run the `sql\use_in_public_api.sql` script
+7. Run the `sql\meteo.sql` script
 
 ## Set environment varables
 

api/endpoints/version/routes.py

@@ -3,7 +3,7 @@ from flask_jwt_extended import create_access_token
 import requests
 
 version_endpoint = Blueprint('version', __name__)
-current_version = "3.1.3"
+current_version = "3.1.4"
 
 
 @version_endpoint.route('/api/version', methods=['GET'])

client/src/views/data/latest/Latest.vue

@@ -89,7 +89,7 @@ const onContextMenu = (row, e) => {
         <tr>
           <!-- <th>Network</th> -->
           <th>Station</th>
-          <th>Pollutant</th>
+          <th>Pollutant/Meteo</th>
           <th>Timestep</th>
           <th>First date</th>
           <th>Latest date</th>

client/src/views/management/samplingpoints/pageOptions.js

@@ -5,7 +5,7 @@ const pageOptions = (lookups) => ({
     { type: "text", label: "Id", prop: "id", placeholder: "str: A unique id", required: true, default: null, enableInEdit: false, showInGrid: true },
 
     { type: "lookup", label: "Station", prop_id: "station_id", prop: "station", lookup: "stations", required: true, default: null, enableInEdit: true, showInGrid: true },
-    { type: "lookup", label: "Pollutant", prop_id: "pollutant_id", prop: "pollutant", required: true, lookup: "pollutants", default: null, enableInEdit: true, showInGrid: true },
+    { type: "lookup", label: "Pollutant/Meteo", prop_id: "pollutant_id", prop: "pollutant", required: true, lookup: "pollutants", default: null, enableInEdit: true, showInGrid: true },
     { type: "lookup", label: "Timestep", prop_id: "timestep_id", prop: "timestep", required: true, lookup: "timesteps", default: null, enableInEdit: true, showInGrid: true },
     { type: "lookup", label: "Concentration", prop_id: "concentration_id", prop: "concentration", required: true, lookup: "concentrations", default: null, enableInEdit: true, showInGrid: true },
     { type: "lookup", label: "Station classification", prop_id: "station_classification_id", prop: "station_classification", required: true, lookup: "stationclassifications", default: null, enableInEdit: true, showInGrid: true },

client/src/views/processing/autovalidate/pageOptions.js

@@ -2,7 +2,7 @@ const pageOptions = (lookups) => ({
   showRequiredAndoptionalSideBySideInCrud: false,
   properties: [
     // REQUIRED
-    { type: "lookup", label: "Pollutant", prop_id: "pollutant_id", prop: "pollutant", lookup: "pollutants", required: true, default: null, enableInEdit: false, showInGrid: true },
+    { type: "lookup", label: "Pollutant/Meteo", prop_id: "pollutant_id", prop: "pollutant", lookup: "pollutants", required: true, default: null, enableInEdit: false, showInGrid: true },
     { type: "number", label: "Minimum", prop: "min", placeholder: "float: Minimum valid value", required: true, default: null, enableInEdit: true, showInGrid: true },
     { type: "number", label: "Maximum", prop: "max", placeholder: "float: Maximum valid value", required: true, default: null, enableInEdit: true, showInGrid: true },
     { type: "number", label: "Repeat", prop: "rep", placeholder: "int: Maximum number of repeats", required: true, default: null, enableInEdit: true, showInGrid: true }

client/src/views/processing/convert/Convert.vue

@@ -101,7 +101,7 @@ const onDownload = () => {
       <table id="convertionsId" class="n-table">
         <tr>
           <th>Station</th>
-          <th>Pollutant</th>
+          <th>Pollutant/Meteo</th>
           <th>Timestep</th>
           <th>Source</th>
           <th>Target</th>

client/src/views/qualitycontrol/verify/Verify.vue

@@ -140,7 +140,7 @@ const onDownload = () => {
         <tr>
           <th>Id</th>
           <th>Station</th>
-          <th>Pollutant</th>
+          <th>Pollutant/Meteo</th>
           <th>Timestep</th>
           <th>Month</th>
           <th>Verified</th>

sql/meteo.sql

+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999951, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/51', 'Wind velocity', 'Wind velocity');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999952, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/52', 'Wind direction', 'Wind direction');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999953, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/53', 'Pressure', 'Pressure');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999954, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/54', 'Temperature', 'Temperature');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999955, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/55', 'Absolute humidity', 'Absolute humidity');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999956, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/56', 'Mixing height', 'Mixing height');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999958, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/58', 'Relative humidity', 'Relative humidity');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999959, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/59', 'Duration of sunlight', 'Duration of sunlight');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999960, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/60', 'Precipitation', 'Precipitation');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999961, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/61', 'Wind component south-north', 'Wind component south-north');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999962, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/62', 'Wind component west-east', 'Wind component west-east');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999963, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/63', 'Wind component vertical', 'Wind component vertical');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999964, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/64', 'Volume of air', 'Volume of air');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999971, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/71', 'Direct solar IR radiation', 'Direct solar IR radiation');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999972, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/72', 'Direct solar UV radiation', 'Direct solar UV radiation');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999973, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/73', 'Direct solar radiation', 'Direct solar radiation');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999974, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/74', 'Global radiation', 'Global radiation');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999975, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/75', 'Diffused radiation', 'Diffused radiation');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999976, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/76', 'Reflected radiation', 'Reflected radiation');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999977, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/77', 'Direct solar visible radiation', 'Direct solar visible radiation');
+INSERT INTO "eea_pollutants"(id, uri, label, notation) VALUES (999999, 'http://dd.eionet.europa.eu/vocabulary/aq/meteoparameter/99', 'No meteo measured', 'No meteo measured');