@kalisio/kdk 2.6.2 → 2.6.3

package/coverage/map/api/hooks/hooks.catalog.js.html

@@ -25,7 +25,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>0/124</span>
+                <span class='fraction'>0/171</span>
             </div>
         
             
@@ -46,7 +46,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>0/124</span>
+                <span class='fraction'>0/171</span>
             </div>
         
             
@@ -187,7 +187,53 @@
 <a name='L122'></a><a href='#L122'>122</a>
 <a name='L123'></a><a href='#L123'>123</a>
 <a name='L124'></a><a href='#L124'>124</a>
-<a name='L125'></a><a href='#L125'>125</a></td><td class="line-coverage quiet"><span class="cline-any cline-no">&nbsp;</span>
+<a name='L125'></a><a href='#L125'>125</a>
+<a name='L126'></a><a href='#L126'>126</a>
+<a name='L127'></a><a href='#L127'>127</a>
+<a name='L128'></a><a href='#L128'>128</a>
+<a name='L129'></a><a href='#L129'>129</a>
+<a name='L130'></a><a href='#L130'>130</a>
+<a name='L131'></a><a href='#L131'>131</a>
+<a name='L132'></a><a href='#L132'>132</a>
+<a name='L133'></a><a href='#L133'>133</a>
+<a name='L134'></a><a href='#L134'>134</a>
+<a name='L135'></a><a href='#L135'>135</a>
+<a name='L136'></a><a href='#L136'>136</a>
+<a name='L137'></a><a href='#L137'>137</a>
+<a name='L138'></a><a href='#L138'>138</a>
+<a name='L139'></a><a href='#L139'>139</a>
+<a name='L140'></a><a href='#L140'>140</a>
+<a name='L141'></a><a href='#L141'>141</a>
+<a name='L142'></a><a href='#L142'>142</a>
+<a name='L143'></a><a href='#L143'>143</a>
+<a name='L144'></a><a href='#L144'>144</a>
+<a name='L145'></a><a href='#L145'>145</a>
+<a name='L146'></a><a href='#L146'>146</a>
+<a name='L147'></a><a href='#L147'>147</a>
+<a name='L148'></a><a href='#L148'>148</a>
+<a name='L149'></a><a href='#L149'>149</a>
+<a name='L150'></a><a href='#L150'>150</a>
+<a name='L151'></a><a href='#L151'>151</a>
+<a name='L152'></a><a href='#L152'>152</a>
+<a name='L153'></a><a href='#L153'>153</a>
+<a name='L154'></a><a href='#L154'>154</a>
+<a name='L155'></a><a href='#L155'>155</a>
+<a name='L156'></a><a href='#L156'>156</a>
+<a name='L157'></a><a href='#L157'>157</a>
+<a name='L158'></a><a href='#L158'>158</a>
+<a name='L159'></a><a href='#L159'>159</a>
+<a name='L160'></a><a href='#L160'>160</a>
+<a name='L161'></a><a href='#L161'>161</a>
+<a name='L162'></a><a href='#L162'>162</a>
+<a name='L163'></a><a href='#L163'>163</a>
+<a name='L164'></a><a href='#L164'>164</a>
+<a name='L165'></a><a href='#L165'>165</a>
+<a name='L166'></a><a href='#L166'>166</a>
+<a name='L167'></a><a href='#L167'>167</a>
+<a name='L168'></a><a href='#L168'>168</a>
+<a name='L169'></a><a href='#L169'>169</a>
+<a name='L170'></a><a href='#L170'>170</a>
+<a name='L171'></a><a href='#L171'>171</a></td><td class="line-coverage quiet"><span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -311,55 +357,106 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js"><span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" ><span class="branch-0 cbranch-no" title="branch not covered" >import _ from 'lodash'</span></span></span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js"><span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" ><span class="branch-0 cbranch-no" title="branch not covered" >import _ from 'lodash'</span></span></span>
 <span class="cstat-no" title="statement not covered" >import siftModule from 'sift'</span>
 <span class="cstat-no" title="statement not covered" >import common from 'feathers-hooks-common'</span>
 <span class="cstat-no" title="statement not covered" >import makeDebug from 'debug'</span>
+<span class="cstat-no" title="statement not covered" >import { toString, toJson } from '../../../core/api/hooks/index.js'</span>
 <span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >const { getItems, replaceItems } = common</span>
 <span class="cstat-no" title="statement not covered" >const sift = siftModule.default</span>
 <span class="cstat-no" title="statement not covered" >const debug = makeDebug('kdk:map:catalog:hooks')</span>
 <span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >function isQueryForType(query, type) {</span>
+<span class="cstat-no" title="statement not covered" >  // Use sift to support MongoDB operators like $in, $nin, etc.</span>
+<span class="cstat-no" title="statement not covered" >  const filter = [{ type }].filter(sift(_.pick(query, ['type'])))</span>
+<span class="cstat-no" title="statement not covered" >  return !_.isEmpty(filter)</span>
+<span class="cstat-no" title="statement not covered" >}</span>
+<span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >function addDefaultItems(query, type, items, defaultItems) {</span>
+<span class="cstat-no" title="statement not covered" >  // Add implicit type as not provided in default items config</span>
+<span class="cstat-no" title="statement not covered" >  defaultItems = _.map(defaultItems, item =&gt; Object.assign(item, { type }))</span>
+<span class="cstat-no" title="statement not covered" >  // Then filter according to query</span>
+<span class="cstat-no" title="statement not covered" >  defaultItems = defaultItems.filter(sift(_.omit(query, ['$sort', '$limit', '$skip'])))</span>
+<span class="cstat-no" title="statement not covered" >  return items.concat(defaultItems.map(item =&gt; Object.assign(item, { type })))</span>
+<span class="cstat-no" title="statement not covered" >}</span>
+<span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >// By default we only return default categories</span>
 <span class="cstat-no" title="statement not covered" >export function getDefaultCategories (hook) {</span>
 <span class="cstat-no" title="statement not covered" >  const query = _.get(hook, 'params.query', {})</span>
-<span class="cstat-no" title="statement not covered" >  if ((query.type === 'Category') &amp;&amp; (query.$limit !== 0)) {</span>
+<span class="cstat-no" title="statement not covered" >  const type = 'Category'</span>
+<span class="cstat-no" title="statement not covered" >  if ((query.$limit !== 0) &amp;&amp; isQueryForType(query, type)) {</span>
 <span class="cstat-no" title="statement not covered" >    const service = hook.service</span>
-<span class="cstat-no" title="statement not covered" >    // Read default category config</span>
-<span class="cstat-no" title="statement not covered" >    const catalogConfig = hook.app.get('catalog') || { categories: [] }</span>
-<span class="cstat-no" title="statement not covered" >    // Check for specific service override (e.g. contextual catalog different from global catalog)</span>
-<span class="cstat-no" title="statement not covered" >    let defaultCategories = _.get(service, 'options.categories', catalogConfig.categories)</span>
-<span class="cstat-no" title="statement not covered" >    // Add implicit type</span>
-<span class="cstat-no" title="statement not covered" >    defaultCategories = _.map(defaultCategories, category =&gt; Object.assign(category, { type: 'Category' }))</span>
-<span class="cstat-no" title="statement not covered" >    // Then filter according to query</span>
-<span class="cstat-no" title="statement not covered" >    defaultCategories = defaultCategories.filter(sift(_.omit(query, ['$sort', '$limit', '$skip'])))</span>
-<span class="cstat-no" title="statement not covered" >    const item = getItems(hook)</span>
-<span class="cstat-no" title="statement not covered" >    replaceItems(hook, item.concat(defaultCategories.map(category =&gt; Object.assign(category, { type: 'Category' }))))</span>
+<span class="cstat-no" title="statement not covered" >    // Check for default categories config</span>
+<span class="cstat-no" title="statement not covered" >    const defaultCategories = _.get(service, 'options.categories', [])</span>
+<span class="cstat-no" title="statement not covered" >    debug(`Retrieving ${defaultCategories.length} default categories for query`, query)</span>
+<span class="cstat-no" title="statement not covered" >    replaceItems(hook, addDefaultItems(query, type, getItems(hook), defaultCategories))</span>
 <span class="cstat-no" title="statement not covered" >  }</span>
 <span class="cstat-no" title="statement not covered" >}</span>
 <span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >// By default we only return default sublegends</span>
 <span class="cstat-no" title="statement not covered" >export function getDefaultSublegends (hook) {</span>
 <span class="cstat-no" title="statement not covered" >  const query = _.get(hook, 'params.query', {})</span>
-<span class="cstat-no" title="statement not covered" >  if ((query.type === 'Sublegend') &amp;&amp; (query.$limit !== 0)) {</span>
+<span class="cstat-no" title="statement not covered" >  const type = 'Sublegend'</span>
+<span class="cstat-no" title="statement not covered" >  if ((query.$limit !== 0) &amp;&amp; isQueryForType(query, type)) {</span>
 <span class="cstat-no" title="statement not covered" >    const service = hook.service</span>
-<span class="cstat-no" title="statement not covered" >    // Read default sublegends config</span>
-<span class="cstat-no" title="statement not covered" >    const catalogConfig = hook.app.get('catalog') || { sublegends: [] }</span>
-<span class="cstat-no" title="statement not covered" >    // Check for specific service override (e.g. contextual catalog different from global catalog)</span>
-<span class="cstat-no" title="statement not covered" >    let defaultSublegends = _.get(service, 'options.sublegends', catalogConfig.sublegends)</span>
-<span class="cstat-no" title="statement not covered" >    // Add implicit type</span>
-<span class="cstat-no" title="statement not covered" >    defaultSublegends = _.map(defaultSublegends, sublegend =&gt; Object.assign(sublegend, { type: 'Sublegend' }))</span>
-<span class="cstat-no" title="statement not covered" >    // Then filter according to query</span>
-<span class="cstat-no" title="statement not covered" >    defaultSublegends = defaultSublegends.filter(sift(_.omit(query, ['$sort', '$limit', '$skip'])))</span>
-<span class="cstat-no" title="statement not covered" >    const item = getItems(hook)</span>
-<span class="cstat-no" title="statement not covered" >    replaceItems(hook, item.concat(defaultSublegends.map(sublegend =&gt; Object.assign(sublegend, { type: 'Sublegend' }))))</span>
+<span class="cstat-no" title="statement not covered" >    // Check for default sublegends config</span>
+<span class="cstat-no" title="statement not covered" >    const defaultSublegends = _.get(service, 'options.sublegends', [])</span>
+<span class="cstat-no" title="statement not covered" >    debug(`Retrieving ${defaultSublegends.length} default sublegends for query`, query)</span>
+<span class="cstat-no" title="statement not covered" >    replaceItems(hook, addDefaultItems(query, type, getItems(hook), defaultSublegends))</span>
 <span class="cstat-no" title="statement not covered" >  }</span>
 <span class="cstat-no" title="statement not covered" >}</span>
 <span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >// By default we only return layers and not other objects in catalog</span>
 <span class="cstat-no" title="statement not covered" >export function filterLayers (hook) {</span>
 <span class="cstat-no" title="statement not covered" >  const query = _.get(hook, 'params.query', {})</span>
-<span class="cstat-no" title="statement not covered" >  if (!query.type) query.type = { $nin: ['Context', 'Service', 'Category'] }</span>
+<span class="cstat-no" title="statement not covered" >  if (!query.type) query.type = { $nin: ['Context', 'Service', 'Category', 'Sublegend'] }</span>
 <span class="cstat-no" title="statement not covered" >  _.set(hook, 'params.query', query)</span>
 <span class="cstat-no" title="statement not covered" >}</span>
 <span class="cstat-no" title="statement not covered" ></span>
@@ -407,7 +504,9 @@
 <span class="cstat-no" title="statement not covered" >  if (!Array.isArray(removedItems)) removedItems = [removedItems]</span>
 <span class="cstat-no" title="statement not covered" >  for (let i = 0; i &lt; removedItems.length; i++) {</span>
 <span class="cstat-no" title="statement not covered" >    const removedItem = removedItems[i]</span>
-<span class="cstat-no" title="statement not covered" >    const isLayer = removedItem.type !== 'Context'</span>
+<span class="cstat-no" title="statement not covered" >    const isLayer = removedItem.type.endsWith('Layer')</span>
+<span class="cstat-no" title="statement not covered" >    const isView = (removedItem.type === 'Context')</span>
+<span class="cstat-no" title="statement not covered" >    if (!isLayer &amp;&amp; !isView) continue</span>
 <span class="cstat-no" title="statement not covered" >    const query = {}</span>
 <span class="cstat-no" title="statement not covered" >    if (isLayer) {</span>
 <span class="cstat-no" title="statement not covered" >      query.$or = [{ 'layers._id': removedItem._id }, { 'layers.name': removedItem.name }]</span>
@@ -421,7 +520,7 @@
 <span class="cstat-no" title="statement not covered" >    // Stop when non found</span>
 <span class="cstat-no" title="statement not covered" >    if (projects.length === 0) {</span>
 <span class="cstat-no" title="statement not covered" >      debug(`No project to update after removing item ${removedItem.name} `)</span>
-<span class="cstat-no" title="statement not covered" >      return hook</span>
+<span class="cstat-no" title="statement not covered" >      continue</span>
 <span class="cstat-no" title="statement not covered" >    }</span>
 <span class="cstat-no" title="statement not covered" >    // Update each project otherwise</span>
 <span class="cstat-no" title="statement not covered" >    await Promise.all(projects.map(project =&gt; {</span>
@@ -435,14 +534,53 @@
 <span class="cstat-no" title="statement not covered" >  }</span>
 <span class="cstat-no" title="statement not covered" >  return hook</span>
 <span class="cstat-no" title="statement not covered" >}</span>
-&nbsp;</pre></td></tr></table></pre>
+<span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >export function convertFilterQueriesToString (hook) {</span>
+<span class="cstat-no" title="statement not covered" >  let items = getItems(hook)</span>
+<span class="cstat-no" title="statement not covered" >  const isArray = Array.isArray(items)</span>
+<span class="cstat-no" title="statement not covered" >  items = (isArray ? items : [items])</span>
+<span class="cstat-no" title="statement not covered" >  let nbUpdatedItems = 0</span>
+<span class="cstat-no" title="statement not covered" >  items.forEach(item =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >    const filters = _.get(item, 'filters', [])</span>
+<span class="cstat-no" title="statement not covered" >    nbUpdatedItems += filters.length</span>
+<span class="cstat-no" title="statement not covered" >    _.forEach(filters, filter =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >      toString(filter, ['active', 'inactive'])</span>
+<span class="cstat-no" title="statement not covered" >    })</span>
+<span class="cstat-no" title="statement not covered" >  })</span>
+<span class="cstat-no" title="statement not covered" >  if (nbUpdatedItems &gt; 0) {</span>
+<span class="cstat-no" title="statement not covered" >    replaceItems(hook, isArray ? items : items[0])</span>
+<span class="cstat-no" title="statement not covered" >    debug(`Updated ${nbUpdatedItems} filters on items`)</span>
+<span class="cstat-no" title="statement not covered" >  }</span>
+<span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >  return hook</span>
+<span class="cstat-no" title="statement not covered" >}</span>
+<span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >export function convertFilterQueriesToObject (hook) {</span>
+<span class="cstat-no" title="statement not covered" >  let items = getItems(hook)</span>
+<span class="cstat-no" title="statement not covered" >  const isArray = Array.isArray(items)</span>
+<span class="cstat-no" title="statement not covered" >  items = (isArray ? items : [items])</span>
+<span class="cstat-no" title="statement not covered" >  let nbUpdatedItems = 0</span>
+<span class="cstat-no" title="statement not covered" >  items.forEach(item =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >    const filters = _.get(item, 'filters', [])</span>
+<span class="cstat-no" title="statement not covered" >    nbUpdatedItems += filters.length</span>
+<span class="cstat-no" title="statement not covered" >    _.forEach(filters, filter =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >      toJson(filter, ['active', 'inactive'])</span>
+<span class="cstat-no" title="statement not covered" >    })</span>
+<span class="cstat-no" title="statement not covered" >  })</span>
+<span class="cstat-no" title="statement not covered" >  if (nbUpdatedItems &gt; 0) {</span>
+<span class="cstat-no" title="statement not covered" >    replaceItems(hook, isArray ? items : items[0])</span>
+<span class="cstat-no" title="statement not covered" >    debug(`Updated ${nbUpdatedItems} filters on items`)</span>
+<span class="cstat-no" title="statement not covered" >  }</span>
+<span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >  return hook</span>
+<span class="cstat-no" title="statement not covered" >}</span></pre></td></tr></table></pre>
 
                 <div class='push'></div><!-- for sticky footer -->
             </div><!-- /wrapper -->
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.843Z
+                at 2025-12-17T09:26:49.744Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/map/api/hooks/hooks.features.js.html

@@ -382,7 +382,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.843Z
+                at 2025-12-17T09:26:49.744Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>

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

@@ -1018,7 +1018,7 @@
 <span class="cstat-no" title="statement not covered" >    const params = hook.params</span>
 <span class="cstat-no" title="statement not covered" >    const query = params.query</span>
 <span class="cstat-no" title="statement not covered" >    if (!options.force &amp;&amp; !params.asGeoJson) return</span>
-<span class="cstat-no" title="statement not covered" >    if (query.$distinct || query.$aggregation) return // Not applicable in this case</span>
+<span class="cstat-no" title="statement not covered" >    if (_.has(query, '$distinct') || _.has(query, '$aggregation')) return // Not applicable in this case</span>
 <span class="cstat-no" title="statement not covered" >    const longitudeProperty = (options.longitudeProperty || 'longitude')</span>
 <span class="cstat-no" title="statement not covered" >    const latitudeProperty = (options.latitudeProperty || 'latitude')</span>
 <span class="cstat-no" title="statement not covered" >    const altitudeProperty = (options.altitudeProperty || 'altitude')</span>
@@ -1130,19 +1130,24 @@
 <span class="cstat-no" title="statement not covered" >    let featureId = (service.options ? service.options.featureId : [])</span>
 <span class="cstat-no" title="statement not covered" >    // Support compound ID</span>
 <span class="cstat-no" title="statement not covered" >    featureId = (Array.isArray(featureId) ? featureId : [featureId])</span>
+<span class="cstat-no" title="statement not covered" >    const hasFeatureId = !_.isEmpty(featureId)</span>
 <span class="cstat-no" title="statement not covered" >    let featureIdType = (service.options ? service.options.featureIdType : [])</span>
 <span class="cstat-no" title="statement not covered" >    featureIdType = (Array.isArray(featureIdType) ? featureIdType : [featureIdType])</span>
-<span class="cstat-no" title="statement not covered" >    const ids = typeof query.$groupBy === 'string' // Group by matching ID(s), ie single ID or array of field to create a compound ID</span>
-<span class="cstat-no" title="statement not covered" >      ? { [query.$groupBy]: '$properties.' + query.$groupBy }</span>
-<span class="cstat-no" title="statement not covered" >    // Aggregated in an accumulator to avoid conflict with feature properties</span>
-<span class="cstat-no" title="statement not covered" >      : query.$groupBy.reduce((object, id) =&gt; Object.assign(object, { [id]: '$properties.' + id }), {})</span>
-<span class="cstat-no" title="statement not covered" >    const groupBy = { _id: ids }</span>
-<span class="cstat-no" title="statement not covered" >    let keys = _.keys(ids)</span>
+<span class="cstat-no" title="statement not covered" >    // Default is not to group by UUID</span>
+<span class="cstat-no" title="statement not covered" >    const groupBy = { _id: '$_id' }</span>
+<span class="cstat-no" title="statement not covered" >    let keys = ['_id']</span>
+<span class="cstat-no" title="statement not covered" >    if (query.$groupBy) {</span>
+<span class="cstat-no" title="statement not covered" >      groupBy._id = typeof query.$groupBy === 'string' // Group by matching ID(s), ie single ID or array of field to create a compound ID</span>
+<span class="cstat-no" title="statement not covered" >        ? { [query.$groupBy]: '$properties.' + query.$groupBy }</span>
+<span class="cstat-no" title="statement not covered" >      // Aggregated in an accumulator to avoid conflict with feature properties</span>
+<span class="cstat-no" title="statement not covered" >        : query.$groupBy.reduce((object, id) =&gt; Object.assign(object, { [id]: '$properties.' + id }), {})</span>
+<span class="cstat-no" title="statement not covered" >      keys = _.keys(groupBy._id)</span>
+<span class="cstat-no" title="statement not covered" >    }</span>
 <span class="cstat-no" title="statement not covered" >    // Do we only keep first or last available time ?</span>
 <span class="cstat-no" title="statement not covered" >    const singleTime = (_.toNumber(query.$limit) === 1)</span>
 <span class="cstat-no" title="statement not covered" >    if (singleTime) {</span>
 <span class="cstat-no" title="statement not covered" >      // When single time no aggregation is performed at all so we only have raw features</span>
-<span class="cstat-no" title="statement not covered" >      keys = keys.map(key =&gt; 'properties.' + key)</span>
+<span class="cstat-no" title="statement not covered" >      if (hasFeatureId) keys = keys.map(key =&gt; 'properties.' + key)</span>
 <span class="cstat-no" title="statement not covered" >      // In this case no need to aggregate on each element we simply keep the first feature</span>
 <span class="cstat-no" title="statement not covered" >      // BUG: according to https://jira.mongodb.org/browse/SERVER-9507 MongoDB is not yet</span>
 <span class="cstat-no" title="statement not covered" >      // able to optimize this kind of operations to avoid full index scan</span>
@@ -1184,6 +1189,8 @@
 <span class="cstat-no" title="statement not covered" >    // Ensure we do not mix results with/without relevant element values</span>
 <span class="cstat-no" title="statement not covered" >    // by separately querying each element then merging</span>
 <span class="cstat-no" title="statement not covered" >    let aggregatedResults</span>
+<span class="cstat-no" title="statement not covered" >    // Associative map used to optimize merging between aggregated elements</span>
+<span class="cstat-no" title="statement not covered" >    const aggregatedResultsMap = new Map()</span>
 <span class="cstat-no" title="statement not covered" >    const aggregateOptions = {</span>
 <span class="cstat-no" title="statement not covered" >      allowDiskUse: true</span>
 <span class="cstat-no" title="statement not covered" >    }</span>
@@ -1219,29 +1226,10 @@
 <span class="cstat-no" title="statement not covered" >      pipeline.forEach(stage =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >        _.forOwn(stage, (value, key) =&gt; debug('Stage', key, value))</span>
 <span class="cstat-no" title="statement not covered" >      })</span>
-<span class="cstat-no" title="statement not covered" >      // Provide a hint to the aggregation targeting feature ID and aggregation elements.</span>
-<span class="cstat-no" title="statement not covered" >      // The problem with the aggregation hint option is that it should correspond</span>
-<span class="cstat-no" title="statement not covered" >      // exactly to an existing index otherwise it raises an error.</span>
-<span class="cstat-no" title="statement not covered" >      // We use a convention to get the order right: geometry =&gt; feature ID =&gt; aggregated element =&gt; time.</span>
-<span class="cstat-no" title="statement not covered" >      // We check anyway if the index does exist to avoid any error</span>
-<span class="cstat-no" title="statement not covered" >      // FIXME: Instead of assuming the appropriate index is defined in the right order,</span>
-<span class="cstat-no" title="statement not covered" >      // we might select the "best" available index (ie having the most similarities with the required one).</span>
-<span class="cstat-no" title="statement not covered" >      const hint = {}</span>
-<span class="cstat-no" title="statement not covered" >      if (isGeometry || query.$geoNear || match.geometry) Object.assign(hint, { geometry: '2dsphere' })</span>
-<span class="cstat-no" title="statement not covered" >      featureId.forEach(id =&gt; {</span>
-<span class="cstat-no" title="statement not covered" >        hint['properties.' + id] = 1</span>
-<span class="cstat-no" title="statement not covered" >      })</span>
-<span class="cstat-no" title="statement not covered" >      Object.assign(hint, { ['properties.' + element]: 1 })</span>
-<span class="cstat-no" title="statement not covered" >      // Use provided sort time option if any</span>
-<span class="cstat-no" title="statement not covered" >      hint.time = _.get(query, '$sort.time', 1)</span>
-<span class="cstat-no" title="statement not covered" >      const hintIndexName = _.reduce(hint, (name, value, key) =&gt; name ? `${name}_${key}_${value}` : `${key}_${value}`, '')</span>
-<span class="cstat-no" title="statement not covered" >      debug('Best aggregation hint index found', hintIndexName)</span>
-<span class="cstat-no" title="statement not covered" >      const hintIndex = _.find(indexes, { name: hintIndexName })</span>
 <span class="cstat-no" title="statement not covered" >      const aggregateElementOptions = Object.assign({}, aggregateOptions)</span>
-<span class="cstat-no" title="statement not covered" >      if (hintIndex) aggregateElementOptions.hint = hintIndexName</span>
 <span class="cstat-no" title="statement not covered" >      debug('Aggregation options', aggregateElementOptions)</span>
 <span class="cstat-no" title="statement not covered" >      const elementResults = await collection.aggregate(pipeline, aggregateElementOptions).toArray()</span>
-<span class="cstat-no" title="statement not covered" >      debug(`Generated ${elementResults.length} feature(s) for ${element} element`, elementResults)</span>
+<span class="cstat-no" title="statement not covered" >      debug(`Generated ${elementResults.length} feature(s) for ${element} element, picked first two`, elementResults.slice(0,2))</span>
 <span class="cstat-no" title="statement not covered" >      // Rearrange data so that we get ordered arrays indexed by element</span>
 <span class="cstat-no" title="statement not covered" >      elementResults.forEach(result =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >        result.time = { [element]: result.time }</span>
@@ -1257,13 +1245,24 @@
 <span class="cstat-no" title="statement not covered" >      // Now merge with previous element results</span>
 <span class="cstat-no" title="statement not covered" >      if (!aggregatedResults) {</span>
 <span class="cstat-no" title="statement not covered" >        aggregatedResults = elementResults</span>
+<span class="cstat-no" title="statement not covered" >        aggregatedResults.forEach(result =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >          // Keep track of result in map to improve search later</span>
+<span class="cstat-no" title="statement not covered" >          const resultKeys = keys.map(key =&gt; _.get(singleTime ? result : result._id, key))</span>
+<span class="cstat-no" title="statement not covered" >          const resultKey = resultKeys.join('-')</span>
+<span class="cstat-no" title="statement not covered" >          aggregatedResultsMap.set(resultKey, result)</span>
+<span class="cstat-no" title="statement not covered" >        })</span>
 <span class="cstat-no" title="statement not covered" >      } else {</span>
 <span class="cstat-no" title="statement not covered" >        elementResults.forEach(result =&gt; {</span>
-<span class="cstat-no" title="statement not covered" >          const resultKeys = _.pick(result, keys)</span>
+<span class="cstat-no" title="statement not covered" >          // When single time no aggregation is performed at all so we only have raw features</span>
+<span class="cstat-no" title="statement not covered" >          const resultKeys = keys.map(key =&gt; _.get(singleTime ? result : result._id, key))</span>
+<span class="cstat-no" title="statement not covered" >          /* Optimize previous result search with map, kept the naive code here for reference/debug purpose</span>
 <span class="cstat-no" title="statement not covered" >          const previousResult = aggregatedResults.find(aggregatedResult =&gt; {</span>
-<span class="cstat-no" title="statement not covered" >            const aggregatedResultKeys = _.pick(aggregatedResult, keys)</span>
+<span class="cstat-no" title="statement not covered" >            const aggregatedResultKeys = keys.map(key =&gt; _.get(singleTime ? result : result._id, key))</span>
 <span class="cstat-no" title="statement not covered" >            return _.isEqual(aggregatedResultKeys, resultKeys)</span>
 <span class="cstat-no" title="statement not covered" >          })</span>
+<span class="cstat-no" title="statement not covered" >          */</span>
+<span class="cstat-no" title="statement not covered" >          const resultKey = resultKeys.join('-')</span>
+<span class="cstat-no" title="statement not covered" >          const previousResult = aggregatedResultsMap.get(resultKey)</span>
 <span class="cstat-no" title="statement not covered" >          // Merge with previous matching feature if any</span>
 <span class="cstat-no" title="statement not covered" >          if (previousResult) {</span>
 <span class="cstat-no" title="statement not covered" >            Object.assign(previousResult.time, result.time)</span>
@@ -1274,6 +1273,7 @@
 <span class="cstat-no" title="statement not covered" >            _.set(previousResult, prefix + element, _.get(result, prefix + element))</span>
 <span class="cstat-no" title="statement not covered" >          } else {</span>
 <span class="cstat-no" title="statement not covered" >            aggregatedResults.push(result)</span>
+<span class="cstat-no" title="statement not covered" >            aggregatedResultsMap.set(resultKey, result)</span>
 <span class="cstat-no" title="statement not covered" >          }</span>
 <span class="cstat-no" title="statement not covered" >        })</span>
 <span class="cstat-no" title="statement not covered" >      }</span>
@@ -1283,7 +1283,7 @@
 <span class="cstat-no" title="statement not covered" >    delete query.$aggregate</span>
 <span class="cstat-no" title="statement not covered" >    delete query.$geoNear</span>
 <span class="cstat-no" title="statement not covered" >    // Set result to avoid service DB call</span>
-<span class="cstat-no" title="statement not covered" >    hook.result = aggregatedResults</span>
+<span class="cstat-no" title="statement not covered" >    hook.result = aggregatedResults || []</span>
 <span class="cstat-no" title="statement not covered" >  }</span>
 <span class="cstat-no" title="statement not covered" >  return hook</span>
 <span class="cstat-no" title="statement not covered" >}</span>
@@ -1294,7 +1294,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.843Z
+                at 2025-12-17T09:26:49.744Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/map/api/hooks/index.html

@@ -25,7 +25,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>0/639</span>
+                <span class='fraction'>0/686</span>
             </div>
         
             
@@ -46,7 +46,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>0/639</span>
+                <span class='fraction'>0/686</span>
             </div>
         
             
@@ -84,13 +84,13 @@
 	<div class="chart"><div class="cover-fill" style="width: 0%"></div><div class="cover-empty" style="width: 100%"></div></div>
 	</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="124" class="abs low">0/124</td>
+	<td data-value="171" class="abs low">0/171</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="1" class="abs low">0/1</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="1" class="abs low">0/1</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="124" class="abs low">0/124</td>
+	<td data-value="171" class="abs low">0/171</td>
 	</tr>
 
 <tr>
@@ -146,7 +146,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.843Z
+                at 2025-12-17T09:26:49.744Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/map/api/hooks/index.js.html

@@ -79,7 +79,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.843Z
+                at 2025-12-17T09:26:49.744Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/map/api/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.843Z
+                at 2025-12-17T09:26:49.744Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/map/api/index.js.html

@@ -124,7 +124,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.843Z
+                at 2025-12-17T09:26:49.744Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/map/api/marshall.js.html

@@ -163,7 +163,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.843Z
+                at 2025-12-17T09:26:49.744Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/map/api/models/alerts.model.mongodb.js.html

@@ -91,7 +91,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.843Z
+                at 2025-12-17T09:26:49.744Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>