@kalisio/kdk 2.2.0 → 2.2.1

package/core/api/application.js

@@ -174,7 +174,7 @@ async function createService (name, app, options = {}) {
     paginate,
     multi: true,
     whitelist: [
-      '$exists', '$and', '$or', '$eq', '$elemMatch', '$distinct', '$groupBy', '$group', '$regex',
+      '$exists', '$and', '$or', '$not', '$eq', '$elemMatch', '$distinct', '$groupBy', '$group', '$regex',
       '$text', '$search', '$caseSensitive', '$language', '$diacriticSensitive',
       '$aggregate', '$near', '$nearSphere', '$geoIntersects', '$geoWithin',
       '$maxDistance', '$minDistance', '$geometry', '$box', '$polygon', '$center', '$centerSphere'

package/core/client/components/KModal.vue

@@ -112,7 +112,7 @@ const xlMinWidths = { wide: 90, medium: 55, narrow: 25 }
 const computedStyle = computed(() => {
   // compute the modal max height
   const screenHeight = $q.screen.height
-  const modalMaxHeight = props.maximized ? screenHeight : 0.8 * screenHeight
+  const modalMaxHeight = props.maximized ? screenHeight : 0.9 * screenHeight
   // compute the scroll area max height
   // take into account the header and footer height
   let contentMaxHeight = modalMaxHeight - headerHeight.value

package/core/client/components/form/KForm.vue

@@ -23,7 +23,7 @@
       Grouped fields
     -->
     <template v-for="(group, id) in groups" :key="id">
-      <q-expansion-item icon="las la-file-alt" :group="id">
+      <q-expansion-item v-show="group.hasFields" icon="las la-file-alt" :group="id">
         <template v-slot:header>
           <!-- Label -->
           <q-item-section>
@@ -105,7 +105,11 @@ let buildInProgress = false
 
 // Computed
 const groups = computed(() => {
-  if (schema.value && schema.value.groups) return schema.value.groups
+  if (schema.value && schema.value.groups) {
+    return _.mapValues(schema.value.groups, (group, id) => Object.assign({
+      hasFields: _.find(fields.value, { group: id })
+    }, group))
+  }
   return {}
 })
 

package/core/client/components/media/KColorScale.vue

@@ -117,7 +117,7 @@ function drawLabel () {
   let xLabel = canvas.width
   switch (labelAlign.value) {
     case 'left':
-    xLabel = 0
+      xLabel = 0
       break
     case 'center':
       xLabel = canvas.width / 2

package/core/client/exporter.js

@@ -26,9 +26,12 @@ const ExporterQueue = {
     const request = this.pendingRequests.shift()
     try {
       // compute a filename
-      const timestamp = moment().toISOString().replace(/:/g, '-')
-      let filename = `${_.get(request, 'basename', request.service)}_${timestamp}.${request.format}`
-      if (_.get(request, 'gzip', true)) filename += '.gz'
+      let filename = request.filename
+      if (!filename) {
+        const timestamp = moment().toISOString().replace(/:/g, '-')
+        filename = `${_.get(request, 'basename', request.service)}_${timestamp}.${request.format}`
+        if (_.get(request, 'gzip', true)) filename += '.gz'
+      }
       // retrienve the target service path
       const servicePath = api.getServicePath(request.service).substring(1)
       // retrieve the transform assigned to the format
@@ -104,8 +107,10 @@ export const Exporter = {
         message: i18n.t('exporter.MESSAGE'),
         options: {
           type: 'radio',
-          model: options.formats[0].value,
-          items: options.formats
+          model: options.formats[0].label,
+          items: options.formats.map(format => {
+            return { label: format.label, value: format.label }
+          })
         },
         cancel: {
           id: 'cancel-button',
@@ -121,8 +126,9 @@ export const Exporter = {
         persistent: true
       }
       Dialog.create(dialog)
-        .onOk((format) => {
-          if (!ExporterQueue.push(Object.assign(params, { format }))) {
+        .onOk((formatLabel) => {
+          const format = _.find(options.formats, { label: formatLabel })
+          if (!ExporterQueue.push(Object.assign(params, format))) {
             Notify.create({
               type: 'negative',
               message: i18n.t('exporter.EXPORTS_LIMIT_REACHED')
@@ -130,7 +136,7 @@ export const Exporter = {
           }
         })
     } else {
-      if (!ExporterQueue.push(Object.assign(params, { format: options.formats[0].value }))) {
+      if (!ExporterQueue.push(Object.assign(params, options.formats[0]))) {
         Notify.create({
           type: 'negative',
           message: i18n.t('exporter.EXPORTS_LIMIT_REACHED')

package/core/client/units.js

@@ -289,7 +289,7 @@ export const Units = {
   // Get unit symbol by unit name
   getUnitSymbol (unit) {
     const definition = this.getUnit(unit)
-    return (definition ? i18n.t(definition.symbol) : unit)
+    return (definition ? i18n.tie(definition.symbol) : unit)
   },
   // Get default unit definition (if any) for a given quantity/unit name
   getDefaultUnit (quantityOrUnit) {
@@ -319,7 +319,7 @@ export const Units = {
   // If target unit is not specified will use default unit (if any) for source unit
   convert (value, sourceUnit, targetUnit) {
     if (_.isNil(value)) {
-      logger.warn(`[KDK] cannont convert an nil value`)
+      logger.warn('[KDK] cannont convert an nil value')
       return
     }
     if (value === Number.MIN_VALUE || value === Number.MAX_VALUE) return value
@@ -340,7 +340,7 @@ export const Units = {
   // options are mathjs format options
   format (value, sourceUnit, targetUnit, options) {
     if (_.isNil(value)) {
-      logger.warn(`[KDK] cannot format a nil value`)
+      logger.warn('[KDK] cannot format a nil value')
       return
     }
     // If target unit is not given use default one

package/core/client/utils/utils.shapes.js

@@ -113,7 +113,7 @@ function getSize (size) {
     - join: String - the stroke linejoin - 'miter'
     - dashArray: String - the stroke dasharray - 'none'
     - dashOffset: Number - the stroke dashoffset - 0
-  - icon: Object specifying an icon overlay
+  - icon: Object specifying an icon overlay, can also be a custom L.Icon object instance
     - classes: String - the icon class
     - url: String - the icon url
     - color: String - the icon color

package/extras/icons/wind-speed-0.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-25 -25 50 50">
+<desc id="en">Observed wind speed: 0–2 knots</desc>
+<g style="fill:none; stroke:black; stroke-width:2.5;">
+	<circle r="18"/>
+</g>
+</svg>

package/extras/icons/wind-speed-10.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 8–12 knots</desc>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40 l -5,-17"/>
+</g>
+</svg>

package/extras/icons/wind-speed-100.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 98–102 knots</desc>
+<g style="fill:black; stroke:none; stroke-width:0;">
+	<path d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+	<path d="M -34,1 L -34,0 L -29,-17.25 L -24,0 L -24,1"/>
+</g>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+</g>
+</svg>

package/extras/icons/wind-speed-105.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 102–107 knots</desc>
+<g style="fill:black; stroke:none; stroke-width:0;">
+	<path d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+	<path d="M -34,1 L -34,0 L -29,-17.25 L -24,0 L -24,1"/>
+</g>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+	<path d="M -20,0 l -2.5,-8.5"/>
+</g>
+</svg>

package/extras/icons/wind-speed-15.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 13–17 knots</desc>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40 l -5,-17"/>
+	<path d="M -35,0 l -2.5,-8.5"/>
+</g>
+</svg>

package/extras/icons/wind-speed-20.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 18–22 knots</desc>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40 l -5,-17"/>
+	<path d="M -35,0 l -5,-17"/>
+</g>
+</svg>

package/extras/icons/wind-speed-25.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 23–27 knots</desc>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40 l -5,-17"/>
+	<path d="M -35,0 l -5,-17"/>
+	<path d="M -30,0 l -2.5,-8.5"/>
+</g>
+</svg>

package/extras/icons/wind-speed-30.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 28–32 knots</desc>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40 l -5,-17"/>
+	<path d="M -35,0 l -5,-17"/>
+	<path d="M -30,0 l -5,-17"/>
+</g>
+</svg>

package/extras/icons/wind-speed-35.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 33–37 knots</desc>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40 l -5,-17"/>
+	<path d="M -35,0 l -5,-17"/>
+	<path d="M -30,0 l -5,-17"/>
+	<path d="M -25,0 l -2.5,-8.5"/>
+</g>
+</svg>

package/extras/icons/wind-speed-40.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 38–42 knots</desc>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40 l -5,-17"/>
+	<path d="M -35,0 l -5,-17"/>
+	<path d="M -30,0 l -5,-17"/>
+	<path d="M -25,0 l -5,-17"/>
+</g>
+</svg>

package/extras/icons/wind-speed-45.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 43–47 knots</desc>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40 l -5,-17"/>
+	<path d="M -35,0 l -5,-17"/>
+	<path d="M -30,0 l -5,-17"/>
+	<path d="M -25,0 l -5,-17"/>
+	<path d="M -20,0 l -2.5,-8.5"/>
+</g>
+</svg>

package/extras/icons/wind-speed-5.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 3–7 knots</desc>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+	<path d="M -35,0 l -2.5,-8.5"/>
+</g>
+</svg>

package/extras/icons/wind-speed-50.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 63–67 knots</desc>
+	<path style="fill:black; stroke:none; stroke-width:0;" d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+</g>
+</svg>

package/extras/icons/wind-speed-55.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 53–57 knots</desc>
+	<path style="fill:black; stroke:none; stroke-width:0;" d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+	<path d="M -30,0 l -2.5,-8.5"/>
+</g>
+</svg>

package/extras/icons/wind-speed-60.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 58–62 knots</desc>
+	<path style="fill:black; stroke:none; stroke-width:0;" d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+	<path d="M -30,0 l -5,-17"/>
+</g>
+</svg>

package/extras/icons/wind-speed-65.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 63–67 knots</desc>
+	<path style="fill:black; stroke:none; stroke-width:0;" d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+	<path d="M -30,0 l -5,-17"/>
+	<path d="M -25,0 l -2.5,-8.5"/>
+</g>
+</svg>

package/extras/icons/wind-speed-70.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 68–72 knots</desc>
+	<path style="fill:black; stroke:none; stroke-width:0;" d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+	<path d="M -30,0 l -5,-17"/>
+	<path d="M -25,0 l -5,-17"/>
+</g>
+</svg>

package/extras/icons/wind-speed-75.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 73–77 knots</desc>
+	<path style="fill:black; stroke:none; stroke-width:0;" d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+	<path d="M -30,0 l -5,-17"/>
+	<path d="M -25,0 l -5,-17"/>
+	<path d="M -20,0 l -2.5,-8.5"/>
+</g>
+</svg>

package/extras/icons/wind-speed-80.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 78–82 knots</desc>
+	<path style="fill:black; stroke:none; stroke-width:0;" d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+	<path d="M -30,0 l -5,-17"/>
+	<path d="M -25,0 l -5,-17"/>
+	<path d="M -20,0 l -5,-17"/>
+</g>
+</svg>

package/extras/icons/wind-speed-85.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 83–87 knots</desc>
+	<path style="fill:black; stroke:none; stroke-width:0;" d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+	<path d="M -30,0 l -5,-17"/>
+	<path d="M -25,0 l -5,-17"/>
+	<path d="M -20,0 l -5,-17"/>
+	<path d="M -15,0 l -2.5,-8.5"/>
+</g>
+</svg>

package/extras/icons/wind-speed-90.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 88–92 knots</desc>
+	<path style="fill:black; stroke:none; stroke-width:0;" d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+	<path d="M -30,0 l -5,-17"/>
+	<path d="M -25,0 l -5,-17"/>
+	<path d="M -20,0 l -5,-17"/>
+	<path d="M -15,0 l -5,-17"/>
+</g>
+</svg>

package/extras/icons/wind-speed-95.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="200" viewBox="-48 -33 50 50">
+<desc id="en">Observed wind speed: 93–97 knots</desc>
+	<path style="fill:black; stroke:none; stroke-width:0;" d="M -44,1 L -44,0 L -39,-17.25 L -34,0 L -34,1"/>
+<g style="fill:none; stroke:black; stroke-width:2;">
+	<path d="M 0,0 h -40"/>
+	<path d="M -30,0 l -5,-17"/>
+	<path d="M -25,0 l -5,-17"/>
+	<path d="M -20,0 l -5,-17"/>
+	<path d="M -15,0 l -5,-17"/>
+	<path d="M -10,0 l -2.5,-8.5"/>
+</g>
+</svg>

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

@@ -30,6 +30,17 @@ function getGeometryQueryForBBox (bbox) {
     }
   }
 }
+
+export function marshallGeoJsonQuery (hook) {
+  const query = hook.params.query
+  if (query) {
+    if (query.geoJson) {
+      delete query.geoJson
+      hook.params.asGeoJson = true
+    }
+  }
+}
+
 export function marshallSpatialQuery (hook) {
   const query = hook.params.query
   if (query) {
@@ -116,11 +127,9 @@ export function marshallSpatialQuery (hook) {
       }
       query.geometry = geometryQuery
     }
-    if (query.geoJson) {
-      delete query.geoJson
-      hook.params.asGeoJson = true
-    }
   }
+  // Include GeoJson query by default
+  marshallGeoJsonQuery(hook)
 }
 
 export function asGeoJson (options = {}) {
@@ -139,6 +148,9 @@ export function asGeoJson (options = {}) {
     const isPaginated = !_.isNil(results.data)
     const pagination = (isPaginated ? _.pick(results, ['total', 'skip', 'limit']) : {})
     results = (isPaginated ? results.data : results)
+    // Single item case, i.e. GET ?
+    const isFeatureCollection = Array.isArray(results)
+    if (!isFeatureCollection) results = [results]
     results = results
       .filter(item => {
         // Check if item is not already in GeoJson feature format and we can convert if required
@@ -190,24 +202,35 @@ export function asGeoJson (options = {}) {
     // Move some data to properties ?
     if (options.properties) {
       results.forEach(item => {
-        options.properties.forEach(mapping => {
-          if (mapping.from) _.set(item, `properties.${mapping.to || mapping.from}`, _.get(item, `${mapping.from}`))
-          if (mapping.delete) _.unset(item, `${mapping.from}`)
-        })
+        // True indicates to move all fields to properties
+        if (options.properties === true) {
+          _.forOwn(item, (value, key) => {
+            if ((key === 'geometry') || (key === 'type') || (key === '_id')) return
+            _.set(item, `properties.${key}`, _.get(item, key))
+            _.unset(item, key)
+          })
+        } else { // Else we expect a specific mapping
+          options.properties.forEach(mapping => {
+            if (mapping.from) _.set(item, `properties.${mapping.to || mapping.from}`, _.get(item, `${mapping.from}`))
+            if (mapping.delete) _.unset(item, `${mapping.from}`)
+          })
+        }
       })
     }
-    // Copy pagination information if any so that client can use it anyway
-    if (_.get(options, 'asFeatureCollection', true)) {
+    // If we should make it available as a GeoJson feature collection create it
+    if (isFeatureCollection && _.get(options, 'asFeatureCollection', true)) {
+      // Copy pagination information if any so that client can use it anyway
       _.set(hook, options.dataPath || 'result', Object.assign({
         type: 'FeatureCollection',
         features: results
       }, pagination)) // If no pagination this merged object will be empty
     } else if (isPaginated) {
+      // Copy pagination information if any so that client can use it anyway
       _.set(hook, options.dataPath || 'result', Object.assign({
         data: results
       }, pagination))
     } else {
-      _.set(hook, options.dataPath || 'result', results)
+      _.set(hook, options.dataPath || 'result', isFeatureCollection ? results : results[0])
     }
   }
 }

package/map/client/cesium/utils/index.js

@@ -1,3 +1,4 @@
 export * from './utils.events.js'
 export * from './utils.popup.js'
-export * from './utils.style.js'
+export * from './utils.style.js'
+export * from './utils.features.js'

package/map/client/cesium/utils/utils.features.js

@@ -0,0 +1,8 @@
+import { kml } from '@tmcw/togeojson'
+import Cesium from 'cesium/Source/Cesium.js'
+
+export async function convertEntitiesToGeoJson(entities) {
+  const kmlEntities = await Cesium.exportKml({ entities, modelCallback: () => '' })
+  const parser = new DOMParser()
+  return kml(parser.parseFromString(kmlEntities.kml, 'application/xml'))
+}

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

@@ -3,7 +3,7 @@ import chroma from 'chroma-js'
 import moment from 'moment'
 import Cesium from 'cesium/Source/Cesium.js'
 import { Time, Units } from '../../../../core/client/index.js'
-import { convertPointStyleToSimpleStyle, convertLineStyleToSimpleStyle, convertPolygonStyleToSimpleStyle,
+import { convertPointStyleToSimpleStyle, convertLineStyleToSimpleStyle, convertPolygonStyleToSimpleStyle, convertSimpleStyleColors,
          convertSimpleStyleToPointStyle, convertSimpleStyleToLineStyle, convertSimpleStyleToPolygonStyle,
          PointStyleTemplateMappings, LineStyleTemplateMappings, PolygonStyleTemplateMappings } from '../../utils/utils.style.js'
 
@@ -64,7 +64,7 @@ export function getPointSimpleStyle (feature, options, engine, engineStylePath =
   const featureStyle = feature.style ? _.get(feature, 'style', {}) : convertSimpleStyleToPointStyle(feature.properties)
   const style = _.merge({}, engineStyle, layerStyle, featureStyle)
   processStyle({ style: { point: style } }, feature, options, PointStyleTemplateMappings)
-  return convertPointStyleToSimpleStyle(style)
+  return convertSimpleStyleColors(convertPointStyleToSimpleStyle(style))
 }
 
 export function getLineSimpleStyle (feature, options, engine, engineStylePath = 'style.line') {
@@ -73,7 +73,7 @@ export function getLineSimpleStyle (feature, options, engine, engineStylePath =
   const featureStyle = feature.style ? _.get(feature, 'style', {}) : convertSimpleStyleToLineStyle(feature.properties)
   const style = _.merge({}, engineStyle, layerStyle, featureStyle)
   processStyle({ style: { line: style } }, feature, options, LineStyleTemplateMappings)
-  return convertLineStyleToSimpleStyle(style)
+  return convertSimpleStyleColors(convertLineStyleToSimpleStyle(style))
 }
 
 export function getPolygonSimpleStyle (feature, options, engine, engineStylePath = 'style.polygon') {
@@ -82,7 +82,7 @@ export function getPolygonSimpleStyle (feature, options, engine, engineStylePath
   const featureStyle = feature.style ? _.get(feature, 'style', {}) : convertSimpleStyleToPolygonStyle(feature.properties)
   const style = _.merge({}, engineStyle, layerStyle, featureStyle)
   processStyle({ style: { polygon: style } }, feature, options, PolygonStyleTemplateMappings)
-  return convertPolygonStyleToSimpleStyle(style)
+  return convertSimpleStyleColors(convertPolygonStyleToSimpleStyle(style))
 }
 
 export function convertToCesiumObjects (style) {