@eturnity/eturnity_3d 7.16.0-qa-dev03.2 → 7.16.0-qa03-7.16.1

package/.bitbucket/ci/build_customization_config.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+log() {
+    timestamp=$(date +"%Y-%m-%d %H:%M:%S")
+    echo "$timestamp $1"
+}
+
+log "Building customization for image ..."
+
+rm -f .env && cp .env.bitbucket .env
+
+Customize API keys
+if [[ $NAMESPACE = 'eturnity-prod'* ]]; then
+    sed -i "s|{{VUE_APP_GOOGLE_MAP_API_KEY}}|$BB_VUE_APP_GOOGLE_MAP_API_KEY_PROD|g" .env
+    sed -i "s|{{VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY}}|$BB_VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY_PROD|g" .env
+else
+    sed -i "s|{{VUE_APP_GOOGLE_MAP_API_KEY}}|$BB_VUE_APP_GOOGLE_MAP_API_KEY_DEV|g" .env
+    sed -i "s|{{VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY}}|$BB_VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY_DEV|g" .env
+fi
+
+log "Building customization for image done"

package/.env

@@ -1 +1,2 @@
-VUE_APP_GOOGLE_MAP_API_KEY=AIzaSyAxqgQ_iRKAQ6AMvZ0a6Z0vkBwYTM-pnHM
+VUE_APP_GOOGLE_MAP_API_KEY={{API_KEY_FOR_LOCAL_DEVELOPMENT}}
+VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY={{API_KEY_FOR_LOCAL_DEVELOPMENT}}

package/.env.bitbucket

@@ -0,0 +1,2 @@
+VUE_APP_GOOGLE_MAP_API_KEY={{VUE_APP_GOOGLE_MAP_API_KEY}}
+VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY={{VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY}}

package/bitbucket-pipelines.yml

@@ -22,6 +22,7 @@ definitions:
         script:
           - ./.bitbucket/ci/build_image_config.sh
           - export $(cat .env.image | xargs)
+          - ./.bitbucket/ci/build_customization_config.sh
           - echo "{\"version\":\"${BB_ETURNITY_VERSION}\",\"full_version\":\"${TAG}\"}" > ./src/assets/version.json
           - docker build -t $IMAGE_NAME .
           - docker login --username $BB_PIPELINE_REGISTRY_TOKEN --password $BB_PIPELINE_REGISTRY_TOKEN $BB_CONTAINER_REGISTRY
@@ -65,6 +66,7 @@ definitions:
         script:
           - ./.bitbucket/ci/build_image_config.sh
           - export $(cat .env.image | xargs)
+          - ./.bitbucket/ci/build_customization_config.sh
           - echo "{\"version\":\"${BB_ETURNITY_VERSION}\",\"full_version\":\"${TAG}\"}" > ./src/assets/version.json
           - export RELEASE_TAG=latest
           - export RELEASE_IMAGE_NAME=$BB_CONTAINER_REGISTRY/$BB_ETURNITY_HUB/$APPLICATION_NAME:$RELEASE_TAG

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "7.16.0-qa-dev03.2",
+  "version": "7.16.0-qa03-7.16.1",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
@@ -10,7 +10,7 @@
     "prettier": "prettier --write \"**/*.{js,vue}\""
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "7.16.0-qa-dev03.1",
+    "@eturnity/eturnity_maths": "7.16.0-qa03-7.16.1",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",
     "earcut": "^2.2.4",

package/src/helper/customProvider.js

@@ -26,7 +26,8 @@ export class CustomProvider extends MapProvider {
         resolve(this.defaultImage)
       } else if (zoom > maxZoomLayer) {
       } else {
-        var image = document.createElement('img')
+        const image = document.createElement('img')
+
         image.onload = function () {
           image.style.backgroundColor = 'red'
           resolve(image)
@@ -50,6 +51,17 @@ export class CustomProvider extends MapProvider {
           const yMax = yMin + resolution_mPerTile
 
           imageSrc += `&service=WMS&request=GetMap&layers=rgb&styles=&format=image%2Fjpeg&transparent=false&version=1.1.1&id=bkg_image&layerTypeAPI=bkgHexagonGermanyLayer&width=256&height=256&srs=EPSG%3A3857&bbox=${xMin},${yMin},${xMax},${yMax}`
+        } else if (this.layer.key == 'azureSatelliteLayer') {
+          const { apiVersion, tilesetId, subscriptionKey } =
+            this.layer.layerData.options
+          imageSrc = imageSrc
+            .replace('{x}', x)
+            .replace('{y}', y)
+            .replace('{z}', zoom)
+            .replace('{apiVersion}', apiVersion)
+            .replace('{tilesetId}', tilesetId)
+            .replace('{subscriptionKey}', subscriptionKey)
+          imageSrc = imageSrc + `&no-cache=${Date.now()}`
         } else {
           imageSrc = imageSrc.replace('{x}', x)
           imageSrc = imageSrc.replace('{y}', y)

package/src/utils/layers.js

@@ -189,6 +189,29 @@ function getLayers() {
     }
   )
 
+  const azureSatelliteLayer = L.tileLayer(
+    'https://atlas.microsoft.com/map/tile?' +
+      'api-version={apiVersion}' +
+      '&tilesetId={tilesetId}' +
+      '&subscription-key={subscriptionKey}' +
+      '&zoom={z}' +
+      '&x={x}' +
+      '&y={y}',
+    {
+      layerTypeAPI: 'azureSatelliteLayer',
+      id: 'azure_satellite',
+      attribution: `\u00A9 ${new Date().getFullYear()} EarthStar Geographics, Microsoft`,
+      minZoom: leafletMapLayersConfig['azureSatelliteLayer']['minZoom'],
+      maxZoom: leafletMapLayersConfig['azureSatelliteLayer']['maxZoom'],
+      maxNativeZoom:
+        leafletMapLayersConfig['azureSatelliteLayer']['maxNativeZoom'],
+      // query parameters
+      apiVersion: '2022-08-01',
+      tilesetId: 'microsoft.imagery',
+      subscriptionKey: process.env.VUE_APP_AZURE_MAP_SUBSCRIPTION_KEY
+    }
+  )
+
   return [
     {
       name: 'SwissTopo (satellite)',
@@ -259,6 +282,11 @@ function getLayers() {
       name: 'GeoPortal France (satellite)',
       key: 'geoportail_fr_wmts_ortho_layer',
       layerData: GeoLayer_HR
+    },
+    {
+      name: 'Bing (satellite)',
+      key: 'azureSatelliteLayer',
+      layerData: azureSatelliteLayer
     }
   ]
 }

package/src/utils/leaflet-config.service.js

@@ -63,5 +63,10 @@ export const leafletMapLayersConfig = {
     maxZoom: 22,
     maxNativeZoom: 19,
     minZoom: 6
+  },
+  azureSatelliteLayer: {
+    maxZoom: 25,
+    maxNativeZoom: 19,
+    minZoom: 1
   }
 }