@kalisio/kdk 2.5.3 → 2.6.0

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

@@ -3,15 +3,32 @@ import logger from 'loglevel'
 import formatcoords from 'formatcoords'
 
 export function parseCoordinates (str) {
-  const coords = _.split(_.trim(str), ',')
-  if (coords.length !== 2) return
-  const latitude = Number(coords[0])
-  if (_.isNaN(latitude)) return
-  const longitude = Number(coords[1])
-  if (_.isNaN(longitude)) return
-  return {
-    latitude,
-    longitude
+  let longitude, latitude
+  // DD Formatted form
+  const DDRegexp = /(-?\d+(?:\.\d+)?)°\s*([NSEW])\s+(-?\d+(?:\.\d+)?)°\s*([NSEW])/
+  let match = str.match(DDRegexp)
+  if (match) {
+    if (match[2] === 'N' || match[2] === 'S') {
+      latitude = parseFloat(match[1])
+      if (match[2] === 'S') latitude = -latitude
+      longitude = parseFloat(match[3])
+      if (match[4] === 'W') longitude = -longitude
+      return { longitude, latitude }
+    } else {
+      longitude = parseFloat(match[1])
+      if (match[2] === 'W') longitude = -longitude
+      latitude = parseFloat(match[3])
+      if (match[4] === 'S') latitude = -latitude
+      return { longitude, latitude }
+    }
+  }
+  // Simple regexp
+  const simpleRegexp = /(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)/
+  match = str.match(simpleRegexp)
+  if (match) {
+    longitude = parseFloat(match[1])
+    latitude = parseFloat(match[2])
+    return { longitude, latitude }
   }
 }
 

package/map/client/utils/utils.schema.js

@@ -1,5 +1,6 @@
 import _ from 'lodash'
 import { utils as kCoreUtils } from '../../../core/client/index.js'
+import { getGeoJsonFeatures } from '../utils.map.js'
 
 // Get JSON schema from GeoJson feature' properties
 export function generatePropertiesSchema (geoJson, name) {
@@ -12,7 +13,7 @@ export function generatePropertiesSchema (geoJson, name) {
     }
   }
   // Enumerate all available properties/values in all features
-  const features = (geoJson.type === 'FeatureCollection' ? geoJson.features : [geoJson])
+  const features = getGeoJsonFeatures(geoJson)
   features.forEach(feature => {
     // FIXME: we don't yet support nested objects in schema
     const properties = (feature.properties ? kCoreUtils.dotify(feature.properties) : {})

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

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import { getCssVar } from 'quasar'
 import { utils as kdkCoreUtils } from '../../../core/client/index.js'
 
 export const IconStyleToSimpleStyle = {
@@ -197,7 +196,7 @@ export function convertSimpleStyleColors (style) {
   // Convert from quasar color palette to actual color
   _.forOwn(style, (value, key) => {
     if (['stroke', 'fill', 'marker-color'].includes(key)) {
-      const color = getCssVar(value)
+      const color = kdkCoreUtils.getHtmlColor(value)
       if (color) _.set(style, key, color)
     }
   })
@@ -217,7 +216,6 @@ export function convertLineStyleToSimpleStyle (style) {
 }
 
 export function convertSimpleStyleToLineStyle (style) {
-  //logger.warn('KDK] SimpleSpec is limited and might be depracated. Consider using Kalisio Style spec instead')  
   return style ? convertStyle(style, SimpleStyleToLineStyle) : {}
 }
 
@@ -226,13 +224,53 @@ export function convertPolygonStyleToSimpleStyle (style) {
 }
 
 export function convertSimpleStyleToPolygonStyle (style) {
-  //logger.warn('KDK] SimpleSpec is limited and might be depracated. Consider using Kalisio Style spec instead')
   return style ? convertStyle(style, SimpleStyleToPolygonStyle) : {}
 }
 
+export function getStyleType (geometryType) {
+  if (!geometryType) return
+  switch (geometryType) {
+    case 'Point':
+    case 'MultiPoint':
+      return 'point'
+    case 'LineString':
+    case 'MultiLineString':
+      return 'line'
+    case 'Polygon':
+    case 'MultiPolygon':
+      return 'polygon' 
+  }
+}
+
+export function getShapeFromPointStyle (style, size = [20, 20]) {
+  let stroke = _.get(style, 'stroke')
+  if (stroke) {
+    let width = _.get(stroke, 'width', 1)
+    if (width > 1) width = width / 4
+    stroke = { stroke: { width } }
+  }
+  return _.merge({}, style, { size }, stroke)
+}
+
+export function getShapeFromLineStyle (style, size = [20, 20]) {
+  let width = _.get(style, 'width', 1)
+  if (width > 1) width = width / 4
+  return { shape: 'polyline', stroke: _.merge({}, style, { width }), size }
+}
+
+export function getShapeFromPolygonStyle (style, size = [20, 20]) {
+  let stroke = _.get(style, 'stroke')
+  if (stroke) {
+    let width = _.get(stroke, 'width', 1)
+    if (width > 1) width = width / 4
+    stroke = { stroke: { width } }
+  }
+  return _.merge({}, style, { shape: 'polygon' }, { size }, stroke)
+}
+
 // Only gets the default style from templates
 // Meaning the values in the last else statement
-export function getDefaultStyleFromTemplates(options) {
+export function getDefaultStyleFromTemplates (options) {
   const out = {}
   options = kdkCoreUtils.dotify(options)
   _.forIn(options, (value, key) => {
@@ -293,7 +331,7 @@ export function generateStyleTemplates (defaultStyle, styles, dotify = true) {
       if (!_.has(style.values, property)) return
       // Conversion from palette to RGB color is required
       const value = (property.includes('color')
-        ? kdkCoreUtils.getColorFromPalette(_.get(style.values, property))
+        ? kdkCoreUtils.getHtmlColor(_.get(style.values, property))
         : _.get(style.values, property))
       // Generate style value for given property value
       templates[index] += `if (${predicate}) { %>${value}<% } else `
@@ -306,7 +344,7 @@ export function generateStyleTemplates (defaultStyle, styles, dotify = true) {
     if (!_.has(defaultStyle, property)) return
     // Conversion from palette to RGB color is required
     const value = (property.includes('color')
-      ? kdkCoreUtils.getColorFromPalette(_.get(defaultStyle, property))
+      ? kdkCoreUtils.getHtmlColor(_.get(defaultStyle, property))
       : _.get(defaultStyle, property))
     // Avoid converting numbers to string on default values
     if (hasStyles) templates[index] += `{ %>${value}<% }`
@@ -339,8 +377,14 @@ export function filterQueryToConditions (query) {
       value = subquery[nextBoolOp][0][property][comparisonOperator]
     } else {
       property = _.keys(subquery)[0]
-      comparisonOperator = _.keys(subquery[property])[0]
-      value = subquery[property][comparisonOperator]
+      if (!_.isObject(subquery[property])) {
+        // If the comparison operator is not a standard one, we assume it is a property name
+        comparisonOperator = '$eq'
+        value = subquery[property]
+      } else {
+        comparisonOperator = _.keys(subquery[property])[0]
+        value = subquery[property][comparisonOperator]
+      }
     }
 
     conditions.push({

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

@@ -1,5 +1,4 @@
 import * as GeoTIFF from 'geotiff'
-import _ from 'lodash'
 import { unitConverters, SortOrder, GridSource, Grid1D } from './grid.js'
 
 // pack r,g,b in an uint32
@@ -58,8 +57,7 @@ export class GeoTiffGridSource extends GridSource {
     this.rgb = config.rgb
 
     try {
-      // 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) })
+      this.geotiff = await GeoTIFF.fromUrl(config.url)
     } catch (error) {
       // fetching may fail, in this case the source
       // will remain in unusable state

package/map/common/opendap-utils.js

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import fetch from 'node-fetch'
 import parser from 'jsdap/src/parser.js'
 import xdr from 'jsdap/src/xdr.js'
 import { BaseGrid } from './grid.js'

package/map/common/tms-utils.js

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import fetch from 'node-fetch'
 import xml2js from 'xml2js'
 import { buildUrl } from '../../core/common/index.js'
 

package/map/common/wcs-utils.js

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import fetch from 'node-fetch'
 import xml2js from 'xml2js'
 import { buildUrl } from '../../core/common/index.js'
 

package/map/common/wfs-utils.js

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import fetch from 'node-fetch'
 import xml2js from 'xml2js'
 import { buildUrl } from '../../core/common/index.js'
 

package/map/common/wms-utils.js

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import fetch from 'node-fetch'
 import xml2js from 'xml2js'
 import { buildUrl } from '../../core/common/index.js'
 
@@ -50,6 +49,13 @@ export async function discover (url, searchParams = {}, headers = {}, caps = nul
     availableLayers: {}
   }
 
+  // check if server uses different url for GetMap request
+  const requestRoot = _.get(root, 'Capability[0].Request[0]')
+  if (requestRoot) {
+    const getMap = _.get(requestRoot, 'GetMap[0].DCPType[0].HTTP[0].Get[0].OnlineResource[0].$.xlink:href')
+    if (getMap) { out.getMapUrl = getMap }
+  }
+
   const layerRoot = _.get(root, 'Capability[0].Layer')
   if (layerRoot) {
     const flat = layerRoot.slice()

package/map/common/wmts-utils.js

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import fetch from 'node-fetch'
 import xml2js from 'xml2js'
 import { buildUrl } from '../../core/common/index.js'
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kalisio/kdk",
   "description": "Kalisio Development Kit",
-  "version": "2.5.3",
+  "version": "2.6.0",
   "homepage": "https://github.com/kalisio/kdk",
   "type": "module",
   "keywords": [
@@ -32,7 +32,7 @@
     "lint:core": "standard core/**/*.js core/**/*.vue --fix",
     "lint:map": "standard map/**/*.js map/**/*.vue --fix",
     "lint:test:api": "standard test/api/core/**/*.js test/api/map/**/*.js --fix",
-    "lint:test:client": "standard test/client/core/**/*.js test/client/map/**/*.js --fix",
+    "lint:test:client": "standard extras/tests/core/**/*.mjs extras/tests/map/**/*.mjs --fix",
     "lint": "npm-run-all --serial lint:**",
     "mocha:core": "cross-env NODE_CONFIG_DIR=./test/api/core/config/ mocha test/api/core/**/*.test.js --exit",
     "mocha:map": "cross-env NODE_CONFIG_DIR=./test/api/map/config/ mocha test/api/map/**/*.test.js --exit",
@@ -55,7 +55,6 @@
     "globals": [
       "DEV",
       "PROD",
-      "fetch",
       "addEventListener",
       "cordova",
       "location",
@@ -71,7 +70,9 @@
       "localStorage",
       "DOMParser",
       "caches",
-      "MutationObserver"
+      "MutationObserver",
+      "DataTransfer",
+      "DragEvent"
     ]
   },
   "directories": {
@@ -93,11 +94,11 @@
     "@feathersjs/feathers": "^5.0.8",
     "@feathersjs/schema": "^5.0.8",
     "@feathersjs/socketio": "^5.0.8",
-    "@kalisio/feathers-import-export": "^1.2.0",
+    "@kalisio/feathers-import-export": "^1.3.2",
     "@kalisio/feathers-s3": "^1.5.0",
-    "@kalisio/feathers-webpush": "^1.0.1",
+    "@kalisio/feathers-webpush": "^1.0.2",
     "@turf/bbox": "^6.0.1",
-    "@weacast/core": "^2.1.5",
+    "@weacast/core": "^2.2.1",
     "abort-controller": "^3.0.0",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
@@ -123,9 +124,9 @@
     "localforage": "^1.3.0",
     "lodash": "^4.17.15",
     "lru-cache": "^10.2.2",
+    "minimatch": "^10.0.1",
     "moment": "^2.24.0",
     "mongodb": "^3.6.2",
-    "node-fetch": "^2.6.0",
     "papaparse": "^5.4.1",
     "password-generator": "^2.3.2",
     "password-validator": "^4.0.0",
@@ -158,12 +159,11 @@
     "fs-extra": "^8.1.0",
     "googleapis": "^21.3.0",
     "mocha": "^9.1.1",
-    "nock": "^13.5.4",
+    "nock": "^14.0.5",
     "npm-run-all": "^4.1.1",
-    "pixelmatch": "^5.2.0",
     "pngjs": "^5.0.0",
-    "puppeteer": "^20.5.0",
+    "sass-embedded": "^1.32.12",
     "shx": "^0.3.2",
-    "standard": "^17.1.0"
+    "standard": "^17.1.2"
   }
 }

package/scripts/init_runner.sh

@@ -12,15 +12,15 @@ THIS_DIR=$(dirname "$THIS_FILE")
 ### Github Actions
 
 init_github_run_tests() {
-    install_reqs age sops nvm node20 mongo7 cc_test_reporter
+    install_reqs age sops nvm node20 mongo7
 }
 
 init_github_additional_tests() {
-    install_reqs age sops nvm node18 node22 mongo5 mongo6 mongo7
+    install_reqs age sops nvm node20 node22 mongo8
 }
 
 init_github_build_docs() {
-    install_reqs age sops nvm node18
+    install_reqs age sops nvm node20
 }
 
 begin_group "Init $CI_ID for $JOB_ID"

package/scripts/kash/CHANGELOG.md

@@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+  - support for mongo 8 (`install_mongo8`)
+  - added `get_flavor_from_git_ref` `get_version_from_git_ref` `get_custom_from_git_ref` helpers to parse git ref names (tag or branch names).
+  - added `install_sona_scanner_cli` to install SonarQube scanner cli tool
+
+### Removed
+
+  - support for mongo 4,5,6
+  - helper to install k9s
+  - support for node 16,18
+  
 ### Changed
 
+  - kubectl bumped to `1.28.13`
+  - helm bumped to `3.14.4`
+  - helmfile bumped to `0.167.1`
   - `build_docs` now takes a fourth parameter, the version of node to use to build the docs
+  - `send_coverage_to_cc` now takes a second parameter, the prefix to add to files in coverage report
+  - `run_kli` now uses the `--fail-on-error` kli flag
+  - nvm bumped to `0.40.3`
+  - node20 bumped to `20.19`
+  - node22 bumped to `22.16`
+  - mongodb7 bumped to `7.0.21`
+  - mongodb8 bumped to `8.0.10`
+
+### Fixed
+
+  - do our best to determine `OS_VERSION` when `VERSION_ID` is not in /etc/os-release
+  - `run_app_tests` now correctly upload code coverage if asked to