bajo-spatial 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo-spatial",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Spatial functions for Bajo Framework",
   "main": "index.js",
   "scripts": {
@@ -25,6 +25,7 @@
   "homepage": "https://github.com/ardhi/bajo-spatial#readme",
   "dependencies": {
     "@turf/turf": "^7.2.0",
+    "aneka-spatial": "^0.0.3",
     "geolib": "^3.3.4"
   }
 }

package/plugin/factory.js

@@ -1,4 +1,5 @@
 import * as turf from '@turf/turf'
+import anekaSpatial from 'aneka-spatial/index.js'
 
 async function factory (pkgName) {
   const me = this
@@ -9,6 +10,47 @@ async function factory (pkgName) {
       this.alias = 'spatial'
       this.config = {}
       this.lib.turf = turf
+      this.lib.anekaSpatial = anekaSpatial
+    }
+
+    buildBboxQuery = async ({ bbox, query, schema, options = {} } = {}) => {
+      const { merge, isEmpty } = this.lib._
+      const props = schema.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)
+        const q = {}
+        q[bboxLngField] = { $gte: minx, $lte: maxx }
+        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)
+        }
+      }
+      return query
+    }
+
+    getCountryBbox = async (item) => {
+      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 })
+      if (country) return country.bbox
+      throw this.error('Invalid country bbox \'%s\'', item, { statusCode: 400 })
+    }
+
+    parseBbox = async (input) => {
+      const { isSet } = this.lib.aneka
+      if (input.length === 2 && !input.includes(',')) return await this.getCountryBbox(input)
+      const [minx, miny, maxx, maxy] = input.split(',').map(b => parseFloat(b) || null)
+      const valid = (isSet(minx) && isSet(miny) && isSet(maxx) && isSet(maxy)) &&
+        (minx >= -180 && maxx <= 180 && miny >= -90 && maxy <= 90)
+        // (minx <= maxx && miny <= maxy)
+      if (valid) return [minx, miny, maxx, maxy]
+      throw this.error('Invalid bbox \'%s\'', input)
     }
   }
 }

package/plugin/method/angle-in-90-deg.js

@@ -1,3 +0,0 @@
-export default function (modelAngle) {
-  return Math.PI / 2.0 - modelAngle
-}

package/plugin/method/bounds-to-tiles.js

@@ -1,31 +0,0 @@
-import lngToTile from './lng-to-tile.js'
-import latToTile from './lat-to-tile.js'
-
-export default function (bounds, zoom, allTiles, withZ) {
-  const x1 = lngToTile(bounds[0], zoom)
-  const y1 = latToTile(bounds[1], zoom)
-  const x2 = lngToTile(bounds[2], zoom)
-  const y2 = latToTile(bounds[3], zoom)
-  if (allTiles) {
-    const all = []
-    for (let i = x1; i <= x2; i++) {
-      for (let j = y2; j <= y1; j++) {
-        let item
-        switch (allTiles) {
-          case 'array':
-            item = [i, j]
-            if (withZ) item.unshift(zoom)
-            break
-          case 'object':
-            item = { x: i, y: j }
-            if (withZ) item.zoom = zoom
-            break
-          default: item = `${withZ ? (zoom + '/') : ''}${i}/${j}`
-        }
-        all.push(item)
-      }
-    }
-    return all
-  }
-  return [x1, y1, x2, y2]
-}

package/plugin/method/build-bbox-query.js

@@ -1,20 +0,0 @@
-async function buildBboxQuery ({ bbox, query, schema, options = {} } = {}) {
-  const { merge, isEmpty } = this.lib._
-  const props = schema.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)
-    const q = {}
-    q[bboxLngField] = { $gte: minx, $lte: maxx }
-    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)
-    }
-  }
-  return query
-}
-
-export default buildBboxQuery

package/plugin/method/dd-to-dms.js

@@ -1,13 +0,0 @@
-import { decimalToSexagesimal } from 'geolib'
-
-export default function (val, secPrecision = 2) {
-  val = val + ''
-  const minus = val.substr(0, 1) === '-' ? '-' : ''
-  const parts = decimalToSexagesimal(val).split(' ')
-  const last = parts[parts.length - 1]
-  const floats = last.slice(0, last.length - 1).split('.')
-  if (floats.length === 1) floats[1] = 0
-  floats[1] = parseFloat('0.' + floats[1]).toFixed(secPrecision).split('.')[1]
-  parts[parts.length - 1] = floats.join('.') + '"'
-  return minus + parts.join(' ')
-}

package/plugin/method/divide-bounds.js

@@ -1,17 +0,0 @@
-export default function (bounds, count) {
-  const originX = bounds[0]
-  const originY = bounds[1]
-  const dw = (bounds[2] - bounds[0]) / count
-  const dh = (bounds[3] - bounds[1]) / count
-  const result = []
-  for (let y = count - 1; y >= 0; y--) {
-    for (let x = 0; x < count; x++) {
-      const x1 = originX + x * dw
-      const y1 = originY + y * dh
-      const x2 = x1 + dw
-      const y2 = y1 + dh
-      result.push([x1, y1, x2, y2])
-    }
-  }
-  return result
-}

package/plugin/method/dms-to-dd.js

@@ -1,5 +0,0 @@
-import { sexagesimalToDecimal } from 'geolib'
-
-export default function (val) {
-  return sexagesimalToDecimal(val)
-}

package/plugin/method/enlarge-bounds.js

@@ -1,12 +0,0 @@
-import tileToLng from './tile-to-lng.js'
-import tileToLat from './tile-to-lat.js'
-import boundsToTiles from './bounds-to-tiles.js'
-
-export default function (bounds, zoom) {
-  const tiles = boundsToTiles(bounds, zoom)
-  const lng1 = tileToLng(tiles[0], zoom)
-  const lat1 = tileToLat(tiles[1] + 1, zoom)
-  const lng2 = tileToLng(tiles[2] + 1, zoom)
-  const lat2 = tileToLat(tiles[3], zoom)
-  return [lng1, lat1, lng2, lat2]
-}

package/plugin/method/get-tile-bounds.js

@@ -1,10 +0,0 @@
-import tileToLng from './tile-to-lng.js'
-import tileToLat from './tile-to-lat.js'
-
-export default function (x, y, zoom) {
-  const lng1 = tileToLng(x, zoom)
-  const lat1 = tileToLat(y, zoom)
-  const lng2 = tileToLng(x + 1, zoom)
-  const lat2 = tileToLat(y + 1, zoom)
-  return [lng1, lat2, lng2, lat1]
-}

package/plugin/method/is-coord-in-bounds.js

@@ -1,3 +0,0 @@
-export default function (lng, lat, bounds) {
-  return lng >= bounds[0] && lng <= bounds[2] && lat >= bounds[1] && lat <= bounds[3]
-}

package/plugin/method/is-valid-coord.js

@@ -1,5 +0,0 @@
-export default function (lng, lat) {
-  if ([null, undefined].includes(lng) || [null, undefined].includes(lat)) return false
-  if (isNaN(lng) || isNaN(lat)) return false
-  return lng >= -180 && lng <= 180 && lat >= -90 && lat <= 90
-}

package/plugin/method/lat-size-of.js

@@ -1,3 +0,0 @@
-export default function (value) {
-  return (value / 40075017) * 360
-}

package/plugin/method/lat-to-dms.js

@@ -1,7 +0,0 @@
-import ddToDms from './dd-to-dms.js'
-
-export default function (val, secPrecision) {
-  const dms = ddToDms(val, secPrecision)
-  if (dms.slice(0, 1) === '-') return dms.slice(1) + ' S'
-  return dms + ' N'
-}

package/plugin/method/lat-to-tile.js

@@ -1,5 +0,0 @@
-// source: https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#ECMAScript_.28JavaScript.2FActionScript.2C_etc..29
-
-export default function (lat, zoom) {
-  return (Math.floor((1 - Math.log(Math.tan(lat * Math.PI / 180) + 1 / Math.cos(lat * Math.PI / 180)) / Math.PI) / 2 * Math.pow(2, zoom)))
-}

package/plugin/method/lng-size-of.js

@@ -1,3 +0,0 @@
-export default function (value, lat) {
-  return ((value / 40075017) * 360) / Math.cos((Math.PI / 180) * lat)
-}

package/plugin/method/lng-to-dms.js

@@ -1,7 +0,0 @@
-import ddToDms from './dd-to-dms.js'
-
-export default function (val, secPrecision) {
-  const dms = ddToDms(val, secPrecision)
-  if (dms.substr(0, 1) === '-') return dms.substr(1) + ' W'
-  return dms + ' E'
-}

package/plugin/method/lng-to-tile.js

@@ -1,5 +0,0 @@
-// source: https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#ECMAScript_.28JavaScript.2FActionScript.2C_etc..29
-
-export default function (lng, zoom) {
-  return (Math.floor((lng + 180) / 360 * Math.pow(2, zoom)))
-}

package/plugin/method/parse-bbox.js

@@ -1,22 +0,0 @@
-async function getCountryBbox (item) {
-  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 })
-  if (country) return country.bbox
-  throw this.error('Invalid country bbox \'%s\'', item, { statusCode: 400 })
-}
-
-async function parseBbox (input) {
-  const { isSet } = this.app.bajo
-  if (input.length === 2 && !input.includes(',')) return await getCountryBbox.call(this, input)
-  const [minx, miny, maxx, maxy] = input.split(',').map(b => parseFloat(b) || null)
-  const valid = (isSet(minx) && isSet(miny) && isSet(maxx) && isSet(maxy)) &&
-    (minx >= -180 && maxx <= 180 && miny >= -90 && maxy <= 90)
-    // (minx <= maxx && miny <= maxy)
-  if (valid) return [minx, miny, maxx, maxy]
-  throw this.error('Invalid bbox \'%s\'', input)
-}
-
-export default parseBbox

package/plugin/method/sanitize-bounds.js

@@ -1,14 +0,0 @@
-export default function (bounds) {
-  if (typeof bounds === 'string') {
-    bounds = bounds.trim()
-    if (bounds.substr(0, 1) === '[') {
-      try {
-        bounds = JSON.parse(bounds)
-      } catch (err) {}
-    } else {
-      bounds = bounds.split(',')
-    }
-    bounds = bounds.map(val => parseFloat(val))
-  }
-  return bounds
-}

package/plugin/method/tile-to-lat.js

@@ -1,6 +0,0 @@
-// source: https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#ECMAScript_.28JavaScript.2FActionScript.2C_etc..29
-
-export default function (y, zoom) {
-  const n = Math.PI - 2 * Math.PI * y / Math.pow(2, zoom)
-  return (180 / Math.PI * Math.atan(0.5 * (Math.exp(n) - Math.exp(-n))))
-}

package/plugin/method/tile-to-lng.js

@@ -1,5 +0,0 @@
-// source: https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#ECMAScript_.28JavaScript.2FActionScript.2C_etc..29
-
-export default function (x, zoom) {
-  return (x / Math.pow(2, zoom) * 360 - 180)
-}

package/plugin/method/tiles-to-bounds.js

@@ -1,15 +0,0 @@
-import tileToLng from './tile-to-lng.js'
-import tileToLat from './tile-to-lat.js'
-
-export default function (x1, y1, x2, y2, zoom, extra) {
-  const lng1 = tileToLng(x1, zoom)
-  const lat1 = tileToLat(y1 + 1, zoom)
-  const lng2 = tileToLng(x2 + 1, zoom)
-  const lat2 = tileToLat(y2, zoom)
-  const ret = [lng1, lat1, lng2, lat2]
-  if (!extra) return ret
-  return {
-    bounds: ret,
-    sqd: (lng2 - lng1) * (lat2 - lat1)
-  }
-}