@kalisio/kdk 2.4.0 → 2.5.1

package/coverage/map/api/services/index.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/244</span>
+                <span class='fraction'>0/323</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/244</span>
+                <span class='fraction'>0/323</span>
             </div>
         
             
@@ -307,7 +307,165 @@
 <a name='L242'></a><a href='#L242'>242</a>
 <a name='L243'></a><a href='#L243'>243</a>
 <a name='L244'></a><a href='#L244'>244</a>
-<a name='L245'></a><a href='#L245'>245</a></td><td class="line-coverage quiet"><span class="cline-any cline-no">&nbsp;</span>
+<a name='L245'></a><a href='#L245'>245</a>
+<a name='L246'></a><a href='#L246'>246</a>
+<a name='L247'></a><a href='#L247'>247</a>
+<a name='L248'></a><a href='#L248'>248</a>
+<a name='L249'></a><a href='#L249'>249</a>
+<a name='L250'></a><a href='#L250'>250</a>
+<a name='L251'></a><a href='#L251'>251</a>
+<a name='L252'></a><a href='#L252'>252</a>
+<a name='L253'></a><a href='#L253'>253</a>
+<a name='L254'></a><a href='#L254'>254</a>
+<a name='L255'></a><a href='#L255'>255</a>
+<a name='L256'></a><a href='#L256'>256</a>
+<a name='L257'></a><a href='#L257'>257</a>
+<a name='L258'></a><a href='#L258'>258</a>
+<a name='L259'></a><a href='#L259'>259</a>
+<a name='L260'></a><a href='#L260'>260</a>
+<a name='L261'></a><a href='#L261'>261</a>
+<a name='L262'></a><a href='#L262'>262</a>
+<a name='L263'></a><a href='#L263'>263</a>
+<a name='L264'></a><a href='#L264'>264</a>
+<a name='L265'></a><a href='#L265'>265</a>
+<a name='L266'></a><a href='#L266'>266</a>
+<a name='L267'></a><a href='#L267'>267</a>
+<a name='L268'></a><a href='#L268'>268</a>
+<a name='L269'></a><a href='#L269'>269</a>
+<a name='L270'></a><a href='#L270'>270</a>
+<a name='L271'></a><a href='#L271'>271</a>
+<a name='L272'></a><a href='#L272'>272</a>
+<a name='L273'></a><a href='#L273'>273</a>
+<a name='L274'></a><a href='#L274'>274</a>
+<a name='L275'></a><a href='#L275'>275</a>
+<a name='L276'></a><a href='#L276'>276</a>
+<a name='L277'></a><a href='#L277'>277</a>
+<a name='L278'></a><a href='#L278'>278</a>
+<a name='L279'></a><a href='#L279'>279</a>
+<a name='L280'></a><a href='#L280'>280</a>
+<a name='L281'></a><a href='#L281'>281</a>
+<a name='L282'></a><a href='#L282'>282</a>
+<a name='L283'></a><a href='#L283'>283</a>
+<a name='L284'></a><a href='#L284'>284</a>
+<a name='L285'></a><a href='#L285'>285</a>
+<a name='L286'></a><a href='#L286'>286</a>
+<a name='L287'></a><a href='#L287'>287</a>
+<a name='L288'></a><a href='#L288'>288</a>
+<a name='L289'></a><a href='#L289'>289</a>
+<a name='L290'></a><a href='#L290'>290</a>
+<a name='L291'></a><a href='#L291'>291</a>
+<a name='L292'></a><a href='#L292'>292</a>
+<a name='L293'></a><a href='#L293'>293</a>
+<a name='L294'></a><a href='#L294'>294</a>
+<a name='L295'></a><a href='#L295'>295</a>
+<a name='L296'></a><a href='#L296'>296</a>
+<a name='L297'></a><a href='#L297'>297</a>
+<a name='L298'></a><a href='#L298'>298</a>
+<a name='L299'></a><a href='#L299'>299</a>
+<a name='L300'></a><a href='#L300'>300</a>
+<a name='L301'></a><a href='#L301'>301</a>
+<a name='L302'></a><a href='#L302'>302</a>
+<a name='L303'></a><a href='#L303'>303</a>
+<a name='L304'></a><a href='#L304'>304</a>
+<a name='L305'></a><a href='#L305'>305</a>
+<a name='L306'></a><a href='#L306'>306</a>
+<a name='L307'></a><a href='#L307'>307</a>
+<a name='L308'></a><a href='#L308'>308</a>
+<a name='L309'></a><a href='#L309'>309</a>
+<a name='L310'></a><a href='#L310'>310</a>
+<a name='L311'></a><a href='#L311'>311</a>
+<a name='L312'></a><a href='#L312'>312</a>
+<a name='L313'></a><a href='#L313'>313</a>
+<a name='L314'></a><a href='#L314'>314</a>
+<a name='L315'></a><a href='#L315'>315</a>
+<a name='L316'></a><a href='#L316'>316</a>
+<a name='L317'></a><a href='#L317'>317</a>
+<a name='L318'></a><a href='#L318'>318</a>
+<a name='L319'></a><a href='#L319'>319</a>
+<a name='L320'></a><a href='#L320'>320</a>
+<a name='L321'></a><a href='#L321'>321</a>
+<a name='L322'></a><a href='#L322'>322</a>
+<a name='L323'></a><a href='#L323'>323</a>
+<a name='L324'></a><a href='#L324'>324</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>
+<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>
+<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>
@@ -570,7 +728,7 @@
 <span class="cstat-no" title="statement not covered" >  const app = this</span>
 <span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >  debug('Creating features service with options', options)</span>
-<span class="cstat-no" title="statement not covered" >  return app.createService(options.collection, Object.assign({</span>
+<span class="cstat-no" title="statement not covered" >  const service = app.createService(options.collection, Object.assign({</span>
 <span class="cstat-no" title="statement not covered" >    modelName: 'features',</span>
 <span class="cstat-no" title="statement not covered" >    servicesPath,</span>
 <span class="cstat-no" title="statement not covered" >    modelsPath,</span>
@@ -578,28 +736,46 @@
 <span class="cstat-no" title="statement not covered" >    // FIXME: no real-time events for now since we create big batches,</span>
 <span class="cstat-no" title="statement not covered" >    // does not seem to be sufficient also require a hook (see https://github.com/feathersjs/feathers/issues/922)</span>
 <span class="cstat-no" title="statement not covered" >    events: ['features'],</span>
-<span class="cstat-no" title="statement not covered" >    methods: ['find', 'get', 'create', 'update', 'patch', 'remove', 'heatmap']</span>
+<span class="cstat-no" title="statement not covered" >    methods: ['find', 'get', 'create', 'update', 'patch', 'remove', 'heatmap', 'formatGeoJSON']</span>
 <span class="cstat-no" title="statement not covered" >  }, options))</span>
+<span class="cstat-no" title="statement not covered" >  // As a features service can be created dynamically register default permissions for it</span>
+<span class="cstat-no" title="statement not covered" >  permissions.defineAbilities.registerHook((subject, can, cannot) =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >    can('service', options.collection)</span>
+<span class="cstat-no" title="statement not covered" >    can('read', options.collection)</span>
+<span class="cstat-no" title="statement not covered" >  })</span>
+<span class="cstat-no" title="statement not covered" >  // We then need to update abilities cache</span>
+<span class="cstat-no" title="statement not covered" >  const authorisationService = app.getService('authorisations')</span>
+<span class="cstat-no" title="statement not covered" >  if (authorisationService) authorisationService.clearAbilities()</span>
+<span class="cstat-no" title="statement not covered" >  return service</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 removeFeaturesService (options = {}) {</span>
 <span class="cstat-no" title="statement not covered" >  const app = this</span>
+<span class="cstat-no" title="statement not covered" >  debug('Removing features service with options', options)</span>
 <span class="cstat-no" title="statement not covered" >  return app.removeService(app.getService(options.collection, options.context))</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 createCatalogService (options = {}) {</span>
 <span class="cstat-no" title="statement not covered" >  const app = this</span>
 <span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >  // Read default categories/sublegends config, which can be overriden by options</span>
+<span class="cstat-no" title="statement not covered" >  const catalogConfig = app.get('catalog') || {}</span>
+<span class="cstat-no" title="statement not covered" >  const categories = catalogConfig.categories</span>
+<span class="cstat-no" title="statement not covered" >  const sublegends = catalogConfig.sublegends</span>
+<span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >  debug('Creating catalog service with options', options)</span>
 <span class="cstat-no" title="statement not covered" >  return app.createService('catalog', Object.assign({</span>
 <span class="cstat-no" title="statement not covered" >    servicesPath,</span>
 <span class="cstat-no" title="statement not covered" >    modelsPath,</span>
-<span class="cstat-no" title="statement not covered" >    paginate: { default: 1000, max: 1000 }</span>
+<span class="cstat-no" title="statement not covered" >    paginate: { default: 1000, max: 1000 },</span>
+<span class="cstat-no" title="statement not covered" >    categories,</span>
+<span class="cstat-no" title="statement not covered" >    sublegends</span>
 <span class="cstat-no" title="statement not covered" >  }, options))</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 removeCatalogService (options = {}) {</span>
 <span class="cstat-no" title="statement not covered" >  const app = this</span>
+<span class="cstat-no" title="statement not covered" >  debug('Removing catalog service with options', options)</span>
 <span class="cstat-no" title="statement not covered" >  return app.removeService(app.getService('catalog', options.context))</span>
 <span class="cstat-no" title="statement not covered" >}</span>
 <span class="cstat-no" title="statement not covered" ></span>
@@ -616,6 +792,7 @@
 <span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >export function removeProjectsService (options = {}) {</span>
 <span class="cstat-no" title="statement not covered" >  const app = this</span>
+<span class="cstat-no" title="statement not covered" >  debug('Removing projects service with options', options)</span>
 <span class="cstat-no" title="statement not covered" >  return app.removeService(app.getService('projects', options.context))</span>
 <span class="cstat-no" title="statement not covered" >}</span>
 <span class="cstat-no" title="statement not covered" ></span>
@@ -633,81 +810,107 @@
 <span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >export function removeAlertsService (options = {}) {</span>
 <span class="cstat-no" title="statement not covered" >  const app = this</span>
+<span class="cstat-no" title="statement not covered" >  debug('Removing alerts service with options', options)</span>
 <span class="cstat-no" title="statement not covered" >  return app.removeService(app.getService('alerts', options.context))</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" >// Helper to register service and permissions for a layer</span>
-<span class="cstat-no" title="statement not covered" >export async function createFeaturesServiceForLayer (options) {</span>
+<span class="cstat-no" title="statement not covered" >export async function createFeaturesServiceForLayer (layer, context) {</span>
 <span class="cstat-no" title="statement not covered" >  const app = this</span>
-<span class="cstat-no" title="statement not covered" >  const service = await createFeaturesService.call(app, options)</span>
-<span class="cstat-no" title="statement not covered" >  // Register default permissions for it</span>
-<span class="cstat-no" title="statement not covered" >  permissions.defineAbilities.registerHook((subject, can, cannot) =&gt; {</span>
-<span class="cstat-no" title="statement not covered" >    can('service', options.collection)</span>
-<span class="cstat-no" title="statement not covered" >    can('read', options.collection)</span>
-<span class="cstat-no" title="statement not covered" >  })</span>
-<span class="cstat-no" title="statement not covered" >  return service</span>
+<span class="cstat-no" title="statement not covered" >  // Check if service(s) are associated to this layer</span>
+<span class="cstat-no" title="statement not covered" >  // Avoid create it twice as we can share services between different layers</span>
+<span class="cstat-no" title="statement not covered" >  let probeService = (layer.probeService ? app.getService(layer.probeService, context) : null)</span>
+<span class="cstat-no" title="statement not covered" >  if (layer.probeService &amp;&amp; !probeService) {</span>
+<span class="cstat-no" title="statement not covered" >    probeService = await createFeaturesService.call(app, Object.assign({</span>
+<span class="cstat-no" title="statement not covered" >      collection: layer.probeService,</span>
+<span class="cstat-no" title="statement not covered" >      context,</span>
+<span class="cstat-no" title="statement not covered" >      db: app.db.db(layer.dbName)</span>
+<span class="cstat-no" title="statement not covered" >    }, _.pick(layer, ['featureLabel', 'simplifyResult', 'skipEvents', 'simplifyEvents'])))</span>
+<span class="cstat-no" title="statement not covered" >  }</span>
+<span class="cstat-no" title="statement not covered" >  let service = (layer.service ? app.getService(layer.service, context) : null)</span>
+<span class="cstat-no" title="statement not covered" >  if (layer.service &amp;&amp; !service) {</span>
+<span class="cstat-no" title="statement not covered" >    service = await createFeaturesService.call(app, Object.assign({</span>
+<span class="cstat-no" title="statement not covered" >      collection: layer.service,</span>
+<span class="cstat-no" title="statement not covered" >      context,</span>
+<span class="cstat-no" title="statement not covered" >      db: app.db.db(layer.dbName)</span>
+<span class="cstat-no" title="statement not covered" >    }, _.pick(layer, ['ttl', 'featureId', 'featureIdType', 'featureLabel', 'variables', 'simplifyResult', 'skipEvents', 'simplifyEvents'])))</span>
+<span class="cstat-no" title="statement not covered" >  }</span>
+<span class="cstat-no" title="statement not covered" >  return service || probeService</span>
+<span class="cstat-no" title="statement not covered" >}</span>
+<span class="cstat-no" title="statement not covered" >// Helper to unregister service for a layer</span>
+<span class="cstat-no" title="statement not covered" >export async function removeFeaturesServiceForLayer (layer, context) {</span>
+<span class="cstat-no" title="statement not covered" >  const app = this</span>
+<span class="cstat-no" title="statement not covered" >  // Check if service(s) are associated to this layer and remove it</span>
+<span class="cstat-no" title="statement not covered" >  let probeService = (layer.probeService ? app.getService(layer.probeService, context) : null)</span>
+<span class="cstat-no" title="statement not covered" >  if (layer.probeService &amp;&amp; probeService) {</span>
+<span class="cstat-no" title="statement not covered" >    probeService = await removeFeaturesService.call(app, { collection: layer.probeService, context })</span>
+<span class="cstat-no" title="statement not covered" >  }</span>
+<span class="cstat-no" title="statement not covered" >  let service = (layer.service ? app.getService(layer.service, context) : null)</span>
+<span class="cstat-no" title="statement not covered" >  if (layer.service &amp;&amp; service) {</span>
+<span class="cstat-no" title="statement not covered" >    service = await removeFeaturesService.call(app, { collection: layer.service, context })</span>
+<span class="cstat-no" title="statement not covered" >  }</span>
+<span class="cstat-no" title="statement not covered" >  return service || probeService</span>
 <span class="cstat-no" title="statement not covered" >}</span>
 <span class="cstat-no" title="statement not covered" >// Helper to create features from source for a layer</span>
-<span class="cstat-no" title="statement not covered" >export async function createFeaturesForLayer (features, layer, options) {</span>
+<span class="cstat-no" title="statement not covered" >export async function createFeaturesForLayer (features, layer, options = {}) {</span>
 <span class="cstat-no" title="statement not covered" >  const app = this</span>
-<span class="cstat-no" title="statement not covered" >  const featuresService = app.getService(layer.service)</span>
+<span class="cstat-no" title="statement not covered" >  const featuresService = app.getService(layer.service, options.context)</span>
 <span class="cstat-no" title="statement not covered" >  if (options &amp;&amp; options.filter) features = await options.filter(features, layer, app)</span>
+<span class="cstat-no" title="statement not covered" >  // User-defined layers requires layer ID</span>
+<span class="cstat-no" title="statement not covered" >  if (layer.service === 'features') {</span>
+<span class="cstat-no" title="statement not covered" >    features.forEach(feature =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >      feature.layer = layer._id</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 (!features.length) return</span>
 <span class="cstat-no" title="statement not covered" >  // The unordered option ensure a faster processing when inserting multiple items</span>
 <span class="cstat-no" title="statement not covered" >  // and that after an error remaining write operations in the queue will continue anyway</span>
 <span class="cstat-no" title="statement not covered" >  await featuresService.create(features, { mongodb: { ordered: false } })</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 async function createDefaultCatalogLayers (options) {</span>
+<span class="cstat-no" title="statement not covered" >// Read default layers configured and create, if not found in DB, or update it accordingly</span>
+<span class="cstat-no" title="statement not covered" >// Will also clean and feed default data (ie features) if provided as input file</span>
+<span class="cstat-no" title="statement not covered" >export async function createDefaultCatalogLayers (options = {}) {</span>
 <span class="cstat-no" title="statement not covered" >  const app = this</span>
-<span class="cstat-no" title="statement not covered" >  // Backward compatibility when the sole possible option was a context</span>
-<span class="cstat-no" title="statement not covered" >  let context</span>
-<span class="cstat-no" title="statement not covered" >  if (typeof options === 'object') {</span>
-<span class="cstat-no" title="statement not covered" >    if (options.context) context = options.context</span>
-<span class="cstat-no" title="statement not covered" >    else if (options._id) context = options</span>
-<span class="cstat-no" title="statement not covered" >  } else if (typeof options === 'string') context = options</span>
-<span class="cstat-no" title="statement not covered" >  const catalogService = app.getService('catalog', context)</span>
+<span class="cstat-no" title="statement not covered" >  const catalogService = app.getService('catalog', options.context)</span>
 <span class="cstat-no" title="statement not covered" >  const catalog = app.get('catalog')</span>
 <span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >  const defaultLayers = catalog ? catalog.layers || [] : []</span>
 <span class="cstat-no" title="statement not covered" >  const layers = await catalogService.find({ query: {}, paginate: false })</span>
 <span class="cstat-no" title="statement not covered" >  for (let i = 0; i &lt; defaultLayers.length; i++) {</span>
 <span class="cstat-no" title="statement not covered" >    const defaultLayer = defaultLayers[i]</span>
-<span class="cstat-no" title="statement not covered" >    const createdLayer = _.find(layers, { name: defaultLayer.name })</span>
+<span class="cstat-no" title="statement not covered" >    let createdLayer = _.find(layers, { name: defaultLayer.name })</span>
+<span class="cstat-no" title="statement not covered" >    const isLayerAlreadyCreated = !_.isNil(createdLayer)</span>
+<span class="cstat-no" title="statement not covered" >    let featuresService</span>
 <span class="cstat-no" title="statement not covered" >    try {</span>
+<span class="cstat-no" title="statement not covered" >      // Used to filter properties only used to initialize a layer and related data</span>
+<span class="cstat-no" title="statement not covered" >      const reservedProperties = ['filter', 'url', 'fileName', 'forceDataUpdate']</span>
 <span class="cstat-no" title="statement not covered" >      // Create or update the layer removing any option only used to manage layer setup</span>
-<span class="cstat-no" title="statement not covered" >      if (!createdLayer) {</span>
+<span class="cstat-no" title="statement not covered" >      if (!isLayerAlreadyCreated) {</span>
 <span class="cstat-no" title="statement not covered" >        app.logger.info('Adding default layer (name = ' + defaultLayer.name + ')')</span>
-<span class="cstat-no" title="statement not covered" >        await catalogService.create(_.omit(defaultLayer, ['filter']))</span>
+<span class="cstat-no" title="statement not covered" >        createdLayer = await catalogService.create(_.omit(defaultLayer, reservedProperties))</span>
 <span class="cstat-no" title="statement not covered" >      } else {</span>
 <span class="cstat-no" title="statement not covered" >        app.logger.info('Updating default layer (name = ' + defaultLayer.name + ')')</span>
-<span class="cstat-no" title="statement not covered" >        await catalogService.update(createdLayer._id, _.omit(defaultLayer, ['filter']))</span>
+<span class="cstat-no" title="statement not covered" >        createdLayer = await catalogService.update(createdLayer._id, _.omit(defaultLayer, reservedProperties))</span>
+<span class="cstat-no" title="statement not covered" >      }</span>
+<span class="cstat-no" title="statement not covered" >      // Features creation might require the layer ID</span>
+<span class="cstat-no" title="statement not covered" >      defaultLayer._id = createdLayer._id</span>
+<span class="cstat-no" title="statement not covered" >      // Check if service(s) are associated to this layer and create the related service(s) if required</span>
+<span class="cstat-no" title="statement not covered" >      if (defaultLayer.service) {</span>
+<span class="cstat-no" title="statement not covered" >        featuresService = app.getService(defaultLayer.service)</span>
+<span class="cstat-no" title="statement not covered" >        // Avoid create it twice as we can share services between different layers</span>
+<span class="cstat-no" title="statement not covered" >        featuresService = await createFeaturesServiceForLayer.call(app, defaultLayer, options.context)</span>
 <span class="cstat-no" title="statement not covered" >      }</span>
 <span class="cstat-no" title="statement not covered" >    } catch (error) {</span>
 <span class="cstat-no" title="statement not covered" >      console.error(error)</span>
 <span class="cstat-no" title="statement not covered" >    }</span>
-<span class="cstat-no" title="statement not covered" >    // Check if service(s) are associated to this layer</span>
-<span class="cstat-no" title="statement not covered" >    let featuresService</span>
-<span class="cstat-no" title="statement not covered" >    if (defaultLayer.service) {</span>
-<span class="cstat-no" title="statement not covered" >      featuresService = app.getService(defaultLayer.service)</span>
-<span class="cstat-no" title="statement not covered" >      // Avoid create it twice as we can share services between different layers</span>
-<span class="cstat-no" title="statement not covered" >      if (featuresService) continue</span>
-<span class="cstat-no" title="statement not covered" >      featuresService = await createFeaturesServiceForLayer.call(app, Object.assign({</span>
-<span class="cstat-no" title="statement not covered" >        collection: defaultLayer.service,</span>
-<span class="cstat-no" title="statement not covered" >        db: app.db.db(defaultLayer.dbName)</span>
-<span class="cstat-no" title="statement not covered" >      }, _.pick(defaultLayer, ['ttl', 'featureId', 'featureIdType', 'featureLabel', 'variables', 'simplifyResult', 'skipEvents', 'simplifyEvents'])))</span>
-<span class="cstat-no" title="statement not covered" >    }</span>
-<span class="cstat-no" title="statement not covered" >    if (defaultLayer.probeService) {</span>
-<span class="cstat-no" title="statement not covered" >      await createFeaturesServiceForLayer.call(app, Object.assign({</span>
-<span class="cstat-no" title="statement not covered" >        collection: defaultLayer.probeService,</span>
-<span class="cstat-no" title="statement not covered" >        db: app.db.db(defaultLayer.dbName)</span>
-<span class="cstat-no" title="statement not covered" >      }, _.pick(defaultLayer, ['featureLabel', 'simplifyResult', 'skipEvents', 'simplifyEvents'])))</span>
-<span class="cstat-no" title="statement not covered" >    }</span>
 <span class="cstat-no" title="statement not covered" >    // And if we need to initialize some data as well</span>
-<span class="cstat-no" title="statement not covered" >    if (!createdLayer &amp;&amp; featuresService &amp;&amp; (defaultLayer.url || defaultLayer.fileName)) {</span>
+<span class="cstat-no" title="statement not covered" >    if ((!isLayerAlreadyCreated || defaultLayer.forceDataUpdate) &amp;&amp; featuresService &amp;&amp; (defaultLayer.url || defaultLayer.fileName)) {</span>
+<span class="cstat-no" title="statement not covered" >      app.logger.info('Updating data for default layer (name = ' + defaultLayer.name + ')')</span>
 <span class="cstat-no" title="statement not covered" >      // Cleanup</span>
 <span class="cstat-no" title="statement not covered" >      try {</span>
-<span class="cstat-no" title="statement not covered" >        await featuresService.remove(null, { query: {} })</span>
+<span class="cstat-no" title="statement not covered" >        // Keep track of user-created content for editable layer, ie features having a layer ID</span>
+<span class="cstat-no" title="statement not covered" >        await featuresService.remove(null, { query: { layer: { $exists: false } } })</span>
 <span class="cstat-no" title="statement not covered" >      } catch (error) {</span>
 <span class="cstat-no" title="statement not covered" >        console.error(error)</span>
 <span class="cstat-no" title="statement not covered" >      }</span>
@@ -725,9 +928,15 @@
 <span class="cstat-no" title="statement not covered" >          .pipe(zlib.createGunzip())</span>
 <span class="cstat-no" title="statement not covered" >          .pipe(fs.createWriteStream(extractedFileName))</span>
 <span class="cstat-no" title="statement not covered" >          .on('close', async () =&gt; {</span>
-<span class="cstat-no" title="statement not covered" >            const geojson = fs.readJsonSync(extractedFileName)</span>
+<span class="cstat-no" title="statement not covered" >            let geojson = fs.readJsonSync(extractedFileName)</span>
+<span class="cstat-no" title="statement not covered" >            // We allow GeoJson collection or features array</span>
+<span class="cstat-no" title="statement not covered" >            geojson = Array.isArray(geojson) ? geojson : geojson.features</span>
+<span class="cstat-no" title="statement not covered" >            // We also allow for data exported from MongoDB, in this case remove any Mongo specific ID</span>
+<span class="cstat-no" title="statement not covered" >            geojson.forEach(feature =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >              delete feature._id</span>
+<span class="cstat-no" title="statement not covered" >            })</span>
 <span class="cstat-no" title="statement not covered" >            try {</span>
-<span class="cstat-no" title="statement not covered" >              await createFeaturesForLayer.call(app, geojson.features, defaultLayer, options)</span>
+<span class="cstat-no" title="statement not covered" >              await createFeaturesForLayer.call(app, geojson, defaultLayer, options)</span>
 <span class="cstat-no" title="statement not covered" >            } catch (error) {</span>
 <span class="cstat-no" title="statement not covered" >              console.error(error)</span>
 <span class="cstat-no" title="statement not covered" >            }</span>
@@ -745,6 +954,29 @@
 <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" >// Create the required features services for layers found in catalog</span>
+<span class="cstat-no" title="statement not covered" >export async function createCatalogFeaturesServices (options = {}) {</span>
+<span class="cstat-no" title="statement not covered" >  const app = this</span>
+<span class="cstat-no" title="statement not covered" >  const catalogService = app.getService('catalog', options.context)</span>
+<span class="cstat-no" title="statement not covered" >  const layers = await catalogService.find({ query: { service: { $exists: true } }, paginate: false, $select: ['service'] })</span>
+<span class="cstat-no" title="statement not covered" >  for (let i = 0; i &lt; layers.length; i++) {</span>
+<span class="cstat-no" title="statement not covered" >    await createFeaturesServiceForLayer.call(app, layers[i], options.context)</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" >export function createStylesService (options = {}) {</span>
+<span class="cstat-no" title="statement not covered" >  const app = this</span>
+<span class="cstat-no" title="statement not covered" >  return app.createService('styles', Object.assign({</span>
+<span class="cstat-no" title="statement not covered" >    servicesPath,</span>
+<span class="cstat-no" title="statement not covered" >    modelsPath</span>
+<span class="cstat-no" title="statement not covered" >  }, options))</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 removeStylesService (options = {}) {</span>
+<span class="cstat-no" title="statement not covered" >  const app = this</span>
+<span class="cstat-no" title="statement not covered" >  return app.removeService(app.getService('styles', options.context))</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 default async function () {</span>
 <span class="cstat-no" title="statement not covered" >  const app = this</span>
 <span class="cstat-no" title="statement not covered" ></span>
@@ -768,6 +1000,11 @@
 <span class="cstat-no" title="statement not covered" >  if (alertsConfig) {</span>
 <span class="cstat-no" title="statement not covered" >    await createAlertsService.call(app)</span>
 <span class="cstat-no" title="statement not covered" >  }</span>
+<span class="cstat-no" title="statement not covered" >  const stylesConfig = app.get('styles')</span>
+<span class="cstat-no" title="statement not covered" >  if (stylesConfig) {</span>
+<span class="cstat-no" title="statement not covered" >    await createStylesService.call(app)</span>
+<span class="cstat-no" title="statement not covered" >    debug('\'styles\' service created')</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" >  app.createService('daptiles', Object.assign({</span>
@@ -802,7 +1039,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-11-15T21:05:45.905Z
+                at 2025-05-21T12:01:19.803Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/map/api/services/projects/index.html

@@ -101,7 +101,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-11-15T21:05:45.905Z
+                at 2025-05-21T12:01:19.803Z
             </div>
         <script src="../../../../prettify.js"></script>
         <script>

package/coverage/map/api/services/projects/projects.hooks.js.html

@@ -424,7 +424,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-11-15T21:05:45.905Z
+                at 2025-05-21T12:01:19.803Z
             </div>
         <script src="../../../../prettify.js"></script>
         <script>