diff --git a/.github/workflows/feature-branch_deploy.yml b/.github/workflows/feature-branch_deploy.yml index 1b249592f4..750c560221 100644 --- a/.github/workflows/feature-branch_deploy.yml +++ b/.github/workflows/feature-branch_deploy.yml @@ -38,7 +38,7 @@ jobs: uses: datamonsters/replace-action@v2 with: files: 'app/dist/shConfig.js' - replacements: '$SH_INSTANCE_ID=${{ secrets.SH_INSTANCE_ID }},$SH_INSTANCE_ID_POLAR=${{ secrets.SH_INSTANCE_ID_POLAR }},$GEODB_INSTANCE_ID=${{ secrets.GEODB_INSTANCE_ID }},$LISTMONK_API_KEY=${{ secrets.LISTMONK_API_KEY }},$STAT_API_CLIENT_SECRET=${{ secrets.STAT_API_CLIENT_SECRET }},$STAT_API_CLIENT_ID=${{ secrets.STAT_API_CLIENT_ID }},$SH_INSTANCE_ID_GTIF=${{ secrets.SH_INSTANCE_ID_GTIF }}' + replacements: '$SH_INSTANCE_ID=${{ secrets.SH_INSTANCE_ID }},$SH_INSTANCE_ID_POLAR=${{ secrets.SH_INSTANCE_ID_POLAR }},$GEODB_INSTANCE_ID=${{ secrets.GEODB_INSTANCE_ID }},$LISTMONK_API_KEY=${{ secrets.LISTMONK_API_KEY }},$STAT_API_CLIENT_SECRET=${{ secrets.STAT_API_CLIENT_SECRET }},$STAT_API_CLIENT_ID=${{ secrets.STAT_API_CLIENT_ID }},$SH_INSTANCE_ID_GTIF=${{ secrets.SH_INSTANCE_ID_GTIF }},$OPENCAGE_RACE=${{ secrets.OPENCAGE_EOX }},$OPENCAGE_GTIF=${{ secrets.OPENCAGE_EOX }},$OPENCAGE_TRILATERAL=${{ secrets.OPENCAGE_EOX }}' # Upload build client to S3 - name: sync client s3 diff --git a/.github/workflows/gtif-demo_deploy.yml b/.github/workflows/gtif-demo_deploy.yml index b73c55911b..ba253cc569 100644 --- a/.github/workflows/gtif-demo_deploy.yml +++ b/.github/workflows/gtif-demo_deploy.yml @@ -37,7 +37,7 @@ jobs: uses: datamonsters/replace-action@v2 with: files: 'app/dist/shConfig.js' - replacements: '$SH_INSTANCE_ID=${{ secrets.SH_INSTANCE_ID }},$SH_INSTANCE_ID_POLAR=${{ secrets.SH_INSTANCE_ID_POLAR }},$GEODB_INSTANCE_ID=${{ secrets.GEODB_INSTANCE_ID }},$LISTMONK_API_KEY=${{ secrets.LISTMONK_API_KEY }},$STAT_API_CLIENT_SECRET=${{ secrets.STAT_API_CLIENT_SECRET }},$STAT_API_CLIENT_ID=${{ secrets.STAT_API_CLIENT_ID }},$SH_INSTANCE_ID_GTIF=${{ secrets.SH_INSTANCE_ID_GTIF }}' + replacements: '$SH_INSTANCE_ID=${{ secrets.SH_INSTANCE_ID }},$SH_INSTANCE_ID_POLAR=${{ secrets.SH_INSTANCE_ID_POLAR }},$GEODB_INSTANCE_ID=${{ secrets.GEODB_INSTANCE_ID }},$LISTMONK_API_KEY=${{ secrets.LISTMONK_API_KEY }},$STAT_API_CLIENT_SECRET=${{ secrets.STAT_API_CLIENT_SECRET }},$STAT_API_CLIENT_ID=${{ secrets.STAT_API_CLIENT_ID }},$SH_INSTANCE_ID_GTIF=${{ secrets.SH_INSTANCE_ID_GTIF }},$OPENCAGE_RACE=${{ secrets.OPENCAGE_RACE }},$OPENCAGE_GTIF=${{ secrets.OPENCAGE_GTIF }},$OPENCAGE_TRILATERAL=${{ secrets.OPENCAGE_TRILATERAL }}' # Upload build client to S3 - name: sync client s3 diff --git a/.github/workflows/gtif-staging_deploy.yml b/.github/workflows/gtif-staging_deploy.yml index 8e3a834ff5..d98e172799 100644 --- a/.github/workflows/gtif-staging_deploy.yml +++ b/.github/workflows/gtif-staging_deploy.yml @@ -37,7 +37,7 @@ jobs: uses: datamonsters/replace-action@v2 with: files: 'app/dist/shConfig.js' - replacements: '$SH_INSTANCE_ID=${{ secrets.SH_INSTANCE_ID }},$SH_INSTANCE_ID_POLAR=${{ secrets.SH_INSTANCE_ID_POLAR }},$GEODB_INSTANCE_ID=${{ secrets.GEODB_INSTANCE_ID }},$LISTMONK_API_KEY=${{ secrets.LISTMONK_API_KEY }},$STAT_API_CLIENT_SECRET=${{ secrets.STAT_API_CLIENT_SECRET }},$STAT_API_CLIENT_ID=${{ secrets.STAT_API_CLIENT_ID }},$SH_INSTANCE_ID_GTIF=${{ secrets.SH_INSTANCE_ID_GTIF }}' + replacements: '$SH_INSTANCE_ID=${{ secrets.SH_INSTANCE_ID }},$SH_INSTANCE_ID_POLAR=${{ secrets.SH_INSTANCE_ID_POLAR }},$GEODB_INSTANCE_ID=${{ secrets.GEODB_INSTANCE_ID }},$LISTMONK_API_KEY=${{ secrets.LISTMONK_API_KEY }},$STAT_API_CLIENT_SECRET=${{ secrets.STAT_API_CLIENT_SECRET }},$STAT_API_CLIENT_ID=${{ secrets.STAT_API_CLIENT_ID }},$SH_INSTANCE_ID_GTIF=${{ secrets.SH_INSTANCE_ID_GTIF }},$OPENCAGE_RACE=${{ secrets.OPENCAGE_EOX }},$OPENCAGE_GTIF=${{ secrets.OPENCAGE_EOX }},$OPENCAGE_TRILATERAL=${{ secrets.OPENCAGE_EOX }}' # Upload build client to S3 - name: sync client s3 diff --git a/.github/workflows/production_deploy.yml b/.github/workflows/production_deploy.yml index a1920f44b5..dee2ad485e 100644 --- a/.github/workflows/production_deploy.yml +++ b/.github/workflows/production_deploy.yml @@ -37,7 +37,7 @@ jobs: uses: datamonsters/replace-action@v2 with: files: 'app/dist/shConfig.js' - replacements: '$SH_INSTANCE_ID=${{ secrets.SH_INSTANCE_ID }},$SH_INSTANCE_ID_POLAR=${{ secrets.SH_INSTANCE_ID_POLAR }},$GEODB_INSTANCE_ID=${{ secrets.GEODB_INSTANCE_ID }},$LISTMONK_API_KEY=${{ secrets.LISTMONK_API_KEY }},$STAT_API_CLIENT_SECRET=${{ secrets.STAT_API_CLIENT_SECRET }},$STAT_API_CLIENT_ID=${{ secrets.STAT_API_CLIENT_ID }},$SH_INSTANCE_ID_GTIF=${{ secrets.SH_INSTANCE_ID_GTIF }}' + replacements: '$SH_INSTANCE_ID=${{ secrets.SH_INSTANCE_ID }},$SH_INSTANCE_ID_POLAR=${{ secrets.SH_INSTANCE_ID_POLAR }},$GEODB_INSTANCE_ID=${{ secrets.GEODB_INSTANCE_ID }},$LISTMONK_API_KEY=${{ secrets.LISTMONK_API_KEY }},$STAT_API_CLIENT_SECRET=${{ secrets.STAT_API_CLIENT_SECRET }},$STAT_API_CLIENT_ID=${{ secrets.STAT_API_CLIENT_ID }},$SH_INSTANCE_ID_GTIF=${{ secrets.SH_INSTANCE_ID_GTIF }},$OPENCAGE_RACE=${{ secrets.OPENCAGE_RACE }},$OPENCAGE_GTIF=${{ secrets.OPENCAGE_GTIF }},$OPENCAGE_TRILATERAL=${{ secrets.OPENCAGE_TRILATERAL }}' # Upload to S3 - name: sync s3 diff --git a/.github/workflows/staging_deploy.yml b/.github/workflows/staging_deploy.yml index 90bb9edae6..33fc88af0a 100644 --- a/.github/workflows/staging_deploy.yml +++ b/.github/workflows/staging_deploy.yml @@ -37,7 +37,7 @@ jobs: uses: datamonsters/replace-action@v2 with: files: 'app/dist/shConfig.js' - replacements: '$SH_INSTANCE_ID=${{ secrets.SH_INSTANCE_ID }},$SH_INSTANCE_ID_POLAR=${{ secrets.SH_INSTANCE_ID_POLAR }},$GEODB_INSTANCE_ID=${{ secrets.GEODB_INSTANCE_ID }},$LISTMONK_API_KEY=${{ secrets.LISTMONK_API_KEY }},$STAT_API_CLIENT_SECRET=${{ secrets.STAT_API_CLIENT_SECRET }},$STAT_API_CLIENT_ID=${{ secrets.STAT_API_CLIENT_ID }},$SH_INSTANCE_ID_GTIF=${{ secrets.SH_INSTANCE_ID_GTIF }}' + replacements: '$SH_INSTANCE_ID=${{ secrets.SH_INSTANCE_ID }},$SH_INSTANCE_ID_POLAR=${{ secrets.SH_INSTANCE_ID_POLAR }},$GEODB_INSTANCE_ID=${{ secrets.GEODB_INSTANCE_ID }},$LISTMONK_API_KEY=${{ secrets.LISTMONK_API_KEY }},$STAT_API_CLIENT_SECRET=${{ secrets.STAT_API_CLIENT_SECRET }},$STAT_API_CLIENT_ID=${{ secrets.STAT_API_CLIENT_ID }},$SH_INSTANCE_ID_GTIF=${{ secrets.SH_INSTANCE_ID_GTIF }},$OPENCAGE_RACE=${{ secrets.OPENCAGE_EOX }},$OPENCAGE_GTIF=${{ secrets.OPENCAGE_EOX }},$OPENCAGE_TRILATERAL=${{ secrets.OPENCAGE_EOX }}' # Upload build client to S3 - name: sync client s3 diff --git a/app/package-lock.json b/app/package-lock.json index 5de4215126..1c9bffa282 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -9,6 +9,7 @@ "version": "4.0.0", "dependencies": { "@chenfengyuan/vue-countdown": "^1.1.5", + "@eox/geosearch": "^0.1.2", "@eox/itemfilter": "0.14.0", "@eox/jsonform": "^0.7.0", "@eox/layercontrol": "^0.17.3", @@ -1975,6 +1976,20 @@ "ms": "^2.1.1" } }, + "node_modules/@eox/geosearch": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@eox/geosearch/-/geosearch-0.1.2.tgz", + "integrity": "sha512-Mnni+xeDY+6gQfXk31KifiYP5RMmLpz+LFrMWurd7mWyFYkqfSfOmgwlorcs1BWIiQOk4PUKt0G5LBEIrWTaZQ==", + "dependencies": { + "lit": "^3.1.3", + "lodash.debounce": "^4.0.8", + "proj4": "^2.11.0" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + } + }, "node_modules/@eox/itemfilter": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@eox/itemfilter/-/itemfilter-0.14.0.tgz", @@ -2229,16 +2244,16 @@ } }, "node_modules/@lit-labs/ssr-dom-shim": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz", - "integrity": "sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz", + "integrity": "sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g==" }, "node_modules/@lit/reactive-element": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.2.tgz", - "integrity": "sha512-SVOwLAWUQg3Ji1egtOt1UiFe4zdDpnWHyc5qctSceJ5XIu0Uc76YmGpIjZgx9YJ0XtdW0Jm507sDvjOu+HnB8w==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", + "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.1.2" + "@lit-labs/ssr-dom-shim": "^1.2.0" } }, "node_modules/@mapbox/jsonlint-lines-primitives": { @@ -13341,29 +13356,29 @@ } }, "node_modules/lit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.0.tgz", - "integrity": "sha512-rzo/hmUqX8zmOdamDAeydfjsGXbbdtAFqMhmocnh2j9aDYqbu0fjXygjCa0T99Od9VQ/2itwaGrjZz/ZELVl7w==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.4.tgz", + "integrity": "sha512-q6qKnKXHy2g1kjBaNfcoLlgbI3+aSOZ9Q4tiGa9bGYXq5RBXxkVTqTIVmP2VWMp29L4GyvCFm8ZQ2o56eUAMyA==", "dependencies": { - "@lit/reactive-element": "^2.0.0", - "lit-element": "^4.0.0", - "lit-html": "^3.1.0" + "@lit/reactive-element": "^2.0.4", + "lit-element": "^4.0.4", + "lit-html": "^3.1.2" } }, "node_modules/lit-element": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.2.tgz", - "integrity": "sha512-/W6WQZUa5VEXwC7H9tbtDMdSs9aWil3Ou8hU6z2cOKWbsm/tXPAcsoaHVEtrDo0zcOIE5GF6QgU55tlGL2Nihg==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.6.tgz", + "integrity": "sha512-U4sdJ3CSQip7sLGZ/uJskO5hGiqtlpxndsLr6mt3IQIjheg93UKYeGQjWMRql1s/cXNOaRrCzC2FQwjIwSUqkg==", "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.1.2", - "@lit/reactive-element": "^2.0.0", - "lit-html": "^3.1.0" + "@lit-labs/ssr-dom-shim": "^1.2.0", + "@lit/reactive-element": "^2.0.4", + "lit-html": "^3.1.2" } }, "node_modules/lit-html": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.0.tgz", - "integrity": "sha512-FwAjq3iNsaO6SOZXEIpeROlJLUlrbyMkn4iuv4f4u1H40Jw8wkeR/OUXZUHUoiYabGk8Y4Y0F/rgq+R4MrOLmA==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.4.tgz", + "integrity": "sha512-yKKO2uVv7zYFHlWMfZmqc+4hkmSbFp8jgjdZY9vvR9jr4J8fH6FUMXhr+ljfELgmjpvlF7Z1SJ5n5/Jeqtc9YA==", "dependencies": { "@types/trusted-types": "^2.0.2" } @@ -23367,6 +23382,16 @@ } } }, + "@eox/geosearch": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@eox/geosearch/-/geosearch-0.1.2.tgz", + "integrity": "sha512-Mnni+xeDY+6gQfXk31KifiYP5RMmLpz+LFrMWurd7mWyFYkqfSfOmgwlorcs1BWIiQOk4PUKt0G5LBEIrWTaZQ==", + "requires": { + "lit": "^3.1.3", + "lodash.debounce": "^4.0.8", + "proj4": "^2.11.0" + } + }, "@eox/itemfilter": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@eox/itemfilter/-/itemfilter-0.14.0.tgz", @@ -23576,16 +23601,16 @@ } }, "@lit-labs/ssr-dom-shim": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz", - "integrity": "sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz", + "integrity": "sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g==" }, "@lit/reactive-element": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.2.tgz", - "integrity": "sha512-SVOwLAWUQg3Ji1egtOt1UiFe4zdDpnWHyc5qctSceJ5XIu0Uc76YmGpIjZgx9YJ0XtdW0Jm507sDvjOu+HnB8w==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", + "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", "requires": { - "@lit-labs/ssr-dom-shim": "^1.1.2" + "@lit-labs/ssr-dom-shim": "^1.2.0" } }, "@mapbox/jsonlint-lines-primitives": { @@ -32377,29 +32402,29 @@ } }, "lit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.0.tgz", - "integrity": "sha512-rzo/hmUqX8zmOdamDAeydfjsGXbbdtAFqMhmocnh2j9aDYqbu0fjXygjCa0T99Od9VQ/2itwaGrjZz/ZELVl7w==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.4.tgz", + "integrity": "sha512-q6qKnKXHy2g1kjBaNfcoLlgbI3+aSOZ9Q4tiGa9bGYXq5RBXxkVTqTIVmP2VWMp29L4GyvCFm8ZQ2o56eUAMyA==", "requires": { - "@lit/reactive-element": "^2.0.0", - "lit-element": "^4.0.0", - "lit-html": "^3.1.0" + "@lit/reactive-element": "^2.0.4", + "lit-element": "^4.0.4", + "lit-html": "^3.1.2" } }, "lit-element": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.2.tgz", - "integrity": "sha512-/W6WQZUa5VEXwC7H9tbtDMdSs9aWil3Ou8hU6z2cOKWbsm/tXPAcsoaHVEtrDo0zcOIE5GF6QgU55tlGL2Nihg==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.6.tgz", + "integrity": "sha512-U4sdJ3CSQip7sLGZ/uJskO5hGiqtlpxndsLr6mt3IQIjheg93UKYeGQjWMRql1s/cXNOaRrCzC2FQwjIwSUqkg==", "requires": { - "@lit-labs/ssr-dom-shim": "^1.1.2", - "@lit/reactive-element": "^2.0.0", - "lit-html": "^3.1.0" + "@lit-labs/ssr-dom-shim": "^1.2.0", + "@lit/reactive-element": "^2.0.4", + "lit-html": "^3.1.2" } }, "lit-html": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.0.tgz", - "integrity": "sha512-FwAjq3iNsaO6SOZXEIpeROlJLUlrbyMkn4iuv4f4u1H40Jw8wkeR/OUXZUHUoiYabGk8Y4Y0F/rgq+R4MrOLmA==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.4.tgz", + "integrity": "sha512-yKKO2uVv7zYFHlWMfZmqc+4hkmSbFp8jgjdZY9vvR9jr4J8fH6FUMXhr+ljfELgmjpvlF7Z1SJ5n5/Jeqtc9YA==", "requires": { "@types/trusted-types": "^2.0.2" } diff --git a/app/package.json b/app/package.json index 6d0b0e3d46..0613cdc6a9 100644 --- a/app/package.json +++ b/app/package.json @@ -16,6 +16,7 @@ }, "dependencies": { "@chenfengyuan/vue-countdown": "^1.1.5", + "@eox/geosearch": "^0.1.2", "@eox/itemfilter": "0.14.0", "@eox/jsonform": "^0.7.0", "@eox/layercontrol": "^0.17.3", diff --git a/app/public/shConfig.js b/app/public/shConfig.js index 4f6d7344cb..881afe5aec 100644 --- a/app/public/shConfig.js +++ b/app/public/shConfig.js @@ -4,5 +4,8 @@ const shConfig = { geodbInstanceId: '$GEODB_INSTANCE_ID', listmonkApiKey: '$LISTMONK_API_KEY', statApiClientId: '$STAT_API_CLIENT_ID', - statApiClientSecret: '$STAT_API_CLIENT_SECRET' + statApiClientSecret: '$STAT_API_CLIENT_SECRET', + opencageRACE: '$OPENCAGE_RACE', + opencageGTIF: '$OPENCAGE_GTIF', + opencageTrilateral: '$OPENCAGE_TRILATERAL', }; diff --git a/app/src/appConfig.js b/app/src/appConfig.js index 68d7369363..0ca37de6f9 100644 --- a/app/src/appConfig.js +++ b/app/src/appConfig.js @@ -6,6 +6,8 @@ module.exports = [ staging: 2, production: 4, }, + + geosearchEndpoint: 'https://api.opencagedata.com/geocode/v1/json?limit=5&bounds=-27.42188,24.20689,53.08594,71.46912', match: ['race.esa.int', 'eodash.eox.at', 'eodash-staging.eox.at', 'eodash-testing.eox.at', 'race.eox.world', 'race.localhost', 'race.eox.home'], branding: { appName: 'Rapid Action for Citizens with Earth Observation', @@ -146,6 +148,7 @@ module.exports = [ staging: 3, production: 5, }, + geosearchEndpoint: 'https://api.opencagedata.com/geocode/v1/json?limit=5', match: ['eodashboard.org', 'www.eodashboard.org', 'eodash-trilateral.eox.at', 'eodash-trilateral-staging.eox.at', 'eodash-trilateral-testing.eox.at', 'trilateral.eox.world', 'trilateral.localhost', 'trilateral.eox.home'], branding: { appName: 'Earth Observing Dashboard', @@ -345,6 +348,7 @@ module.exports = [ staging: 6, production: 7, }, + geosearchEndpoint: 'https://api.opencagedata.com/geocode/v1/json?limit=5&countrycode=AT', match: ['gtif.esa.int', 'gtif.eox.at', 'gtif-demo.eox.at', 'gtif-staging.eox.at', 'gtif-testing.eox.at', 'gtif.eox.world', 'gtif.localhost', 'gtif.eox.home'], branding: { appName: 'Green Transition Information Factory', diff --git a/app/src/components/map/Map.vue b/app/src/components/map/Map.vue index fefb16bdf6..8834519806 100644 --- a/app/src/components/map/Map.vue +++ b/app/src/components/map/Map.vue @@ -124,6 +124,23 @@ :key="dataLayerName + '_customArea'" :drawnArea.sync="drawnArea" /> + { this.geosearchExtent = e.detail; }); }, methods: { ...mapMutations('indicators', { diff --git a/app/src/config/esa.js b/app/src/config/esa.js index 8837e82e37..e224f35104 100644 --- a/app/src/config/esa.js +++ b/app/src/config/esa.js @@ -299,6 +299,25 @@ export const globalIndicators = [ }, }, }, + { + properties: { + // override dates for precipitation + indicatorObject: { + indicator: 'ESDL_Hydrology_Precipitation', + time: getDailyDates('2015-01-01', '2021-12-31'), + }, + }, + }, + { + properties: { + indicatorObject: { + indicator: 'ESDL_Hydrology_SM', + display: { + labelFormatFunction: (date) => DateTime.fromISO(date).toFormat('yyyy-MM-dd'), + }, + }, + }, + }, { // custom override of name + specialEnvTime properties: { diff --git a/app/src/config/trilateral.js b/app/src/config/trilateral.js index 3eed2c37b3..f32f171945 100644 --- a/app/src/config/trilateral.js +++ b/app/src/config/trilateral.js @@ -568,6 +568,25 @@ export const globalIndicators = [ createRECCAP2Config('ESDC_gross_primary_productivity', getDailyDates('2001-01-05', '2018-12-23', 8)), createRECCAP2Config('ESDC_net_ecosystem_exchange', getDailyDates('2001-01-05', '2018-12-23', 8)), createRECCAP2Config('ESDC_kndvi', getDailyDates('2000-03-01', '2021-12-31', 8)), + { + properties: { + // override dates for precipitation + indicatorObject: { + indicator: 'ESDL_Hydrology_Precipitation', + time: getDailyDates('2015-01-01', '2021-12-31'), + }, + }, + }, + { + properties: { + indicatorObject: { + indicator: 'ESDL_Hydrology_SM', + display: { + labelFormatFunction: (date) => DateTime.fromISO(date).toFormat('yyyy-MM-dd'), + }, + }, + }, + }, { properties: { indicatorObject: { diff --git a/app/src/main.js b/app/src/main.js index 163a0e3562..3e9bc058b2 100644 --- a/app/src/main.js +++ b/app/src/main.js @@ -35,6 +35,7 @@ import '@eox/map'; import '@eox/map/dist/eox-map-advanced-layers-and-sources'; import '@eox/jsonform'; import '@eox/storytelling'; +import '@eox/geosearch'; // Set UTC as default time zone behavior for whole client Settings.defaultZoneName = 'utc'; @@ -50,6 +51,7 @@ Vue.config.ignoredElements = [ 'eox-map', 'eox-jsonform', 'eox-storytelling', + 'eox-geosearch', ]; Vue.use(VuePapaParse); diff --git a/app/vue.config.js b/app/vue.config.js index 9a1e35c6b4..b3ebd5c620 100644 --- a/app/vue.config.js +++ b/app/vue.config.js @@ -59,6 +59,7 @@ module.exports = { '@eox/jsonform', '@eox/storytelling', 'color-parse', + '@eox/geosearch', ], configureWebpack: { devServer: {