merge mvt query

api/api.js

@@ -9,7 +9,6 @@ const auth = require('../mod/user/auth')
 const saml = process.env.SAML_ENTITY_ID && require('../mod/user/saml')
 
 const routes = {
-  mvt: require('../mod/mvt'),
   location: require('../mod/location/_location'),
   provider: require('../mod/provider/_provider'),
   query: require('../mod/query'),
@@ -172,11 +171,6 @@ module.exports = async (req, res) => {
     return login(req, res)
   }
 
-  // Layer route
-  if (req.url.match(/(?<=\/api\/layer)/)) {
-    return routes.mvt(req, res)
-  }
-
   // Location route
   if (req.url.match(/(?<=\/api\/location)/)) {
     return routes.location(req, res)

express.js

@@ -37,9 +37,6 @@ app.post(`${process.env.DIR||''}/api/fetch/:template?`, express.json({limit: '5m
 app.get(`${process.env.DIR||''}/api/workspace/:key?`, api)
 
 
-app.get(`${process.env.DIR||''}/api/layer/:format?/:z?/:x?/:y?`, api)
-
-
 app.get(`${process.env.DIR||''}/api/location/:method?`, api)
 
 app.post(`${process.env.DIR||''}/api/location/:method?`, express.json({limit: '5mb'}), api)

lib/layer/Style.mjs

@@ -10,9 +10,13 @@ export default layer => {
 
   return function Style(feature) {
 
-    // Check for and return existing Styles object.
-    const Styles = feature.get('Styles')
-    if (Styles) return Styles
+    if (layer.style.cache !== null) {
+
+      // Check for and return existing Styles object.
+      const Styles = feature.get('Styles')
+
+      if (Styles) return Styles
+    }
 
     feature.properties = feature.getProperties()
 

lib/layer/format/mvt.mjs

@@ -6,6 +6,17 @@ export default layer => {
   // Assign empty style object if nullish.
   layer.style ??= {}
 
+  // Set default layer params if nullish.
+  layer.params ??= {}
+
+  if (layer.mvt_cache) {
+
+    console.warn(`Layer ${layer.key} mvt_cache has been disabled.`)
+  }
+
+  // MVT query must not have a viewport, this is defined by the tile extent.
+  delete layer.params.viewport
+
   layer.reload = () => {
 
     layer.source.clear()
@@ -42,13 +53,26 @@ export default layer => {
 
     if ((!tableZ || !layer.display) && !layer.clones?.size) return layer.source.clear()
 
-    const url = `${layer.mapview.host}/api/layer/mvt/${tileCoord[0]}/${tileCoord[1]}/${tileCoord[2]}?` + mapp.utils.paramString({
+    // Create a set of feature properties for styling.
+    layer.params.fields = [...new Set([
+      Array.isArray(layer.style.theme?.fields) ?
+        layer.style.theme.fields : layer.style.theme?.field,
+      layer.style.theme?.field,
+      layer.style.label?.field
+    ].flat().filter(field => !!field))]
+
+    const url = `${layer.mapview.host}/api/query?${mapp.utils.paramString({
+      template: 'mvt',
+      z: tileCoord[0],
+      x: tileCoord[1],
+      y: tileCoord[2],
       locale: layer.mapview.locale.key,
       layer: layer.key,
       srid: layer.mapview.srid,
       table: tableZ,
-      filter: layer.filter?.current
-    })
+      filter: layer.filter?.current,
+      ...layer.params
+    })}`
 
     return url
   }

lib/layer/format/vector.mjs

@@ -64,8 +64,8 @@ export default layer => {
 
     // Create a set of feature properties for styling.
     layer.params.fields = [...new Set([
-      // Array.isArray(layer.style.theme?.fields) ?
-      //   layer.style.theme.fields : layer.style.theme?.field,
+      Array.isArray(layer.style.theme?.fields) ?
+        layer.style.theme.fields : layer.style.theme?.field,
       layer.style.theme?.field,
       layer.style.label?.field,
       layer.cluster?.label

lib/location/decorate.mjs

@@ -8,7 +8,6 @@ export default location => {
     trash,
     update,
     syncFields,
-    mvt_cache,
     updateCallbacks: [],
   })
 
@@ -49,8 +48,6 @@ async function update() {
 
   if (!Object.keys(newValues).length) return;
 
-  await this.mvt_cache()
-
   await mapp.utils.xhr({
     method: 'POST',
     url:
@@ -65,8 +62,6 @@ async function update() {
     body: JSON.stringify(newValues),
   });
 
-  await this.mvt_cache()
-
   // Update entry.values with newValues.
   // Return dependents from updated entries.
   const dependents = this.infoj
@@ -127,30 +122,10 @@ function flyTo (maxZoom) {
   });
 }
 
-async function mvt_cache() {
-
-  if (!this.layer?.mvt_cache) return;
-
-  await mapp.utils.xhr(`${this.layer.mapview.host}/api/query?` +
-    mapp.utils.paramString({
-      template: 'mvt_cache_delete_intersects',
-      locale: this.layer.mapview.locale.key,
-      layer: this.layer.key,
-      mvt_cache: this.layer.mvt_cache,
-      table: this.table,
-      qID: this.layer.qID,
-      id: this.id,
-      geom: this.layer.geom
-    }))
-}
-
 async function trash() {
 
   if(!confirm(mapp.dictionary.confirm_delete)) return;
 
-  // Must clear cache before removing location from source.
-  await this.mvt_cache()
-
   await mapp.utils.xhr(`${this.layer.mapview.host}/api/query?` +
     mapp.utils.paramString({
       template: 'location_delete',

lib/location/get.mjs

@@ -65,8 +65,6 @@ export default async function (location, list = location.layer.mapview.locations
 
   mapp.location.decorate(Object.assign(location, { infoj }))
 
-  location.new && await location.mvt_cache()
-
   // Assign location to mapview.
   list[location.hook] = location
 

mod/query.js

@@ -231,9 +231,9 @@ module.exports = async (req, res) => {
   }
 
   if (req.params.value_only || template?.value_only) {
-
+    
     return res.send(Object.values(rows[0])[0])
-  }  
+  }
 
   // Send the infoj object with values back to the client.
   res.send(rows.length === 1 && rows[0] || rows)

mod/workspace/cache.js

@@ -29,13 +29,13 @@ module.exports = () => {
   return cache
 }
 
-const view_templates = require('./templates/views')
+const view_templates = require('./templates/_views')
 
-const mail_templates = require('./templates/mails')
+const mail_templates = require('./templates/_mails')
 
-const msg_templates = require('./templates/msgs')
+const msg_templates = require('./templates/_msgs')
 
-const query_templates = require('./templates/queries')
+const query_templates = require('./templates/_queries')
 
 async function cacheWorkspace() {