@kalisio/kdk 1.4.2 → 1.6.0

package/lib/core/common/schemas/settings.update.json

@@ -84,6 +84,23 @@
         ]
       }
     },
+    "timelineInterval": {
+      "type": "number",
+      "group": "schemas.TIMELINE_SETTINGS",
+      "field": {
+        "component": "form/KSelectField",
+        "label": "schemas.TIMELINE_INTERVAL",
+        "options": [
+          { "label": "10s", "value": 10  },
+          { "label": "30s", "value": 30  },
+          { "label": "1m", "value": 60, "selected": true },
+          { "label": "5m", "value": 300 },
+          { "label": "10m", "value": 600 },
+          { "label": "15m", "value": 900 },
+          { "label": "30m", "value": 1800 }
+        ]
+      }
+    },
     "timeseriesSpan": {
       "type": "number",
       "group": "schemas.TIMESERIES_SETTINGS",
@@ -125,6 +142,61 @@
         "label": "schemas.LOCATION_FORMAT_LABEL",
         "helper": "schemas.LOCATION_FORMAT_HELPER"
       }
+    },
+    "defaultLength": {
+      "type": "string",
+      "group": "schemas.UNITS_SETTINGS",
+      "field": {
+        "component": "form/KUnitField",
+        "label": "schemas.LENGTH_FIELD_LABEL",
+        "quantity": "length"
+      }
+    },
+    "defaultArea": {
+      "type": "string",
+      "group": "schemas.UNITS_SETTINGS",
+      "field": {
+        "component": "form/KUnitField",
+        "label": "schemas.AREA_FIELD_LABEL",
+        "quantity": "area"
+      }
+    },
+    "defaultVelocity": {
+      "type": "string",
+      "group": "schemas.UNITS_SETTINGS",
+      "field": {
+        "component": "form/KUnitField",
+        "label": "schemas.VELOCITY_FIELD_LABEL",
+        "quantity": "velocity"
+      }
+    },
+    "defaultTemperature": {
+      "type": "string",
+      "group": "schemas.UNITS_SETTINGS",
+      "field": {
+        "component": "form/KUnitField",
+        "label": "schemas.TEMPERATURE_FIELD_LABEL",
+        "quantity": "temperature"
+      }
+    },
+    "defaultAngle": {
+      "type": "string",
+      "group": "schemas.UNITS_SETTINGS",
+      "field": {
+        "component": "form/KUnitField",
+        "label": "schemas.ANGLE_FIELD_LABEL",
+        "quantity": "angle"
+      }
+    },
+    "defaultPrecision": {
+      "type": "number",
+      "group": "schemas.UNITS_SETTINGS",
+      "field": {
+        "component": "form/KNumberField",
+        "label": "schemas.PRECISION_FIELD_LABEL",
+        "min": 0,
+        "max": 5
+      }
     }
   },
   "required": [

package/lib/map/api/hooks/hooks.query.js

@@ -38,6 +38,7 @@ let aggregateFeaturesQuery = exports.aggregateFeaturesQuery = (() => {
       } else {
         Object.assign(groupBy, {
           time: { $push: '$time' }, // Keep track of all times
+          runTime: { $push: '$runTime' }, // Keep track of all run times
           type: { $last: '$type' }, // type is assumed similar for all results, keep last
           properties: { $last: '$properties' // non-aggregated properties are assumed similar for all results, keep last
           } });
@@ -73,8 +74,8 @@ let aggregateFeaturesQuery = exports.aggregateFeaturesQuery = (() => {
           }
           // Find matching features only
           pipeline.push({ $match: Object.assign({ [prefix + element]: { $exists: true } }, match) });
-          // Ensure they are ordered by increasing time by default
-          pipeline.push({ $sort: query.$sort || { time: 1 } });
+          // Ensure they are ordered by increasing time by default and most recent forecast first
+          pipeline.push({ $sort: Object.assign({ time: 1, runTime: -1 }, query.$sort) });
           // Keep track of all feature values
           if (singleTime) {
             pipeline.push({ $group: groupBy });
@@ -93,6 +94,7 @@ let aggregateFeaturesQuery = exports.aggregateFeaturesQuery = (() => {
           // Rearrange data so that we get ordered arrays indexed by element
           elementResults.forEach(function (result) {
             result.time = { [element]: result.time };
+            if (result.runTime) result.runTime = { [element]: result.runTime };
             if (!singleTime && !isGeometry) {
               // Set back the element values as properties because we aggregated in an accumulator
               // to avoid conflict with non-aggregated feature properties
@@ -114,6 +116,9 @@ let aggregateFeaturesQuery = exports.aggregateFeaturesQuery = (() => {
               // Merge with previous matching feature if any
               if (previousResult) {
                 Object.assign(previousResult.time, result.time);
+                if (result.runTime) {
+                  if (previousResult.runTime) Object.assign(previousResult.runTime, result.runTime);else previousResult.runTime = { [element]: result.runTime };
+                }
                 _lodash2.default.set(previousResult, prefix + element, _lodash2.default.get(result, prefix + element));
               } else {
                 aggregatedResults.push(result);

package/lib/map/api/hooks/hooks.query.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../map/api/hooks/hooks.query.js"],"names":["hook","query","params","service","$aggregate","collection","Model","featureId","options","featureIdType","ids","$groupBy","reduce","object","id","Object","assign","groupBy","_id","keys","_","singleTime","toNumber","$limit","map","key","feature","$first","time","$push","type","$last","properties","includes","geometry","match","omit","aggregateOptions","has","set","get","hint","aggregatedResults","Promise","all","element","isGeometry","prefix","pipeline","$geoNear","push","$match","$exists","$sort","$group","$replaceRoot","newRoot","debug","forEach","forOwn","stage","value","elementResults","aggregate","toArray","length","result","unset","resultKeys","pick","previousResult","find","aggregatedResultKeys","aggregatedResult","isEqual","aggregateFeaturesQuery","marshallGeometryQuery","marshallSpatialQuery","asGeoJson","isNil","centerLon","longitude","centerLat","latitude","distance","near","coordinates","maxDistance","distanceField","spherical","$geoWithin","$centerSphere","south","north","west","east","geometryQuery","$geoIntersects","$geometry","geoJson","force","$distinct","$aggregation","longitudeProperty","latitudeProperty","altitudeProperty","geometryProperty","results","dataPath","isPaginated","data","pagination","filter","item","Array","isArray","geometries","mapping","from","to","delete","features"],"mappings":"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","file":"hooks.query.js","sourcesContent":["import _ from 'lodash'\r\nimport { marshallGeometry } from '../marshall'\r\nimport makeDebug from 'debug'\r\n\r\nconst debug = makeDebug('kdk:map:query:hooks')\r\n\r\nexport function marshallGeometryQuery (hook) {\r\n  const query = hook.params.query\r\n  if (_.isNil(query)) return\r\n  const geometry = query.geometry\r\n  if (_.isNil(geometry)) return\r\n  marshallGeometry(geometry)\r\n}\r\n\r\nexport function marshallSpatialQuery (hook) {\r\n  const query = hook.params.query\r\n  if (query) {\r\n    if (!_.isNil(query.geometry)) marshallGeometry(query.geometry)\r\n    // Shortcut for proximity query\r\n    if ((!_.isNil(query.centerLon) || !_.isNil(query.longitude)) &&\r\n        (!_.isNil(query.centerLat) || !_.isNil(query.latitude)) && !_.isNil(query.distance)) {\r\n      const longitude = (_.isNil(query.centerLon) ? _.toNumber(query.longitude) : _.toNumber(query.centerLon))\r\n      const latitude = (_.isNil(query.centerLat) ? _.toNumber(query.latitude) : _.toNumber(query.centerLat))\r\n      const distance = _.toNumber(query.distance)\r\n      // Transform to MongoDB spatial request\r\n      delete query.centerLon\r\n      delete query.longitude\r\n      delete query.centerLat\r\n      delete query.latitude\r\n      delete query.distance\r\n      // Aggregation requires a specific operator\r\n      if (query.$aggregate) {\r\n        query.$geoNear = {\r\n          near: { type: 'Point', coordinates: [longitude, latitude] },\r\n          maxDistance: distance,\r\n          distanceField: 'distance',\r\n          spherical: true\r\n        }\r\n      } else {\r\n        /* We switched from $near to $geoWithin due to https://github.com/kalisio/kdk/issues/345\r\n        query.geometry = {\r\n          $near: {\r\n            $geometry: {\r\n              type: 'Point',\r\n              coordinates: [longitude, latitude]\r\n            },\r\n            $maxDistance: distance\r\n          }\r\n        }\r\n        */\r\n        query.geometry = {\r\n          $geoWithin: {\r\n            $centerSphere: [[longitude, latitude], distance / 6378137.0] // Earth radius as in radians\r\n          }\r\n        }\r\n      }\r\n    }\r\n    // Shortcut for bbox query\r\n    if (!_.isNil(query.south) && !_.isNil(query.north) && !_.isNil(query.west) && !_.isNil(query.east)) {\r\n      const south = _.toNumber(query.south)\r\n      const north = _.toNumber(query.north)\r\n      const west = _.toNumber(query.west)\r\n      const east = _.toNumber(query.east)\r\n      // Transform to MongoDB spatial request\r\n      delete query.south\r\n      delete query.north\r\n      delete query.west\r\n      delete query.east\r\n      const geometryQuery = {\r\n        $geoIntersects: {\r\n          $geometry: {\r\n            type: 'Polygon',\r\n            coordinates: [ // BBox as a polygon\r\n              [[west, south], [east, south], [east, north], [west, north], [west, south]] // Closing point\r\n            ]\r\n          }\r\n        }\r\n      }\r\n      query.geometry = geometryQuery\r\n    }\r\n    // Shortcut for location query\r\n    if (!_.isNil(query.longitude) && !_.isNil(query.latitude)) {\r\n      const longitude = _.toNumber(query.longitude)\r\n      const latitude = _.toNumber(query.latitude)\r\n      // Transform to MongoDB spatial request\r\n      delete query.longitude\r\n      delete query.latitude\r\n      const geometryQuery = {\r\n        $geoIntersects: {\r\n          $geometry: {\r\n            type: 'Point',\r\n            coordinates: [longitude, latitude]\r\n          }\r\n        }\r\n      }\r\n      query.geometry = geometryQuery\r\n    }\r\n    if (query.geoJson) {\r\n      delete query.geoJson\r\n      hook.params.asGeoJson = true\r\n    }\r\n  }\r\n}\r\n\r\nexport function asGeoJson (options = {}) {\r\n  return function (hook) {\r\n    const params = hook.params\r\n    const query = params.query\r\n    if (!options.force && !params.asGeoJson) return\r\n    if (query.$distinct || query.$aggregation) return // Not applicable in this case\r\n    const longitudeProperty = (options.longitudeProperty || 'longitude')\r\n    const latitudeProperty = (options.latitudeProperty || 'latitude')\r\n    const altitudeProperty = (options.altitudeProperty || 'altitude')\r\n    const geometryProperty = (options.geometryProperty || 'geometry')\r\n    let results = _.get(hook, options.dataPath || 'result')\r\n    // Already as GeoJson ?\r\n    if (results.type === 'FeatureCollection') return\r\n    const isPaginated = !_.isNil(results.data)\r\n    const pagination = (isPaginated ? _.pick(results, ['total', 'skip', 'limit']) : {})\r\n    results = (isPaginated ? results.data : results)\r\n    results = results\r\n      .filter(item => {\r\n        // Check if item is not already in GeoJson feature format and we can convert if required\r\n        return (_.has(item, longitudeProperty) && _.has(item, latitudeProperty)) ||\r\n               // When performing feature aggregation on geometries the result can be an array\r\n               Array.isArray(_.get(item, geometryProperty)) ||\r\n               // Check for a geometry property (previously provided or already transformed item)\r\n               (_.has(item, geometryProperty + '.type') && _.has(item, geometryProperty + '.coordinates'))\r\n      })\r\n      .map(item => {\r\n        let coordinates\r\n        // Keep track of coordinates before picking properties\r\n        if (_.has(item, longitudeProperty) && _.has(item, latitudeProperty)) {\r\n          coordinates = [_.get(item, longitudeProperty), _.get(item, latitudeProperty)]\r\n          if (_.has(item, altitudeProperty)) {\r\n            coordinates.push(_.get(item, altitudeProperty))\r\n          }\r\n        }\r\n        if (options.pick) {\r\n          item = _.pick(item, options.pick)\r\n        }\r\n        if (options.omit) {\r\n          item = _.omit(item, options.omit)\r\n        }\r\n        // Item locations are already in GeoJson format\r\n        if (_.has(item, geometryProperty + '.type') && _.has(item, geometryProperty + '.coordinates')) {\r\n          return Object.assign({\r\n            type: 'Feature',\r\n            geometry: _.get(item, geometryProperty),\r\n            properties: {}\r\n          }, _.omit(item, [geometryProperty]))\r\n        } else if (Array.isArray(_.get(item, geometryProperty))) {\r\n          return Object.assign({\r\n            type: 'Feature',\r\n            geometry: { type: 'GeometryCollection', geometries: _.get(item, geometryProperty) },\r\n            properties: {}\r\n          }, _.omit(item, [geometryProperty]))\r\n        } else if (coordinates) {\r\n          // Item locations are not already in GeoJson feature format so we need to convert\r\n          return Object.assign({\r\n            type: 'Feature',\r\n            geometry: { type: 'Point', coordinates },\r\n            properties: {}\r\n          }, _.omit(item, [longitudeProperty, latitudeProperty]))\r\n        }\r\n      })\r\n    // Move some data to properties ?\r\n    if (options.properties) {\r\n      results.forEach(item => {\r\n        options.properties.forEach(mapping => {\r\n          if (mapping.from) _.set(item, `properties.${mapping.to || mapping.from}`, _.get(item, `${mapping.from}`))\r\n          if (mapping.delete) _.unset(item, `${mapping.from}`)\r\n        })\r\n      })\r\n    }\r\n    // Copy pagination information if any so that client can use it anyway\r\n    if (_.get(options, 'asFeatureCollection', true)) {\r\n      _.set(hook, options.dataPath || 'result', Object.assign({\r\n        type: 'FeatureCollection',\r\n        features: results\r\n      }, pagination)) // If no pagination this merged object will be empty\r\n    } else if (isPaginated) {\r\n      _.set(hook, options.dataPath || 'result', Object.assign({\r\n        data: results\r\n      }, pagination))\r\n    } else {\r\n      _.set(hook, options.dataPath || 'result', results)\r\n    }\r\n  }\r\n}\r\n\r\nexport async function aggregateFeaturesQuery (hook) {\r\n  const query = hook.params.query\r\n  const service = hook.service\r\n  if (!query) return\r\n  // Perform aggregation\r\n  if (query.$aggregate) {\r\n    const collection = service.Model\r\n    const featureId = (service.options ? service.options.featureId : '')\r\n    const featureIdType = (service.options ? service.options.featureIdType : 'string')\r\n    const ids = typeof query.$groupBy === 'string' // Group by matching ID(s), ie single ID or array of field to create a compound ID\r\n      ? { [query.$groupBy]: '$properties.' + query.$groupBy }\r\n    // Aggregated in an accumulator to avoid conflict with feature properties\r\n      : query.$groupBy.reduce((object, id) => Object.assign(object, { [id]: '$properties.' + id }), {})\r\n    const groupBy = { _id: ids }\r\n    let keys = _.keys(ids)\r\n    // Do we only keep first or last available time ?\r\n    const singleTime = (_.toNumber(query.$limit) === 1)\r\n    if (singleTime) {\r\n      // When single time no aggregation is performed at all so we only have raw features\r\n      keys = keys.map(key => 'properties.' + key)\r\n      // In this case no need to aggregate on each element we simply keep the first feature\r\n      // BUG: according to https://jira.mongodb.org/browse/SERVER-9507 MongoDB is not yet\r\n      // able to optimize this kind of operations to avoid full index scan\r\n      // For now we should restrict it to short time range\r\n      Object.assign(groupBy, { feature: { $first: '$$ROOT' } })\r\n    } else {\r\n      Object.assign(groupBy, {\r\n        time: { $push: '$time' }, // Keep track of all times\r\n        type: { $last: '$type' }, // type is assumed similar for all results, keep last\r\n        properties: { $last: '$properties' } // non-aggregated properties are assumed similar for all results, keep last\r\n      })\r\n      // Check if we aggregate geometry or simply properties\r\n      if (!query.$aggregate.includes('geometry')) {\r\n        Object.assign(groupBy, {\r\n          geometry: { $last: '$geometry' } // geometry is assumed similar for all results, keep last\r\n        })\r\n      }\r\n    }\r\n    // The query contains the match stage except options relevent to the aggregation pipeline\r\n    const match = _.omit(query, ['$groupBy', '$aggregate', '$geoNear', '$sort', '$limit', '$skip'])\r\n    const aggregateOptions = {}\r\n    // Check for any required type conversion (eg HTTP requests)\r\n    if (featureId && _.has(match, 'properties.' + featureId)) {\r\n      if (featureIdType === 'number') _.set(match, 'properties.' + featureId, _.toNumber(_.get(match, 'properties.' + featureId)))\r\n      // Check if we could provide a hint to the aggregation when targeting feature ID\r\n      // Indeed, in that case, we define the appropriate index\r\n      aggregateOptions.hint = { ['properties.' + featureId]: 1 }\r\n    }\r\n    // Ensure we do not mix results with/without relevant element values\r\n    // by separately querying each element then merging\r\n    let aggregatedResults\r\n    await Promise.all(query.$aggregate.map(async element => {\r\n      const isGeometry = (element === 'geometry')\r\n      // Geometry is a root property while others are feature properties\r\n      const prefix = (isGeometry ? '' : 'properties.')\r\n      const pipeline = []\r\n      // Check for geometry stage\r\n      if (query.$geoNear) {\r\n        pipeline.push({ $geoNear: query.$geoNear })\r\n      }\r\n      // Find matching features only\r\n      pipeline.push({ $match: Object.assign({ [prefix + element]: { $exists: true } }, match) })\r\n      // Ensure they are ordered by increasing time by default\r\n      pipeline.push({ $sort: query.$sort || { time: 1 } })\r\n      // Keep track of all feature values\r\n      if (singleTime) {\r\n        pipeline.push({ $group: groupBy })\r\n        pipeline.push({ $replaceRoot: { newRoot: '$feature' } })\r\n      } else {\r\n        pipeline.push({ $group: Object.assign({ [element]: { $push: '$' + prefix + element } }, groupBy) })\r\n      }\r\n      debug(`Aggregating ${element} element for features`)\r\n      pipeline.forEach(stage => {\r\n        _.forOwn(stage, (value, key) => debug('Stage', key, value))\r\n      })\r\n      const elementResults = await collection.aggregate(pipeline, aggregateOptions).toArray()\r\n      debug(`Generated ${elementResults.length} feature(s) for ${element} element`, elementResults)\r\n      // Rearrange data so that we get ordered arrays indexed by element\r\n      elementResults.forEach(result => {\r\n        result.time = { [element]: result.time }\r\n        if (!singleTime && !isGeometry) {\r\n          // Set back the element values as properties because we aggregated in an accumulator\r\n          // to avoid conflict with non-aggregated feature properties\r\n          _.set(result, prefix + element, _.get(result, element))\r\n          // Delete accumulator\r\n          _.unset(result, element)\r\n        }\r\n      })\r\n      // Now merge with previous element results\r\n      if (!aggregatedResults) {\r\n        aggregatedResults = elementResults\r\n      } else {\r\n        elementResults.forEach(result => {\r\n          const resultKeys = _.pick(result, keys)\r\n          const previousResult = aggregatedResults.find(aggregatedResult => {\r\n            const aggregatedResultKeys = _.pick(aggregatedResult, keys)\r\n            return _.isEqual(aggregatedResultKeys, resultKeys)\r\n          })\r\n          // Merge with previous matching feature if any\r\n          if (previousResult) {\r\n            Object.assign(previousResult.time, result.time)\r\n            _.set(previousResult, prefix + element, _.get(result, prefix + element))\r\n          } else {\r\n            aggregatedResults.push(result)\r\n          }\r\n        })\r\n      }\r\n    }))\r\n    delete query.$groupBy\r\n    delete query.$aggregate\r\n    delete query.$geoNear\r\n    // Set result to avoid service DB call\r\n    hook.result = aggregatedResults\r\n  }\r\n  return hook\r\n}\r\n"]}
+{"version":3,"sources":["../../../../map/api/hooks/hooks.query.js"],"names":["hook","query","params","service","$aggregate","collection","Model","featureId","options","featureIdType","ids","$groupBy","reduce","object","id","Object","assign","groupBy","_id","keys","_","singleTime","toNumber","$limit","map","key","feature","$first","time","$push","runTime","type","$last","properties","includes","geometry","match","omit","aggregateOptions","has","set","get","hint","aggregatedResults","Promise","all","element","isGeometry","prefix","pipeline","$geoNear","push","$match","$exists","$sort","$group","$replaceRoot","newRoot","debug","forEach","forOwn","stage","value","elementResults","aggregate","toArray","length","result","unset","resultKeys","pick","previousResult","find","aggregatedResultKeys","aggregatedResult","isEqual","aggregateFeaturesQuery","marshallGeometryQuery","marshallSpatialQuery","asGeoJson","isNil","centerLon","longitude","centerLat","latitude","distance","near","coordinates","maxDistance","distanceField","spherical","$geoWithin","$centerSphere","south","north","west","east","geometryQuery","$geoIntersects","$geometry","geoJson","force","$distinct","$aggregation","longitudeProperty","latitudeProperty","altitudeProperty","geometryProperty","results","dataPath","isPaginated","data","pagination","filter","item","Array","isArray","geometries","mapping","from","to","delete","features"],"mappings":"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","file":"hooks.query.js","sourcesContent":["import _ from 'lodash'\r\nimport { marshallGeometry } from '../marshall'\r\nimport makeDebug from 'debug'\r\n\r\nconst debug = makeDebug('kdk:map:query:hooks')\r\n\r\nexport function marshallGeometryQuery (hook) {\r\n  const query = hook.params.query\r\n  if (_.isNil(query)) return\r\n  const geometry = query.geometry\r\n  if (_.isNil(geometry)) return\r\n  marshallGeometry(geometry)\r\n}\r\n\r\nexport function marshallSpatialQuery (hook) {\r\n  const query = hook.params.query\r\n  if (query) {\r\n    if (!_.isNil(query.geometry)) marshallGeometry(query.geometry)\r\n    // Shortcut for proximity query\r\n    if ((!_.isNil(query.centerLon) || !_.isNil(query.longitude)) &&\r\n        (!_.isNil(query.centerLat) || !_.isNil(query.latitude)) && !_.isNil(query.distance)) {\r\n      const longitude = (_.isNil(query.centerLon) ? _.toNumber(query.longitude) : _.toNumber(query.centerLon))\r\n      const latitude = (_.isNil(query.centerLat) ? _.toNumber(query.latitude) : _.toNumber(query.centerLat))\r\n      const distance = _.toNumber(query.distance)\r\n      // Transform to MongoDB spatial request\r\n      delete query.centerLon\r\n      delete query.longitude\r\n      delete query.centerLat\r\n      delete query.latitude\r\n      delete query.distance\r\n      // Aggregation requires a specific operator\r\n      if (query.$aggregate) {\r\n        query.$geoNear = {\r\n          near: { type: 'Point', coordinates: [longitude, latitude] },\r\n          maxDistance: distance,\r\n          distanceField: 'distance',\r\n          spherical: true\r\n        }\r\n      } else {\r\n        /* We switched from $near to $geoWithin due to https://github.com/kalisio/kdk/issues/345\r\n        query.geometry = {\r\n          $near: {\r\n            $geometry: {\r\n              type: 'Point',\r\n              coordinates: [longitude, latitude]\r\n            },\r\n            $maxDistance: distance\r\n          }\r\n        }\r\n        */\r\n        query.geometry = {\r\n          $geoWithin: {\r\n            $centerSphere: [[longitude, latitude], distance / 6378137.0] // Earth radius as in radians\r\n          }\r\n        }\r\n      }\r\n    }\r\n    // Shortcut for bbox query\r\n    if (!_.isNil(query.south) && !_.isNil(query.north) && !_.isNil(query.west) && !_.isNil(query.east)) {\r\n      const south = _.toNumber(query.south)\r\n      const north = _.toNumber(query.north)\r\n      const west = _.toNumber(query.west)\r\n      const east = _.toNumber(query.east)\r\n      // Transform to MongoDB spatial request\r\n      delete query.south\r\n      delete query.north\r\n      delete query.west\r\n      delete query.east\r\n      const geometryQuery = {\r\n        $geoIntersects: {\r\n          $geometry: {\r\n            type: 'Polygon',\r\n            coordinates: [ // BBox as a polygon\r\n              [[west, south], [east, south], [east, north], [west, north], [west, south]] // Closing point\r\n            ]\r\n          }\r\n        }\r\n      }\r\n      query.geometry = geometryQuery\r\n    }\r\n    // Shortcut for location query\r\n    if (!_.isNil(query.longitude) && !_.isNil(query.latitude)) {\r\n      const longitude = _.toNumber(query.longitude)\r\n      const latitude = _.toNumber(query.latitude)\r\n      // Transform to MongoDB spatial request\r\n      delete query.longitude\r\n      delete query.latitude\r\n      const geometryQuery = {\r\n        $geoIntersects: {\r\n          $geometry: {\r\n            type: 'Point',\r\n            coordinates: [longitude, latitude]\r\n          }\r\n        }\r\n      }\r\n      query.geometry = geometryQuery\r\n    }\r\n    if (query.geoJson) {\r\n      delete query.geoJson\r\n      hook.params.asGeoJson = true\r\n    }\r\n  }\r\n}\r\n\r\nexport function asGeoJson (options = {}) {\r\n  return function (hook) {\r\n    const params = hook.params\r\n    const query = params.query\r\n    if (!options.force && !params.asGeoJson) return\r\n    if (query.$distinct || query.$aggregation) return // Not applicable in this case\r\n    const longitudeProperty = (options.longitudeProperty || 'longitude')\r\n    const latitudeProperty = (options.latitudeProperty || 'latitude')\r\n    const altitudeProperty = (options.altitudeProperty || 'altitude')\r\n    const geometryProperty = (options.geometryProperty || 'geometry')\r\n    let results = _.get(hook, options.dataPath || 'result')\r\n    // Already as GeoJson ?\r\n    if (results.type === 'FeatureCollection') return\r\n    const isPaginated = !_.isNil(results.data)\r\n    const pagination = (isPaginated ? _.pick(results, ['total', 'skip', 'limit']) : {})\r\n    results = (isPaginated ? results.data : results)\r\n    results = results\r\n      .filter(item => {\r\n        // Check if item is not already in GeoJson feature format and we can convert if required\r\n        return (_.has(item, longitudeProperty) && _.has(item, latitudeProperty)) ||\r\n               // When performing feature aggregation on geometries the result can be an array\r\n               Array.isArray(_.get(item, geometryProperty)) ||\r\n               // Check for a geometry property (previously provided or already transformed item)\r\n               (_.has(item, geometryProperty + '.type') && _.has(item, geometryProperty + '.coordinates'))\r\n      })\r\n      .map(item => {\r\n        let coordinates\r\n        // Keep track of coordinates before picking properties\r\n        if (_.has(item, longitudeProperty) && _.has(item, latitudeProperty)) {\r\n          coordinates = [_.get(item, longitudeProperty), _.get(item, latitudeProperty)]\r\n          if (_.has(item, altitudeProperty)) {\r\n            coordinates.push(_.get(item, altitudeProperty))\r\n          }\r\n        }\r\n        if (options.pick) {\r\n          item = _.pick(item, options.pick)\r\n        }\r\n        if (options.omit) {\r\n          item = _.omit(item, options.omit)\r\n        }\r\n        // Item locations are already in GeoJson format\r\n        if (_.has(item, geometryProperty + '.type') && _.has(item, geometryProperty + '.coordinates')) {\r\n          return Object.assign({\r\n            type: 'Feature',\r\n            geometry: _.get(item, geometryProperty),\r\n            properties: {}\r\n          }, _.omit(item, [geometryProperty]))\r\n        } else if (Array.isArray(_.get(item, geometryProperty))) {\r\n          return Object.assign({\r\n            type: 'Feature',\r\n            geometry: { type: 'GeometryCollection', geometries: _.get(item, geometryProperty) },\r\n            properties: {}\r\n          }, _.omit(item, [geometryProperty]))\r\n        } else if (coordinates) {\r\n          // Item locations are not already in GeoJson feature format so we need to convert\r\n          return Object.assign({\r\n            type: 'Feature',\r\n            geometry: { type: 'Point', coordinates },\r\n            properties: {}\r\n          }, _.omit(item, [longitudeProperty, latitudeProperty]))\r\n        }\r\n      })\r\n    // Move some data to properties ?\r\n    if (options.properties) {\r\n      results.forEach(item => {\r\n        options.properties.forEach(mapping => {\r\n          if (mapping.from) _.set(item, `properties.${mapping.to || mapping.from}`, _.get(item, `${mapping.from}`))\r\n          if (mapping.delete) _.unset(item, `${mapping.from}`)\r\n        })\r\n      })\r\n    }\r\n    // Copy pagination information if any so that client can use it anyway\r\n    if (_.get(options, 'asFeatureCollection', true)) {\r\n      _.set(hook, options.dataPath || 'result', Object.assign({\r\n        type: 'FeatureCollection',\r\n        features: results\r\n      }, pagination)) // If no pagination this merged object will be empty\r\n    } else if (isPaginated) {\r\n      _.set(hook, options.dataPath || 'result', Object.assign({\r\n        data: results\r\n      }, pagination))\r\n    } else {\r\n      _.set(hook, options.dataPath || 'result', results)\r\n    }\r\n  }\r\n}\r\n\r\nexport async function aggregateFeaturesQuery (hook) {\r\n  const query = hook.params.query\r\n  const service = hook.service\r\n  if (!query) return\r\n  // Perform aggregation\r\n  if (query.$aggregate) {\r\n    const collection = service.Model\r\n    const featureId = (service.options ? service.options.featureId : '')\r\n    const featureIdType = (service.options ? service.options.featureIdType : 'string')\r\n    const ids = typeof query.$groupBy === 'string' // Group by matching ID(s), ie single ID or array of field to create a compound ID\r\n      ? { [query.$groupBy]: '$properties.' + query.$groupBy }\r\n    // Aggregated in an accumulator to avoid conflict with feature properties\r\n      : query.$groupBy.reduce((object, id) => Object.assign(object, { [id]: '$properties.' + id }), {})\r\n    const groupBy = { _id: ids }\r\n    let keys = _.keys(ids)\r\n    // Do we only keep first or last available time ?\r\n    const singleTime = (_.toNumber(query.$limit) === 1)\r\n    if (singleTime) {\r\n      // When single time no aggregation is performed at all so we only have raw features\r\n      keys = keys.map(key => 'properties.' + key)\r\n      // In this case no need to aggregate on each element we simply keep the first feature\r\n      // BUG: according to https://jira.mongodb.org/browse/SERVER-9507 MongoDB is not yet\r\n      // able to optimize this kind of operations to avoid full index scan\r\n      // For now we should restrict it to short time range\r\n      Object.assign(groupBy, { feature: { $first: '$$ROOT' } })\r\n    } else {\r\n      Object.assign(groupBy, {\r\n        time: { $push: '$time' }, // Keep track of all times\r\n        runTime: { $push: '$runTime' }, // Keep track of all run times\r\n        type: { $last: '$type' }, // type is assumed similar for all results, keep last\r\n        properties: { $last: '$properties' } // non-aggregated properties are assumed similar for all results, keep last\r\n      })\r\n      // Check if we aggregate geometry or simply properties\r\n      if (!query.$aggregate.includes('geometry')) {\r\n        Object.assign(groupBy, {\r\n          geometry: { $last: '$geometry' } // geometry is assumed similar for all results, keep last\r\n        })\r\n      }\r\n    }\r\n    // The query contains the match stage except options relevent to the aggregation pipeline\r\n    const match = _.omit(query, ['$groupBy', '$aggregate', '$geoNear', '$sort', '$limit', '$skip'])\r\n    const aggregateOptions = {}\r\n    // Check for any required type conversion (eg HTTP requests)\r\n    if (featureId && _.has(match, 'properties.' + featureId)) {\r\n      if (featureIdType === 'number') _.set(match, 'properties.' + featureId, _.toNumber(_.get(match, 'properties.' + featureId)))\r\n      // Check if we could provide a hint to the aggregation when targeting feature ID\r\n      // Indeed, in that case, we define the appropriate index\r\n      aggregateOptions.hint = { ['properties.' + featureId]: 1 }\r\n    }\r\n    // Ensure we do not mix results with/without relevant element values\r\n    // by separately querying each element then merging\r\n    let aggregatedResults\r\n    await Promise.all(query.$aggregate.map(async element => {\r\n      const isGeometry = (element === 'geometry')\r\n      // Geometry is a root property while others are feature properties\r\n      const prefix = (isGeometry ? '' : 'properties.')\r\n      const pipeline = []\r\n      // Check for geometry stage\r\n      if (query.$geoNear) {\r\n        pipeline.push({ $geoNear: query.$geoNear })\r\n      }\r\n      // Find matching features only\r\n      pipeline.push({ $match: Object.assign({ [prefix + element]: { $exists: true } }, match) })\r\n      // Ensure they are ordered by increasing time by default and most recent forecast first\r\n      pipeline.push({ $sort: Object.assign({ time: 1, runTime: -1 }, query.$sort) })\r\n      // Keep track of all feature values\r\n      if (singleTime) {\r\n        pipeline.push({ $group: groupBy })\r\n        pipeline.push({ $replaceRoot: { newRoot: '$feature' } })\r\n      } else {\r\n        pipeline.push({ $group: Object.assign({ [element]: { $push: '$' + prefix + element } }, groupBy) })\r\n      }\r\n      debug(`Aggregating ${element} element for features`)\r\n      pipeline.forEach(stage => {\r\n        _.forOwn(stage, (value, key) => debug('Stage', key, value))\r\n      })\r\n      const elementResults = await collection.aggregate(pipeline, aggregateOptions).toArray()\r\n      debug(`Generated ${elementResults.length} feature(s) for ${element} element`, elementResults)\r\n      // Rearrange data so that we get ordered arrays indexed by element\r\n      elementResults.forEach(result => {\r\n        result.time = { [element]: result.time }\r\n        if (result.runTime) result.runTime = { [element]: result.runTime }\r\n        if (!singleTime && !isGeometry) {\r\n          // Set back the element values as properties because we aggregated in an accumulator\r\n          // to avoid conflict with non-aggregated feature properties\r\n          _.set(result, prefix + element, _.get(result, element))\r\n          // Delete accumulator\r\n          _.unset(result, element)\r\n        }\r\n      })\r\n      // Now merge with previous element results\r\n      if (!aggregatedResults) {\r\n        aggregatedResults = elementResults\r\n      } else {\r\n        elementResults.forEach(result => {\r\n          const resultKeys = _.pick(result, keys)\r\n          const previousResult = aggregatedResults.find(aggregatedResult => {\r\n            const aggregatedResultKeys = _.pick(aggregatedResult, keys)\r\n            return _.isEqual(aggregatedResultKeys, resultKeys)\r\n          })\r\n          // Merge with previous matching feature if any\r\n          if (previousResult) {\r\n            Object.assign(previousResult.time, result.time)\r\n            if (result.runTime) {\r\n              if (previousResult.runTime) Object.assign(previousResult.runTime, result.runTime)\r\n              else previousResult.runTime = { [element]: result.runTime }\r\n            }\r\n            _.set(previousResult, prefix + element, _.get(result, prefix + element))\r\n          } else {\r\n            aggregatedResults.push(result)\r\n          }\r\n        })\r\n      }\r\n    }))\r\n    delete query.$groupBy\r\n    delete query.$aggregate\r\n    delete query.$geoNear\r\n    // Set result to avoid service DB call\r\n    hook.result = aggregatedResults\r\n  }\r\n  return hook\r\n}\r\n"]}

package/lib/map/api/models/features.model.mongodb.js

@@ -8,5 +8,8 @@ module.exports = function (app, options) {
   if (options.featureId) {
     options.Model.createIndex({ ['properties.' + options.featureId]: 1 });
   }
+  if (options.expireAfter || options.ttl) {
+    options.Model.createIndex({ time: 1 }, { expireAfterSeconds: options.expireAfter || options.ttl });
+  }
 };
 //# sourceMappingURL=features.model.mongodb.js.map

package/lib/map/api/models/features.model.mongodb.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../map/api/models/features.model.mongodb.js"],"names":["module","exports","app","options","db","Model","collection","createIndex","geometry","layer","featureId"],"mappings":";;AAAAA,OAAOC,OAAP,GAAiB,UAAUC,GAAV,EAAeC,OAAf,EAAwB;AACvC,QAAMC,KAAKD,QAAQC,EAAR,IAAcF,IAAIE,EAA7B;AACAD,UAAQE,KAAR,GAAgBD,GAAGE,UAAH,CAAcH,QAAQG,UAAtB,CAAhB;AACAH,UAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAEC,UAAU,UAAZ,EAA1B;AACAL,UAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAEE,OAAO,CAAT,EAA1B;AACA,MAAIN,QAAQO,SAAZ,EAAuB;AACrBP,YAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAE,CAAC,gBAAgBJ,QAAQO,SAAzB,GAAqC,CAAvC,EAA1B;AACD;AACF,CARD","file":"features.model.mongodb.js","sourcesContent":["module.exports = function (app, options) {\r\n  const db = options.db || app.db\r\n  options.Model = db.collection(options.collection)\r\n  options.Model.createIndex({ geometry: '2dsphere' })\r\n  options.Model.createIndex({ layer: 1 })\r\n  if (options.featureId) {\r\n    options.Model.createIndex({ ['properties.' + options.featureId]: 1 })\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["../../../../map/api/models/features.model.mongodb.js"],"names":["module","exports","app","options","db","Model","collection","createIndex","geometry","layer","featureId","expireAfter","ttl","time","expireAfterSeconds"],"mappings":";;AAAAA,OAAOC,OAAP,GAAiB,UAAUC,GAAV,EAAeC,OAAf,EAAwB;AACvC,QAAMC,KAAKD,QAAQC,EAAR,IAAcF,IAAIE,EAA7B;AACAD,UAAQE,KAAR,GAAgBD,GAAGE,UAAH,CAAcH,QAAQG,UAAtB,CAAhB;AACAH,UAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAEC,UAAU,UAAZ,EAA1B;AACAL,UAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAEE,OAAO,CAAT,EAA1B;AACA,MAAIN,QAAQO,SAAZ,EAAuB;AACrBP,YAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAE,CAAC,gBAAgBJ,QAAQO,SAAzB,GAAqC,CAAvC,EAA1B;AACD;AACD,MAAIP,QAAQQ,WAAR,IAAuBR,QAAQS,GAAnC,EAAwC;AACtCT,YAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAEM,MAAM,CAAR,EAA1B,EAAuC,EAAEC,oBAAoBX,QAAQQ,WAAR,IAAuBR,QAAQS,GAArD,EAAvC;AACD;AACF,CAXD","file":"features.model.mongodb.js","sourcesContent":["module.exports = function (app, options) {\r\n  const db = options.db || app.db\r\n  options.Model = db.collection(options.collection)\r\n  options.Model.createIndex({ geometry: '2dsphere' })\r\n  options.Model.createIndex({ layer: 1 })\r\n  if (options.featureId) {\r\n    options.Model.createIndex({ ['properties.' + options.featureId]: 1 })\r\n  }\r\n  if (options.expireAfter || options.ttl) {\r\n    options.Model.createIndex({ time: 1 }, { expireAfterSeconds: options.expireAfter || options.ttl })\r\n  }\r\n}\r\n"]}

package/lib/map/client/components/KCaptureToolbar.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="q-pl-sm q-pr-xs row justify-center items-center no-wrap q-gutter-x-xs">
+    <q-select
+      v-model="resolution"
+      :options="getResolutions()"
+      dense
+      borderless>
+      <template v-slot:option="scope">
+        <q-item v-bind="scope.itemProps" v-on="scope.itemEvents">
+          <q-item-section>
+            <q-item-label v-html="scope.opt.label" />
+          </q-item-section>
+          <q-item-section side>
+            <q-item-label caption>{{ scope.opt.description }}</q-item-label>
+          </q-item-section>
+        </q-item>
+      </template>
+    </q-select>
+    <q-input
+      v-model.number="width"
+      type="number"
+      min="256" max="4000"
+      mask="(#)###"
+      borderless
+      dense
+      input-class="text-center"
+      style="max-width: 54px" />
+    <span>x</span>
+    <q-input
+      v-model.number="height"
+      type="number"
+      min="256" max="4000"
+      mask="(#)###"
+      borderless
+      dense
+      input-class="text-center"
+      style="max-width: 54px" />
+    <k-action
+      id="capture-button"
+      icon="las la-camera"
+      tooltip="KCaptureToolbar.CAPTURE_ACTION"
+      :handler="() => this.capture()" />
+  </div>
+</template>
+
+<script>
+import _ from 'lodash'
+import { Events, Time } from '../../../core/client'
+import { exportFile } from 'quasar'
+
+export default {
+  name: 'k-capture-toolbar',
+  inject: ['kActivity'],
+  data () {
+    return {
+      width: 1280,
+      height: 720,
+      resolution: undefined
+    }
+  },
+  watch: {
+    resolution: {
+      immediate: true,
+      handler (value) {
+        if (!value) this.resolution = this.getResolutions()[1]
+        else {
+          const size = _.split(this.resolution.value, 'x')
+          this.width = size[0]
+          this.height = size[1]
+        }
+      }
+    },
+    width: {
+      handler (value) {
+        if (value < 256) this.width = 256
+        if (value > 4000) this.width = 4000
+      }
+    },
+    height: {
+      handler (value) {
+        if (value < 256) this.height = 256
+        if (value > 4000) this.height = 4000
+      }
+    }
+  },
+  methods: {
+    getResolutions () {
+      return [
+        { label: this.$t('KCaptureToolbar.SD_LABEL'), description: this.$t('KCaptureToolbar.SD_DESCRIPTION'), value: '640x480' },
+        { label: this.$t('KCaptureToolbar.HD_LABEL'), description: this.$t('KCaptureToolbar.HD_DESCRIPTION'), value: '1280x720' },
+        { label: this.$t('KCaptureToolbar.FHD_LABEL'), description: this.$t('KCaptureToolbar.FHD_DESCRIPTION'), value: '1920x1080' },
+        { label: this.$t('KCaptureToolbar.QHD_LABEL'), description: this.$t('KCaptureToolbar.QHD_DESCRIPTION'), value: '2560x1440' },
+        { label: this.$t('KCaptureToolbar.2K_LABEL'), description: this.$t('KCaptureToolbar.2K_DESCRIPTION'), value: '2048x1080' },
+        { label: this.$t('KCaptureToolbar.4K_LABEL'), description: this.$t('KCaptureToolbar.4K_DESCRIPTION'), value: '3840x2160' }
+      ]
+    },
+    async capture () {
+      // Retrieve the layers
+      const layers = this.kActivity.getContextParameters('layers').layers
+      // Retrieve the extension
+      const bbox = this.kActivity.getContextParameters('view')
+      // Setup the request url options
+      const endpoint = this.$store.get('capabilities.api.gateway') + '/capture'
+      const options = {
+        method: 'POST',
+        mode: 'cors',
+        body: JSON.stringify({
+          activity: this.kActivity.is3D() ? 'globe' : 'map',
+          layers,
+          bbox: [bbox.west, bbox.south, bbox.east, bbox.north],
+          size: { width: +this.width, height: +this.height },
+          time: Time.getCurrentTime().toISOString()
+        }),
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }
+      // Add the Authorization header if jwt is defined
+      const jwt = this.$api.get('storage').getItem(this.$config('gatewayJwt'))
+      if (jwt) options.headers.Authorization = 'Bearer ' + jwt
+      // Perform the request
+      let dismiss = null
+      try {
+        dismiss = this.$q.notify({
+          group: 'capture',
+          icon: 'las la-hourglass-half',
+          message: this.$t('KCaptureToolbar.CAPTURING_VIEW'),
+          color: 'primary',
+          timeout: 0,
+          spinner: true
+        })
+        const response = await fetch(endpoint, options)
+        dismiss()
+        if (response.ok) {
+          const arrayBuffer = await response.arrayBuffer()
+          exportFile('capture.png', new Uint8Array(arrayBuffer))
+        } else {
+          Events.$emit('error', { message: this.$t('errors.' + response.status) })
+        }
+      } catch (error) {
+        // Network error
+        dismiss()
+        Events.$emit('error', { message: this.$t('errors.NETWORK_ERROR') })
+      }
+    }
+  },
+  beforeCreate () {
+    this.$options.components['k-action'] = this.$load('frame/KAction')
+  }
+}
+</script>

package/lib/map/client/components/KColorLegend.vue

@@ -6,7 +6,7 @@
     <span class="k-unit-box bg-accent text-white text-caption"
       :style="colorUnitStyle"
     >
-      {{unit}}
+      {{unitSymbol}}
       <q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 20]" v-if="hint">{{hint}}</q-tooltip>
     </span>
 
@@ -28,7 +28,7 @@
 
 <script>
 import _ from 'lodash'
-import math from 'mathjs'
+import { Units } from '../../../core/client/units'
 import { buildColorMap } from '../utils'
 
 const COLOR_STEPS = 10
@@ -47,6 +47,7 @@ export default {
     return {
       visible: false,
       unit: null,
+      unitSymbol: '',
       hint: null,
       colorMap: null,
       colors: null,
@@ -142,6 +143,8 @@ export default {
       return engineLayer.colorMap || buildColorMap(this.getColorMapDefinition(layer))
     },
     getColorLegendUnits (layer) {
+      // Can be provided at layer level or variable level,
+      // FIXME: in case of multiple variables we assume a similar unit
       return _.get(layer, 'units', _.get(layer, 'variables[0].units'))
     },
     async onColorLegendShowLayer (layer, engineLayer) {
@@ -172,6 +175,7 @@ export default {
     setColorLegend (visible, unit, hint, colorMap, colors, values, unitValues, showGradient) {
       this.visible = visible
       this.unit = unit
+      this.unitSymbol = (unit ? Units.getUnitSymbol(unit) : '')
       this.hint = hint
       this.colorMap = colorMap
       this.colors = colors
@@ -193,7 +197,15 @@ export default {
         const colorMap = this.getColorMap(this.legendLayer, this.legendEngineLayer)
         const scale = _.get(this.getColorMapDefinition(this.legendLayer), 'scale')
         const units = this.getColorLegendUnits(this.legendLayer)
-        const unit = !units || units.length === 0 ? null : units[0]
+        let unit = null
+        // If we have multiple units available try to select the default one
+        if (units && units.length > 0) {
+          // Falback to base unit
+          const baseUnit = units[0]
+          // Get default unit for this quantity instead if available
+          const defaultUnit = Units.getDefaultUnit(baseUnit)
+          unit = (units.includes(defaultUnit) ? defaultUnit : baseUnit)
+        }
         const hint = this.getColorLegendHint(units, unit, this.legendLayer.name || this.legendLayer.label)
         const [showGradient, colors, values, unitValues] =
           this.getColorLegendValues(colorMap, scale, units, unit, COLOR_STEPS)
@@ -242,7 +254,7 @@ export default {
       const unitTo = unit
 
       function valueMap (value) {
-        const unitValue = math.unit(value, unitFrom).toNumber(unitTo)
+        const unitValue = Units.convert(value, unitFrom, unitTo)
         return Math.round(unitValue, 0).toFixed(0)
       }
 

package/lib/map/client/components/KFeaturesChart.vue

@@ -8,17 +8,16 @@
       :maximized="isModalMaximized"
       v-model="isModalOpened"
       @opened="$emit('opened')"
-      @closed="$emit('closed')">
-      <div slot="modal-content">
-        <div class="row justify-center text-center q-ma-none q-pa-none">
-          <div style="width: 90vw">
-            <canvas v-show="chartData.length > 0" class="chart" ref="chart"></canvas>
-          </div>
-          <q-btn v-show="currentChart > 1" size="1rem" flat round color="primary"
-            icon="las la-chevron-left" class="absolute-left" @click="onPreviousChart"/>
-          <q-btn v-show="currentChart < nbCharts" size="1rem" flat round color="primary"
-            icon="las la-chevron-right" class="absolute-right" @click="onNextChart" />
+      @closed="$emit('closed')"
+    >
+      <div class="row justify-center text-center q-ma-none q-pa-none">
+        <div style="width: 90vw">
+          <canvas v-show="chartData.length > 0" class="chart" ref="chart"></canvas>
         </div>
+        <q-btn v-show="currentChart > 1" size="1rem" flat round color="primary"
+          icon="las la-chevron-left" class="absolute-left" @click="onPreviousChart"/>
+        <q-btn v-show="currentChart < nbCharts" size="1rem" flat round color="primary"
+          icon="las la-chevron-right" class="absolute-right" @click="onNextChart" />
       </div>
     </k-modal>
     <k-modal
@@ -26,7 +25,7 @@
       ref="chartSettings"
       :title="$t('KFeaturesChart.CHART_SETTINGS_LABEL')"
       :buttons="[{ id: 'close-action', label: 'CLOSE', renderer: 'form-button', handler: () => this.$refs.chartSettings.close() }]">
-      <div slot="modal-content">
+      <div>
         <q-select v-model="property" :label="$t('KFeaturesChart.PROPERTY_LABEL')"
           :options="properties" @input="refreshChart"/>
         <q-select v-model="chartType" :label="$t('KFeaturesChart.CHART_LABEL')"

package/lib/map/client/components/KFeaturesFilter.vue

@@ -6,44 +6,43 @@
     :maximized="isModalMaximized"
     v-model="isModalOpened"
     @opened="$emit('opened')"
-    @closed="$emit('closed')">
-    <div slot="modal-content">
-      <q-list dense class="row items-center justify-around">
-        <q-item v-for="filter in filters" :key="filter.key" class="col-12">
-          <q-item-section avatar v-if="filter.operator">
-            <q-select v-model="filter.operator" :label="filter.property" stack-label :options="getOperators(filter)" emit-value map-options/>
-          </q-item-section>
-          <q-item-section>
-            <component
-              :is="filter.componentKey"
-              :ref="filter.key"
-              :properties="filter.properties"
-              :display="{ icon: false, label: false }"
-              @field-changed="filter.onValueChanged"
-            />
-          </q-item-section>
-          <q-item-section avatar>
-            <q-btn flat color="primary" icon="las la-trash" @click="onRemoveFilter(filter)">
-              <q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
-                {{$t('KFeaturesFilter.REMOVE_FILTER')}}
-              </q-tooltip>
-            </q-btn>
-          </q-item-section>
-        </q-item>
-        <q-item class="col-12">
-          <q-item-section avatar class="col-6">
-            {{$t('KFeaturesFilter.ADD_FILTER')}}
-          </q-item-section>
-          <q-item-section class="col-6">
-            <q-select v-model="property" :options="properties">
-              <template v-slot:after>
-                <q-btn v-if="property" round dense flat icon="las la-plus" @click="onAddFilter(property)"/>
-              </template>
-            </q-select>
-          </q-item-section>
-        </q-item>
-      </q-list>
-    </div>
+    @closed="$emit('closed')"
+  >
+    <q-list dense class="row items-center justify-around">
+      <q-item v-for="filter in filters" :key="filter.key" class="col-12">
+        <q-item-section avatar v-if="filter.operator">
+          <q-select v-model="filter.operator" :label="filter.property" stack-label :options="getOperators(filter)" emit-value map-options/>
+        </q-item-section>
+        <q-item-section>
+          <component
+            :is="filter.componentKey"
+            :ref="filter.key"
+            :properties="filter.properties"
+            :display="{ icon: false, label: false }"
+            @field-changed="filter.onValueChanged"
+          />
+        </q-item-section>
+        <q-item-section avatar>
+          <q-btn flat color="primary" icon="las la-trash" @click="onRemoveFilter(filter)">
+            <q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
+              {{$t('KFeaturesFilter.REMOVE_FILTER')}}
+            </q-tooltip>
+          </q-btn>
+        </q-item-section>
+      </q-item>
+      <q-item class="col-12">
+        <q-item-section avatar class="col-6">
+          {{$t('KFeaturesFilter.ADD_FILTER')}}
+        </q-item-section>
+        <q-item-section class="col-6">
+          <q-select v-model="property" :options="properties">
+            <template v-slot:after>
+              <q-btn v-if="property" round dense flat icon="las la-plus" @click="onAddFilter(property)"/>
+            </template>
+          </q-select>
+        </q-item-section>
+      </q-item>
+    </q-list>
   </k-modal>
 </template>
 
@@ -115,8 +114,10 @@ export default {
         properties.field.multiple = true
         properties.field.chips = true
         // Get available values
-        const values = await this.$api.getService(this.layer.service, this.contextId)
+        let values = await this.$api.getService(this.layer.service, this.contextId)
           .find({ query: Object.assign({ $distinct: `properties.${property}` }, _.omit(this.layer.baseQuery, this.getCurrentLayerFilters())) })
+        // Sort them to ease searching
+        values = values.sort()
         // We don't have label in that case
         properties.field.options = values.map(value => ({ value, label: (_.isNil(value) ? 'NIL' : value) }))
       }