Remove grid format, mod, and legend; optional layer qid; vector format viewport; featureFormats util & theme.field_stats

lib/layer/format/_format.mjs

@@ -10,15 +10,12 @@ import cluster from './cluster.mjs'
 
 import vector from './vector.mjs'
 
-import grid from './grid.mjs'
-
 export default {
   mbtiles,
   maplibre,
   tiles,
   mvt,
   cluster,
   geojson: vector,
-  wkt: vector,
-  grid
+  wkt: vector
 }

lib/layer/format/vector.mjs

@@ -1,47 +1,3 @@
-const formatFeatures = {
-  geojson,
-  wkt
-}
-
-const formatGeojson = new ol.format.GeoJSON
-
-const formatWKT = new ol.format.WKT
-
-function geojson(layer, features) {
-
-  return features.map((f) =>
-    new ol.Feature({
-      id: f.id,
-      geometry: formatGeojson.readGeometry(f.geometry, {
-        dataProjection: 'EPSG:' + layer.srid,
-        featureProjection: 'EPSG:' + layer.mapview.srid,
-      }),
-      properties: f.properties
-    }))
-}
-
-function wkt(layer, features) {
-
-  return features.map((r) => {
-
-    const properties = {}
-
-    // Assign field key and value to properties object
-    layer.fields.forEach((k, i) => properties[k] = r[i + 2])
-
-    // Return feature from geometry with properties.
-    return new ol.Feature({
-      id: r.shift(),
-      geometry: formatWKT.readGeometry(r.shift(), {
-        dataProjection: 'EPSG:' + layer.srid,
-        featureProjection: 'EPSG:' + layer.mapview.srid,
-      }),
-      properties
-    })
-
-  })
-}
-
 export default layer => {
 
   if (layer.properties) {
@@ -59,7 +15,7 @@ export default layer => {
     if (!features) return;
 
     let source = new ol.source.Vector({
-      features: formatFeatures[layer.format](layer, [features].flat())
+      features: mapp.utils.featureFormats[layer.format](layer, [features].flat())
     })
 
     // Geojson is a cluster layer.
@@ -84,21 +40,31 @@ export default layer => {
     // Do not reload the layer if features have been assigned.
     if (layer.features) return;
 
+    const table = layer.tableCurrent()
+
+    if (!table) return;
+
     // Create a set of feature properties for styling.
     layer.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,
       layer.cluster?.label
-    ].filter(field => !!field))]
+    ].flat().filter(field => !!field))]
+
+    // Assign current viewport if not falsy.
+    layer.viewport = layer.viewport && layer.mapview.getBounds();
 
     mapp.utils.xhr(
       `${layer.mapview.host}/api/query?${mapp.utils.paramString({
           template: layer.queryTemplate || layer.format,
           locale: layer.mapview.locale.key,
           layer: layer.key,
-          table: layer.table,
+          table,
           filter: layer.filter?.current,
-          fields: layer.fields
+          fields: layer.fields,
+          viewport: typeof layer.viewport === 'object' && [layer.viewport.west, layer.viewport.south, layer.viewport.east, layer.viewport.north, layer.mapview.srid],
         })}`)
         .then(layer.setSource)
 
@@ -113,9 +79,24 @@ export default layer => {
 
   layer.setSource(layer.features)
 
+  let changeEndTimeout;
+
+  // Add event listener to reload layer for viewport on changeEnd.
+  layer.viewport && layer.mapview.Map.getTargetElement().addEventListener('changeEnd', ()=>{
+
+    if (!layer.display) return;
+
+    clearTimeout(changeEndTimeout)
+
+    changeEndTimeout = setTimeout(layer.reload, 100)
+  })
+
   // Change method for the cluster feature properties and layer stats.
   layer.L.on('change', e => {
 
+    // To prevent layer.L.change() from crashing if called before data is loaded.
+    if (!layer.cluster.source) return;
+
     if (!layer.cluster?.distance) return;
 
     delete layer.max_size;

lib/ui/layers/_layers.mjs

@@ -27,8 +27,6 @@ import distributed from './legends/distributed.mjs'
 
 import graduated from './legends/graduated.mjs'
 
-import grid from './legends/grid.mjs'
-
 import basic from './legends/basic.mjs'
 
 export default {
@@ -48,7 +46,6 @@ export default {
     categorized,
     distributed,
     graduated,
-    grid,
     basic,
   },
   styles: {