bajo-spatial 2.0.1 → 2.2.0

package/extend/bajo/hook/dobo@before-find-record.js

@@ -0,0 +1,10 @@
+const beforeFindRecord = {
+  level: 1001,
+  handler: async function (modelName, filter, options) {
+    if (!filter.bbox || !this.app.dobo) return
+    const model = this.app.dobo.getModel(modelName)
+    filter.query = await this.buildBboxQuery({ bbox: filter.bbox, query: filter.query, model, options })
+  }
+}
+
+export default beforeFindRecord

package/index.js

@@ -1,5 +1,3 @@
-import anekaSpatial from 'aneka-spatial/index.js'
-
 /**
  * Plugin factory
  *
@@ -14,18 +12,15 @@ async function factory (pkgName) {
    *
    * @class
    */
-  class BajoSpatial extends this.app.pluginClass.base {
-    static alias = 'spatial'
-
+  class BajoSpatial extends this.app.baseClass.Base {
     constructor () {
       super(pkgName, me.app)
       this.config = {}
-      this.app.lib.anekaSpatial = anekaSpatial
     }
 
-    buildBboxQuery = async ({ bbox, query, schema, options = {} } = {}) => {
+    buildBboxQuery = async ({ bbox, query = {}, model, options = {} } = {}) => {
       const { merge, isEmpty } = this.app.lib._
-      const props = schema.properties.map(item => item.name)
+      const props = model.properties.map(item => item.name)
       const { bboxLatField = 'lat', bboxLngField = 'lng' } = options
       if (props.includes(bboxLatField) && props.includes(bboxLngField)) {
         const [minx, miny, maxx, maxy] = await this.parseBbox(bbox)
@@ -34,9 +29,14 @@ async function factory (pkgName) {
         q[bboxLatField] = { $gte: miny, $lte: maxy }
         if (isEmpty(query)) query = q
         else {
-          const $or = query.$or
-          if ($or) query = merge(q, { $or })
-          else merge(query, q)
+          if (query.$and) {
+            query.$and.push(q)
+          } else if (query.$or) {
+            const old = query.$or
+            query = { $and: [old, q] }
+          } else {
+            merge(query, q)
+          }
         }
       }
       return query
@@ -46,8 +46,8 @@ async function factory (pkgName) {
       item = item + ''
       if (item.includes(',')) return
       if (!this.app.bajoCommonDb || !this.app.dobo) return
-      const { recordGet } = this.app.dobo
-      const country = await recordGet('CdbCountry', item, { thrownNotFound: false })
+      const model = this.app.dobo.getModel('CdbCountry')
+      const country = await model.getRecord(item, { throwNotFound: false })
       if (country) return country.bbox
       throw this.error('Invalid country bbox \'%s\'', item, { statusCode: 400 })
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo-spatial",
-  "version": "2.0.1",
+  "version": "2.2.0",
   "description": "Spatial functions for Bajo Framework",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,8 @@
   },
   "type": "module",
   "bajo": {
-    "type": "plugin"
+    "type": "plugin",
+    "alias": "spatial"
   },
   "repository": {
     "type": "git",
@@ -28,7 +29,7 @@
   },
   "homepage": "https://github.com/ardhi/bajo-spatial#readme",
   "dependencies": {
-    "@turf/turf": "^7.2.0",
+    "@turf/turf": "^7.3.1",
     "aneka-spatial": "^0.0.4",
     "geolib": "^3.3.4"
   },

package/wiki/CHANGES.md

@@ -0,0 +1,5 @@
+# Changes
+
+## 2026-01-07
+
+- [2.2.0] Ported to match ```bajo@2.2.x``` specs

package/extend/bajo/hook/dobo@before-record-find.js

@@ -1,11 +0,0 @@
-const beforeRecordFind = {
-  level: 1001,
-  handler: async function (name, filter, options) {
-    if (!filter.bbox) return
-    const { getSchema } = this.app.dobo
-    const schema = getSchema(name)
-    filter.query = await this.buildBboxQuery({ bbox: filter.bbox, query: filter.query, schema, options })
-  }
-}
-
-export default beforeRecordFind