@kalisio/kdk 2.2.2 → 2.3.1

package/map/client/mixins/map/mixin.base-map.js

@@ -159,7 +159,12 @@ export const baseMap = {
         let zIndex
         if (typeof paneOrZIndex === 'object') zIndex = paneOrZIndex.zIndex || 400
         else if (typeof paneOrZIndex === 'number') zIndex = paneOrZIndex
-        pane = this.map.createPane(paneName)
+        // Check for parent pane if any, useful for leaflet-rotate plugin
+        let container = paneOrZIndex.container
+        // Defaults to rotate pane
+        if (this.map._rotate && !container) container = 'rotatePane'
+        container = this.map.getPane(container)
+        pane = this.map.createPane(paneName, container)
         _.set(pane, 'style.zIndex', zIndex || 400) // Defaults for overlay in Leaflet
       }
       this.leafletPanes[paneName] = pane
@@ -202,7 +207,9 @@ export const baseMap = {
       // This is why Leaflet 1.0 introduced panes: https://leafletjs.com/reference.html#map-pane & https://leafletjs.com/examples/map-panes/
       // By implicitely create a pane for each provided z-index makes this transparent for the user
       let zIndex = _.has(leafletOptions, 'zIndex')
-      if (zIndex) {
+      let pane = _.has(leafletOptions, 'pane')
+      // Avoid erasing any existing pane, if so the pane should have been created taken into account the layer zIndex up-front
+      if (zIndex && !pane) {
         zIndex = _.get(leafletOptions, 'zIndex')
         this.createLeafletPane(zIndex)
         // Set layer to use target pane
@@ -438,6 +445,15 @@ export const baseMap = {
         if (geoJson.type === 'FeatureCollection') _.forEach(geoJson.features, feature => { feature._id = uid().toString() })
         else geoJson._id = uid().toString()
       }
+      // Check for panes to be created
+      const panes = []
+      _.forEach(geoJson.features, feature => {
+        const pane = _.get(feature, 'style.pane')
+        if (pane) panes.push({
+          name: pane
+        })
+      })
+      if (!_.isEmpty(panes)) _.set(layerSpec, 'leaflet.panes', panes)
       // Create an empty layer used as a container
       await this.addLayer(layerSpec)
       // Set the content
@@ -515,8 +531,16 @@ export const baseMap = {
     zoomToBBox (bbox) {
       this.zoomToBounds([[bbox[1], bbox[0]], [bbox[3], bbox[2]]])
     },
-    center (longitude, latitude, zoomLevel, options) {
-      this.map.setView(new L.LatLng(latitude, longitude), zoomLevel || this.map.getZoom(), options)
+    center (longitude, latitude, zoomLevel, bearing, options = {}) {
+      if (typeof this.map.getBearing === 'function') {
+        this.setBearing(_.isNil(bearing) ? this.map.getBearing() : bearing)
+      }
+      const duration = _.get(options, 'duration', 0)
+      if (duration) {
+        this.map.flyTo(new L.LatLng(latitude, longitude), _.isNil(zoomLevel) ? this.map.getZoom() : zoomLevel, options)
+      } else {
+        this.map.setView(new L.LatLng(latitude, longitude), _.isNil(zoomLevel) ? this.map.getZoom() : zoomLevel, options)
+      }
     },
     getCenter () {
       const center = this.map.getCenter()
@@ -527,6 +551,20 @@ export const baseMap = {
         zoomLevel: zoom
       }
     },
+    setBearing(bearing) {
+      if (typeof this.map.setBearing !== 'function') {
+        logger.warn(`[KDK] Map not configured to handle bearing, ignoring`)
+        return
+      }
+      this.map.setBearing(bearing)
+    },
+    getBearing () {
+      if (typeof this.map.getBearing !== 'function') {
+        logger.warn(`[KDK] Map not configured to handle bearing, ignoring`)
+        return 0
+      }
+      return this.map.getBearing()
+    },
     getBounds () {
       this.viewBounds = this.map.getBounds()
       const south = this.viewBounds.getSouth()

package/map/client/mixins/map/mixin.canvas-layers.js

@@ -361,7 +361,6 @@ export const canvasLayers = {
 
       // Check for valid type
       if (layerOptions.type !== 'kanvasLayer') return
-
       const layer = this.createLeafletLayer(options)
       this.setCanvasLayerDrawCode(layer, layerOptions.draw)
       if (layerOptions.userData) this.setCanvasLayerUserData(layer, layerOptions.userData)

package/map/client/mixins/map/mixin.geojson-layers.js

@@ -56,7 +56,10 @@ L.GeoJSON.geometryToLayer = function (geojson, options) {
       return new MaskLayer(geojson, options.style(geojson))
     }
   }
-  return geometryToLayer(geojson, options)
+  // As we do so this breaks leaflet-arrowheads plugin
+  const layer = geometryToLayer(geojson, options)
+  if (options.arrowheads && (layer instanceof L.Polyline)) layer.arrowheads(options.arrowheads)
+  return layer
 }
 
 export const geojsonLayers = {
@@ -260,15 +263,17 @@ export const geojsonLayers = {
         // on non-tiled layers we need to use a pane to manage it
         const hasMinZoom = !!_.get(leafletOptions, 'minZoom')
         const hasMaxZoom = !!_.get(leafletOptions, 'maxZoom')
+        const hasZIndex = !!_.get(leafletOptions, 'zIndex')
         if (!leafletOptions.tiled && (hasMinZoom || hasMaxZoom)) {
           const pane = { name: options.name }
           if (hasMinZoom) pane.minZoom = _.get(leafletOptions, 'minZoom')
           if (hasMaxZoom) pane.maxZoom = _.get(leafletOptions, 'maxZoom')
+          if (hasZIndex) pane.zIndex = _.get(leafletOptions, 'zIndex')
           leafletOptions.panes = [pane]
           leafletOptions.pane = options.name
           leafletOptions.shadowPane = options.name
           // Make pane available to styles as well as eg shape markers are created from here
-          for (const type in ['point', 'line', 'polygon']) {
+          for (const type of ['point', 'line', 'polygon']) {
             if (_.has(leafletOptions, `style.${type}`)) {
               _.set(leafletOptions, `style.${type}.pane`, options.name)
               _.set(leafletOptions, `style.${type}.shadowPane`, options.name)
@@ -331,7 +336,7 @@ export const geojsonLayers = {
           // Indeed the style property must be overriden to install the Leaflet function style
           if (!_.has(leafletOptions, key) || (key === 'style')) _.set(leafletOptions, key, _.get(geoJsonOptions, key))
         })
-        // Create the layer*/
+        // Create the layer
         let layer = this.createLeafletLayer(options)
         // Specific case of realtime layer where the underlying container also need to be added to map
         if (leafletOptions.realtime) {
@@ -479,8 +484,8 @@ export const geojsonLayers = {
       }
     },
     onLayerUpdated (layer, leafletLayer, data) {
-      this.$emit('layer-updated', Object.assign({ layer, leafletLayer }, data))
-      this.$engineEvents.emit('layer-updated', Object.assign({ layer, leafletLayer }, data))
+      this.$emit('layer-updated', layer, leafletLayer, data)
+      this.$engineEvents.emit('layer-updated', layer, leafletLayer, data)
     },
     onCurrentTimeChangedGeoJsonLayers (time) {
       const geoJsonlayers = _.values(this.layers).filter(sift({

package/map/client/mixins/mixin.activity.js

@@ -184,8 +184,8 @@ export const activity = {
         // Otherwise simply save in catalog
         createdLayer = await layers.saveLayer(layer)
       }
-      // Add layer to current project ?
-      if (this.project) {
+      // Add layer to current project ? Check if not coming from another planet first
+      if (this.project && (this.project.getPlanetApi() === this.$api)) {
         this.project.layers.push({ _id: createdLayer._id })
         await this.$api.getService('projects').patch(this.project._id, {
           layers: this.project.layers

package/map/client/mixins/mixin.feature-selection.js

@@ -3,16 +3,13 @@ export const featureSelection = {
     'selection.items': {
       handler () {
         this.updateHighlights()
-        const widget = this.getWidgetForSelection()
-        // If window already open on another widget keep it
-        if (widget && !this.isWidgetWindowVisible(widget)) this.openWidget(widget)
+        this.handleWidget(this.getWidgetForSelection())
       }
     },
     'probe.item': {
       handler () {
         this.updateHighlights()
-        const widget = this.getWidgetForProbe()
-        if (widget) this.openWidget(widget)
+        this.handleWidget(this.getWidgetForProbe())
       }
     }
   },
@@ -23,6 +20,11 @@ export const featureSelection = {
         this.highlight(item.feature || item.location, item.layer)
       })
       if (this.hasProbedLocation()) this.highlight(this.getProbedLocation(), this.getProbedLayer())
+    },
+    handleWidget (widget) {
+      // If window already open on another widget keep it
+      if (widget && (widget !== 'none') && !this.isWidgetWindowVisible(widget)) this.openWidget(widget)
     }
   }
 }
+ 

package/map/client/mixins/mixin.levels.js

@@ -27,9 +27,9 @@ export const levels = {
     },
     clearSelectableLevels (layer) {
       if (this.selectableLevelsLayer) {
-        this.setSelectedLevel(null)
         this.selectableLevels = {}
         this.selectableLevelsLayer = null
+        this.setSelectedLevel(null)
       }
     },
     setSelectedLevel (level) {

package/map/client/utils/utils.catalog.js

@@ -148,6 +148,21 @@ export async function getSublegends (options = {}) {
   return sublegends
 }
 
+export function getLayersBySublegend (layers, sublegends) {
+  const categorizedLayers = _.clone(layers)
+  const layersBySublegend = {}
+  _.forEach(sublegends, sublegend => {
+    // Built-in legends use filtering
+    let filter = null
+    if (_.has(sublegend, 'options.filter')) {
+      filter = _.get(sublegend, 'options.filter')
+    }
+    // If the list of layers in a sublegend is empty we can have a null filter
+    layersBySublegend[sublegend.name] = filter ? _.remove(categorizedLayers, sift(filter)) : []
+  })
+  return layersBySublegend
+}
+
 export async function getViews (options = {}) {
   _.defaults(options, {
     query: {},

package/map/client/utils/utils.location.js

@@ -49,7 +49,8 @@ export async function queryGeocoder(planetConfig, path, query = '') {
   const jwt = await api.get('storage').getItem(planetConfig.gatewayJwt)
   let url = `${endpoint}/${path}`
   if (query) url += `?${query}`
-  const results = await fetch(url, { headers: { Authorization: `Bearer ${jwt}` } }).then((response) => response.json())
+  const response = await fetch(url, { headers: { Authorization: `Bearer ${jwt}` } })
+  const results = await response.json()
   return results
 }
 

package/map/client/utils/utils.style.js

@@ -113,7 +113,7 @@ export const SimpleStyleToPolygonStyle = {
   stroke: 'stroke.color',
   'stroke-color': 'stroke.color',
   'stroke-opacity': 'stroke.opacity',
-  'stroke-width': 'sroke.width',
+  'stroke-width': 'stroke.width',
   fill: 'color',
   'fill-color': 'color',  
   'fill-opacity': 'opacity',

package/map/common/geotiff-grid-source.js

@@ -1,4 +1,5 @@
 import * as GeoTIFF from 'geotiff'
+import _ from 'lodash'
 import { unitConverters, SortOrder, GridSource, Grid1D } from './grid.js'
 
 // pack r,g,b in an uint32
@@ -56,7 +57,8 @@ export class GeoTiffGridSource extends GridSource {
     this.rgb = config.rgb
 
     try {
-      this.geotiff = await GeoTIFF.fromUrl(config.url)
+      // forceXHR is useful for tests because nock doesn't know how to intercept fetch
+      this.geotiff = await GeoTIFF.fromUrl(config.url, { forceXHR: _.get(config, 'forceXHR', false) })
     } catch (error) {
       // fetching may fail, in this case the source
       // will remain in unusable state
@@ -127,8 +129,8 @@ export class GeoTiffGridSource extends GridSource {
     // readRasters will fetch [left, right[ and [bottom, top[ hence the + 1
     const window = [left, bottom, right + 1, top + 1]
     const bands = this.rgb
-      ? await usedImage.readRGB({ window: window })
-      : await usedImage.readRasters({ window: window, fillValue: this.nodata })
+      ? await usedImage.readRGB({ window })
+      : await usedImage.readRasters({ window, fillValue: this.nodata })
     const data = this.rgb ? mergeRgb(bands) : bands[0]
 
     if (rx < 0) [left, right] = [right, left]

package/map/common/grid.js

@@ -314,7 +314,7 @@ export class GridSource {
 
   emit (event) {
     const callbacks = _.get(this.events, event, [])
-    const ctx = { source: this, event: event }
+    const ctx = { source: this, event }
     for (const cb of callbacks) {
       cb(ctx)
     }
@@ -461,7 +461,7 @@ export class TiledGrid extends BaseGrid {
     for (const tile of tiles) {
       const bbox = tile.getBBox()
       const meta = {
-        tile: tile,
+        tile,
         iLatMin: Math.floor((bbox[0] - this.bbox[0]) / this.resolution[0]),
         iLatMax: Math.floor((bbox[2] - this.bbox[0]) / this.resolution[0]),
         iLonMin: Math.floor((bbox[1] - this.bbox[1]) / this.resolution[1]),

package/map/common/meteo-model-grid-source.js

@@ -48,7 +48,7 @@ export class MeteoModelGridSource extends DynamicGridSource {
 
       const [key, conf] = extractGridSourceConfig(item)
       const candidate = {
-        key: key,
+        key,
         staticProps: conf,
         dynamicProps: {},
         from: item.from ? readAsTimeOrDuration(item.from) : null,

package/map/common/time-based-grid-source.js

@@ -30,7 +30,7 @@ export class TimeBasedGridSource extends DynamicGridSource {
 
       const [key, conf] = extractGridSourceConfig(item)
       const candidate = {
-        key: key,
+        key,
         staticProps: conf,
         dynamicProps: {},
         from: item.from ? readAsTimeOrDuration(item.from) : null,

package/map/common/wmts-utils.js

@@ -139,16 +139,16 @@ export function buildLeafletUrl (baseUrl, layer, { version = '', style = '', crs
   const ext = _.get(fmt2ext, format.toLowerCase(), 'png')
   return useKvpEncoding
     ? buildUrl(baseUrl, Object.assign({
-        SERVICE: 'WMTS',
-        REQUEST: 'GetTile',
-        VERSION: version,
-        LAYER: layer.id,
-        STYLE: style,
-        FORMAT: format,
-        TILEMATRIXSET: layer.crs[crs],
-        TILEMATRIX: '{z}',
-        TILEROW: '{y}',
-        TILECOL: '{x}'
-      }, searchParams))
+      SERVICE: 'WMTS',
+      REQUEST: 'GetTile',
+      VERSION: version,
+      LAYER: layer.id,
+      STYLE: style,
+      FORMAT: format,
+      TILEMATRIXSET: layer.crs[crs],
+      TILEMATRIX: '{z}',
+      TILEROW: '{y}',
+      TILECOL: '{x}'
+    }, searchParams))
     : buildUrl(`${baseUrl}/${layer.id}/${style}/${layer.crs[crs]}/{z}/{y}/{x}.${ext}`, searchParams)
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kalisio/kdk",
   "description": "Kalisio Development Kit",
-  "version": "2.2.2",
+  "version": "2.3.1",
   "homepage": "https://github.com/kalisio/kdk",
   "type": "module",
   "keywords": [
@@ -43,7 +43,8 @@
   "standard": {
     "parser": "vue-eslint-parser",
     "parserOptions": {
-      "sourceType": "module"
+      "sourceType": "module",
+      "ecmaVersion": "latest"
     },
     "plugins": [
       "vue"
@@ -89,8 +90,8 @@
     "@feathersjs/feathers": "^5.0.8",
     "@feathersjs/schema": "^5.0.8",
     "@feathersjs/socketio": "^5.0.8",
-    "@kalisio/feathers-import-export": "^1.0.1",
-    "@kalisio/feathers-s3": "^1.3.0",
+    "@kalisio/feathers-import-export": "^1.2.0",
+    "@kalisio/feathers-s3": "^1.4.0",
     "@kalisio/feathers-webpush": "^1.0.1",
     "@turf/bbox": "^6.0.1",
     "@weacast/core": "^2.1.5",
@@ -112,7 +113,7 @@
     "feathers-mongodb": "^6.0.0",
     "feathers-mongodb-fuzzy-search": "^2.0.1",
     "feathers-mongodb-management": "^2.0.1",
-    "geotiff": "^2.0.4",
+    "geotiff": "^2.1.3",
     "helmet": "^3.5.0",
     "jsdap": "^8.1.0",
     "limiter": "^1.1.3",
@@ -132,6 +133,9 @@
     "winston-daily-rotate-file": "^3.10.0",
     "xml2js": "^0.4.22"
   },
+  "resolutions": {
+    "typed-function": "4.1.1"
+  },
   "devDependencies": {
     "@feathersjs/authentication-client": "^5.0.8",
     "@feathersjs/memory": "^5.0.8",
@@ -146,17 +150,17 @@
     "chai-spies": "^0.7.1",
     "containerized": "^1.0.2",
     "cross-env": "^5.2.0",
-    "eslint-plugin-vue": "^9.1.0",
+    "eslint-plugin-vue": "^9.26.0",
     "esm": "^3.2.25",
     "fs-extra": "^8.1.0",
     "googleapis": "^21.3.0",
     "mocha": "^9.1.1",
-    "nock": "^9.2.6",
+    "nock": "^13.5.4",
     "npm-run-all": "^4.1.1",
     "pixelmatch": "^5.2.0",
     "pngjs": "^5.0.0",
     "puppeteer": "^20.5.0",
     "shx": "^0.3.2",
-    "standard": "^16.0.4"
+    "standard": "^17.1.0"
   }
 }

package/scripts/build_docs.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+set -euo pipefail
+# set -x
+
+THIS_FILE=$(readlink -f "${BASH_SOURCE[0]}")
+THIS_DIR=$(dirname "$THIS_FILE")
+ROOT_DIR=$(dirname "$THIS_DIR")
+WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
+
+. "$THIS_DIR/kash/kash.sh"
+
+## Parse options
+##
+
+PUBLISH=false
+CI_STEP_NAME="Build docs"
+while getopts "pr:" OPT; do
+    case $OPT in
+        p) # publish doc
+            PUBLISH=true
+            ;;
+        r) # report outcome to slack
+            CI_STEP_NAME=$OPTARG        
+            load_env_files "$WORKSPACE_DIR/development/common/SLACK_WEBHOOK_LIBS.enc.env"
+            trap 'slack_ci_report "$ROOT_DIR" "$CI_STEP_NAME" "$?" "$SLACK_WEBHOOK_LIBS"' EXIT
+            ;;
+        *)
+            ;;
+    esac
+done
+
+
+## Build docs
+##
+
+build_docs "$ROOT_DIR" "kalisio/kdk" "$PUBLISH"
+

package/scripts/init_runner.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -euo pipefail
+# set -x
+
+JOB_ID=$1
+
+THIS_FILE=$(readlink -f "${BASH_SOURCE[0]}")
+THIS_DIR=$(dirname "$THIS_FILE")
+
+. "$THIS_DIR/kash/kash.sh"
+
+### Github Actions
+
+init_github_run_tests() {
+    install_reqs age sops nvm node16 mongo4 cc_test_reporter
+}
+
+init_github_additional_tests() {
+    install_reqs age sops nvm node18 node20 mongo5 mongo6 mongo7
+}
+
+init_github_build_docs() {
+    install_reqs age sops nvm node18
+}
+
+begin_group "Init $CI_ID for $JOB_ID"
+
+init_"${CI_ID}_${JOB_ID}"
+
+end_group "Init $CI_ID for $JOB_ID"

package/scripts/kash/.github/workflows/run_tests.yaml

@@ -0,0 +1,33 @@
+name: Run tests
+on: [push]
+
+jobs:
+  run_tests:
+    name: Run tests
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Run tests
+        # env:
+        #   SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
+        run: bash ./scripts/run_tests.sh
+
+  # run_container_tests:
+  #   name: Run tests in containers
+  #   runs-on: ubuntu-22.04
+  #   strategy:
+  #     matrix:
+  #       image: [ "debian:12", "alpine:3.18" ]
+  #   container:
+  #     image: ${{ matrix.image }}
+  #   steps:
+  #     - name: Checkout repo
+  #       uses: actions/checkout@v4
+  #     - name: Add bash to alpine
+  #       if: ${{ contains(matrix.image, 'alpine') }}
+  #       run: apk add bash
+  #     - name: Run tests
+  #       # env:
+  #       #   SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
+  #       run: bash ./scripts/run_tests.sh

package/scripts/kash/README.md

@@ -0,0 +1,2 @@
+# kash
+Kalisio's bash snippets repository