Add air-pollutant-map on new tab

.github/workflows/ui-test-deploy-dev.yml

@@ -9,12 +9,13 @@ on:
       - main
     paths:
       - 'ui/**'
+      - 'air-pollutant-map/**'
       - '.github/workflows/ui-test-deploy-dev.yml'
 
 env:
   AZURE_WEBAPP_NAME: syke-prtr-d-web
   AZURE_WEBAPP_PACKAGE_PATH: 'ui/build' # path to web resources
-  NODE_VERSION: '14.x'
+  NODE_VERSION: '20.10.0'
 
 jobs:
   test:

.github/workflows/ui-test-deploy-prod.yml

@@ -6,12 +6,13 @@ on:
       - main
     paths:
       - 'ui/**'
+      - 'air-pollutant-map/**'
       - '.github/workflows/ui-test-deploy-prod.yml'
 
 env:
   AZURE_WEBAPP_NAME: syke-prtr-p-web
   AZURE_WEBAPP_PACKAGE_PATH: 'ui/build' # path to web resources
-  NODE_VERSION: '14.x'
+  NODE_VERSION: '20.10.0'
   REACT_APP_PRTR_SERVER: https://syke-prtr-fastapi-p-cont.azurewebsites.net # TODO replace with the final prod address
 
 jobs:

README.md

@@ -111,3 +111,9 @@ API should now be accessible at [localhost:8000](http://localhost:8000/).
 ```
 $ python -m pytest tests/
 ```
+
+## Getting Started with the Air-pollutant-map
+
+Changes for the air-pollutant-map (tab Hajapäästöt in the application) are made in the directory [air-pollutant-map](air-pollutant-map). Air-pollutant-map is originally implemented with Vue, therefore it's code is maintained separately from UI. Build of air-pollutant-map is placed inside the public-directory of UI so that the build runs on the same server as the main app. Running air-pollutant-map is embedded in to the UI with an iframe.
+
+Whenever new changes are made to the air-pollutant-map, new build needs to be made and copied in [ui/public/air-pollutant-map](ui/public/air-pollutant-map). Dev-environment of air-pollutant-map can be used in local testing, but prod-environment needs to be used when changes are published. More information about updating the changes in the other [README.md](air-pollutant-map/README.md)

air-pollutant-map/.browserslistrc

@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not dead

air-pollutant-map/.env

@@ -0,0 +1,5 @@
+VUE_APP_GEOSERVER_URI=http://kkxgeot1/geoserver/hajapaastotkartalla/
+VUE_APP_DATA_YEAR_OPTIONS=2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021
+VUE_APP_DOWNLOAD_FULL_DATA_CSV_ENABLED=False
+VUE_APP_USE_AGGREGATED_GNFRS=true
+VUE_APP_USE_PROD_POLLUTANT_LIST=true

air-pollutant-map/.env.dev

@@ -0,0 +1 @@
+NODE_ENV=development

air-pollutant-map/.env.dev-syke

@@ -0,0 +1,3 @@
+NODE_ENV=development
+VUE_APP_USE_AGGREGATED_GNFRS=false
+VUE_APP_USE_PROD_POLLUTANT_LIST=false

air-pollutant-map/.env.prod

@@ -0,0 +1,2 @@
+NODE_ENV=production
+VUE_APP_GEOSERVER_URI=https://paikkatiedot.ymparisto.fi/geoserver/hajapaastotkartalla/

air-pollutant-map/.env.prod-syke

@@ -0,0 +1,4 @@
+NODE_ENV=production
+VUE_APP_GEOSERVER_URI=https://geoserver2.ymparisto.fi/geoserver/paastotkartalla/
+VUE_APP_USE_AGGREGATED_GNFRS=false
+VUE_APP_USE_PROD_POLLUTANT_LIST=false

air-pollutant-map/.eslintrc.js

@@ -0,0 +1,17 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true
+  },
+  extends: ["plugin:vue/essential", "eslint:recommended", "@vue/typescript/recommended"],
+  parserOptions: {
+    ecmaVersion: 2020
+  },
+  rules: {
+    "no-console": process.env.NODE_ENV === "production" ? "off" : "off",
+    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
+    "@typescript-eslint/ban-ts-ignore": "off",
+    "@typescript-eslint/ban-ts-comment": "off",
+    "@typescript-eslint/no-non-null-assertion": "off"
+  }
+};

air-pollutant-map/.firebaserc

@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "paastokartta-demo"
+  }
+}

air-pollutant-map/.gitignore

@@ -0,0 +1,131 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env.local
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# Next.js build output
+.next
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and *not* Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+# other files
+/dist
+.DS_Store
+db/temp
+cypress/integration/examples
+build-test-prod.sh
+dist_test/
+build-deploy-demo.sh
+drafts
+.firebase
+
+cypress/csvDownloads/*
+
+# db v2
+db/import_grid_data/csv_data/
+db/import_muni_data/csv_data/
+db/update_prod_db/dev_dumps/

air-pollutant-map/.prettierrc.json

@@ -0,0 +1,7 @@
+{
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": false,
+  "printWidth": 95
+}

air-pollutant-map/README.md

@@ -0,0 +1,55 @@
+[![Tests & deploy dev status](https://github.com/sykefi/air-pollutant-map/workflows/Tests%20%26%20deploy%20dev/badge.svg)](https://github.com/sykefi/air-pollutant-map/actions)
+
+# air-pollutant-map
+
+Also known as _Hajapäästöt kartalla_
+
+
+### Project setup
+
+The project requires installation of [vue-cli](https://cli.vuejs.org/):
+```
+npm install -g @vue/cli
+```
+
+To install project dependencies with npm, run:
+```
+npm install
+```
+
+To use dev GeoServer, add file `.env.local` with the following environment variable: 
+`VUE_APP_GEOSERVER_URI=http://your-dev-geoserver-address:port/geoserver/paastotkartalla/`
+
+
+### Compiles and hot-reloads for development
+
+`npm run serve-dev`
+
+### Compiles and minifies for production
+
+`npm run build-prod`
+
+### Tests
+
+Open & run Cypress E2E tests with
+`npm run cypress`
+
+### Built with
+
+Vue.js & OpenLayers
+
+See [Configuration Reference](https://cli.vuejs.org/config/).
+
+## Update air-pollutant-map changes to PRTR ui
+To update changes that are made in air-pollutant-map to PRTR app, minified build needs to be copied in directory [ui/public/air-pollutant-map](../ui/public/air-pollutant-map/). Dev-build can be used in local testing. Prod-build needs to be used when changes are published. Build script and copy script are chained for sequential execution. Copy-script requires installation of ncp. To install, run:
+```
+npm install -g ncp
+```
+
+### Compiles and minifies for development and copies minified file to PRTR ui
+
+`npm run build-dev-prtr`
+
+### Compiles and minifies for production and copies minified file to PRTR ui
+
+`npm run build-prod-prtr`

air-pollutant-map/babel.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset'
+  ]
+}

air-pollutant-map/cypress.json

@@ -0,0 +1,4 @@
+{
+  "viewportWidth": 1000,
+  "viewportHeight": 1000
+}

air-pollutant-map/cypress/.eslintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["plugin:cypress/recommended"]
+}

air-pollutant-map/cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}