waibu-maps 2.0.1 → 2.1.0

package/docs/index.js.html

@@ -14,7 +14,7 @@ async function factory (pkgName) {
    *
    * @class
    */
-  class WaibuMaps extends this.app.pluginClass.base {
+  class WaibuMaps extends this.app.baseClass.Base {
     static alias = 'wmaps'
     static dependencies = ['bajo-spatial']
 

package/extend/dobo/model/icon.json

@@ -0,0 +1,7 @@
+{
+  "connection": "memory",
+  "properties": [
+    "id,,255,primary,true",
+    "name,,255,true"
+  ]
+}

package/extend/waibuBootstrap/theme/component/factory/control-attribution.js

@@ -10,7 +10,7 @@ async function controlAttribution () {
     }
 
     build = async () => {
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { jsonStringify } = this.app.waibuMpa
       const { isString } = this.app.lib._
       const opts = {
         compact: !this.params.attr.noCompact

package/extend/waibuBootstrap/theme/component/factory/control-buttons.js

@@ -20,9 +20,9 @@ async function controlButtons () {
     }
 
     build = async () => {
-      const { generateId } = this.plugin.app.bajo
-      const { routePath } = this.plugin.app.waibu
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { generateId } = this.app.lib.aneka
+      const { routePath } = this.app.waibu
+      const { jsonStringify } = this.app.waibuMpa
       const { isEmpty, isString, pick, camelCase } = this.app.lib._
       const { $ } = this.component
       const pos = this.ctrlPos.includes(this.params.attr.position) ? this.params.attr.position : 'top-right'

package/extend/waibuBootstrap/theme/component/factory/control-fullscreen.js

@@ -10,7 +10,7 @@ async function controlFullscreen () {
     }
 
     build = async () => {
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { jsonStringify } = this.app.waibuMpa
       const { isString } = this.app.lib._
       const opts = {}
       if (isString(this.params.attr.container)) opts.container = this.params.attr.container

package/extend/waibuBootstrap/theme/component/factory/control-geolocate.js

@@ -10,7 +10,7 @@ async function controlGeolocate () {
     }
 
     build = async () => {
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { jsonStringify } = this.app.waibuMpa
       const { set } = this.app.lib._
       const opts = {}
       if (this.params.attr.highAccuracy) set(opts, 'positionOptions.enableHighAccuracy', true)

package/extend/waibuBootstrap/theme/component/factory/control-globe.js

@@ -10,7 +10,7 @@ async function controlGlobe () {
     }
 
     build = async () => {
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { jsonStringify } = this.app.waibuMpa
       const { isString } = this.app.lib._
       const opts = {}
       if (isString(this.params.attr.container)) opts.container = this.params.attr.container

package/extend/waibuBootstrap/theme/component/factory/control-group-menu.js

@@ -15,7 +15,7 @@ async function controlGroupMenu () {
       const { $ } = this.component
       const { fastGlob } = this.app.lib
       const { isString } = this.app.lib._
-      const { routePath } = this.plugin.app.waibu
+      const { routePath } = this.app.waibu
       let icon
       let image = ''
       const items = []
@@ -26,7 +26,7 @@ async function controlGroupMenu () {
       if (isString(this.params.attr.image)) {
         if (this.params.attr.image === 'logo') {
           let logo = 'waibu'
-          const files = await fastGlob(`${this.plugin.app.main.dir.pkg}/extend/bajo/logo.*`)
+          const files = await fastGlob(`${this.app.main.dir.pkg}/extend/bajo/logo.*`)
           if (files.length > 0) logo = 'main'
           image = routePath(`waibuMpa:/logo/${logo}`)
         } else image = routePath(this.params.attr.image)

package/extend/waibuBootstrap/theme/component/factory/control-group.js

@@ -11,8 +11,8 @@ async function controlGroup () {
     }
 
     build = async () => {
-      const { generateId } = this.plugin.app.bajo
-      const { jsonStringify, minify } = this.plugin.app.waibuMpa
+      const { generateId } = this.app.lib.aneka
+      const { jsonStringify, minify } = this.app.waibuMpa
       const { isString, trim } = this.app.lib._
       const { $ } = this.component
       const tpl = await this.component.buildSentence(this.loadTemplate('waibuMaps.partial:/menu.html', { escape: true }), {}, { minify: true })

package/extend/waibuBootstrap/theme/component/factory/control-image.js

@@ -11,8 +11,8 @@ async function controlImage () {
     }
 
     build = async () => {
-      const { routePath } = this.plugin.app.waibu
-      const { jsonStringify, groupAttrs, attribsStringify } = this.plugin.app.waibuMpa
+      const { routePath } = this.app.waibu
+      const { jsonStringify, groupAttrs, stringifyAttribs } = this.app.waibuMpa
       const { isString, isEmpty } = this.app.lib._
       const opts = {}
       opts.position = this.ctrlPos.includes(this.params.attr.position) ? this.params.attr.position : 'top-left'
@@ -24,7 +24,7 @@ async function controlImage () {
       if (this.params.attr.noAnimate) animate = ''
       this.addBlock('reactive', `
         async ${prefix}Builder () {
-          const body = ['<c:${url ? `a url="${url}"` : 'div'}><c:img ${attribsStringify(img)} ']
+          const body = ['<c:${url ? `a url="${url}"` : 'div'}><c:img ${stringifyAttribs(img)} ']
           body.push('${animate}')
           body.push('/></c:${url ? 'a' : 'div'}>')
           return await wmpa.createComponent(body)

package/extend/waibuBootstrap/theme/component/factory/control-loader.js

@@ -10,7 +10,7 @@ async function controlLoader () {
     }
 
     build = async () => {
-      const { groupAttrs, attribsStringify } = this.plugin.app.waibuMpa
+      const { groupAttrs, stringifyAttribs } = this.app.waibuMpa
       const group = groupAttrs(this.params.attr, ['progress'])
       const attr = group.progress ?? {}
       attr.value = '100'
@@ -18,7 +18,7 @@ async function controlLoader () {
       if (!attr.height) attr.height = 3
       if (!attr.background) attr.background = 'color:danger'
       this.params.html = await this.component.buildSentence(`<c:div class="childmap maplibregl-ctrl-loader">
-        <c:progress ${attribsStringify(attr)} x-show="$store.wmpa.loading"/>
+        <c:progress ${stringifyAttribs(attr)} x-show="$store.wmpa.loading"/>
       </c:div>`)
     }
   }

package/extend/waibuBootstrap/theme/component/factory/control-logo.js

@@ -14,8 +14,8 @@ async function controlLogo () {
 
     build = async () => {
       const { fs, fastGlob } = this.app.lib
-      const { routePath } = this.plugin.app.waibu
-      const { jsonStringify, groupAttrs, attribsStringify } = this.plugin.app.waibuMpa
+      const { routePath } = this.app.waibu
+      const { jsonStringify, groupAttrs, stringifyAttribs } = this.app.waibuMpa
       const opts = { class: prefix }
       opts.position = this.ctrlPos.includes(this.params.attr.position) ? this.params.attr.position : 'top-left'
       const group = groupAttrs(this.params.attr, ['img'])
@@ -23,7 +23,7 @@ async function controlLogo () {
       img.opacity = parseFloat(img.opacity) || 0.3
       let logo = 'waibu'
       let logoAlt
-      const files = await fastGlob(`${this.plugin.app.main.dir.pkg}/logo.*`)
+      const files = await fastGlob(`${this.app.main.dir.pkg}/logo.*`)
       if (files.length > 0) {
         const dir = path.dirname(files[0])
         const ext = path.extname(files[0])
@@ -42,7 +42,7 @@ async function controlLogo () {
       this.addBlock('reactive', `
         async ${prefix}Builder () {
           const body = ['<c:a href="#" @click="wbs.appLauncher(\\'darkmode language\\', \\'${this.params.attr.menu}\\')">']
-          body.push('<c:img ${attribsStringify(img)} ${animate} />')
+          body.push('<c:img ${stringifyAttribs(img)} ${animate} />')
           body.push('</c:a>')
           return await wmpa.createComponent(body)
         }

package/extend/waibuBootstrap/theme/component/factory/control-mouse-pos.js

@@ -12,8 +12,8 @@ async function controlMousePos () {
     }
 
     build = async () => {
-      const { generateId } = this.plugin.app.bajo
-      const { jsonStringify, minify } = this.plugin.app.waibuMpa
+      const { generateId } = this.app.lib.aneka
+      const { jsonStringify, minify } = this.app.waibuMpa
       const { has, omit } = this.app.lib._
       const options = omit(this.params.attr, ['octag', 'class', 'style', 'content'])
       options.class = prefix + ' maplibregl-ctrl-group widget'

package/extend/waibuBootstrap/theme/component/factory/control-navigation.js

@@ -10,7 +10,7 @@ async function controlNavigation () {
     }
 
     build = async () => {
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { jsonStringify } = this.app.waibuMpa
       const opts = { showCompass: true }
       if (this.params.attr.compass) opts.showCompass = true
       if (this.params.attr.noZoom) opts.showZoom = false

package/extend/waibuBootstrap/theme/component/factory/control-ruler.js

@@ -21,8 +21,8 @@ async function controlRuler () {
     }
 
     build = async () => {
-      const { routePath } = this.plugin.app.waibu
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { routePath } = this.app.waibu
+      const { jsonStringify } = this.app.waibuMpa
       const pos = this.ctrlPos.includes(this.params.attr.position) ? this.params.attr.position : 'bottom-right'
       const opts = {
         imageUrl: routePath('waibuMaps.asset:/image/ruler.svg')

package/extend/waibuBootstrap/theme/component/factory/control-scale.js

@@ -10,7 +10,7 @@ async function controlScale () {
     }
 
     build = async () => {
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { jsonStringify } = this.app.waibuMpa
       const { isString } = this.app.lib._
       const opts = {}
       if (['imperial', 'metric', 'nautical'].includes(this.params.attr.unit)) opts.unit = this.params.attr.unit

package/extend/waibuBootstrap/theme/component/factory/control-search.js

@@ -11,9 +11,9 @@ async function controlSearch () {
     }
 
     build = async () => {
-      const { generateId } = this.plugin.app.bajo
+      const { generateId } = this.app.lib.aneka
       const { isString } = this.app.lib._
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { jsonStringify } = this.app.waibuMpa
       const id = isString(this.params.attr.id) ? this.params.attr.id : generateId('alpha')
       const opts = {}
       opts.position = this.ctrlPos.includes(this.params.attr.position) ? this.params.attr.position : 'top-left'

package/extend/waibuBootstrap/theme/component/factory/control-zbp.js

@@ -12,8 +12,8 @@ async function controlZbp () {
     }
 
     build = async () => {
-      const { generateId } = this.plugin.app.bajo
-      const { jsonStringify, minify } = this.plugin.app.waibuMpa
+      const { generateId } = this.app.lib.aneka
+      const { jsonStringify, minify } = this.app.waibuMpa
       const { omit } = this.app.lib._
       const options = omit(this.params.attr, ['octag', 'class', 'style', 'content'])
       options.class = prefix + ' maplibregl-ctrl-group widget'

package/extend/waibuBootstrap/theme/component/factory/control.js

@@ -11,7 +11,7 @@ async function control () {
     }
 
     build = async () => {
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { jsonStringify } = this.app.waibuMpa
       const { $ } = this.component
       const html = []
       $(`<div>${this.params.html}</div>`).find('.childmap').each(function () {

package/extend/waibuBootstrap/theme/component/factory/layer-geojson.js

@@ -2,8 +2,8 @@ import wmapsBase from '../wmaps-base.js'
 
 export function buildLayers (params) {
   const { isString, map } = this.app.lib._
-  const { routePath } = this.plugin.app.waibu
-  const { attrToArray, jsonStringify } = this.plugin.app.waibuMpa
+  const { routePath } = this.app.waibu
+  const { attrToArray, jsonStringify } = this.app.waibuMpa
 
   if (!isString(params.attr.layer)) return ''
   const items = map(attrToArray(params.attr.layer), item => routePath(item))
@@ -18,8 +18,8 @@ export function buildLayers (params) {
 
 export function buildImage (params) {
   const { isString, map } = this.app.lib._
-  const { routePath } = this.plugin.app.waibu
-  const { attrToArray, jsonStringify } = this.plugin.app.waibuMpa
+  const { routePath } = this.app.waibu
+  const { attrToArray, jsonStringify } = this.app.waibuMpa
 
   if (!isString(params.attr.image)) return ''
   const items = map(attrToArray(params.attr.image), item => routePath(item))
@@ -36,7 +36,7 @@ export function buildImage (params) {
 
 export async function buildSrcImages (params) {
   const { isString } = this.app.lib._
-  const { routePath, fetch } = this.plugin.app.waibu
+  const { routePath, fetch } = this.app.waibu
 
   if (!isString(params.attr.srcImages)) return
   params.attr.srcImages = routePath(params.attr.srcImages)
@@ -50,7 +50,7 @@ export async function buildSrcImages (params) {
 }
 
 export function buildSource (params, extra = []) {
-  const { routePath } = this.plugin.app.waibu
+  const { routePath } = this.app.waibu
   params.attr.src = routePath(params.attr.src)
   return `
     const rsc = await this.loadResource('${params.attr.src}')
@@ -76,9 +76,9 @@ async function layerGeojson () {
     }
 
     build = async () => {
-      const { generateId } = this.plugin.app.bajo
+      const { generateId } = this.app.lib.aneka
       const { isString } = this.app.lib._
-      const { groupAttrs } = this.plugin.app.waibuMpa
+      const { groupAttrs } = this.app.waibuMpa
       this.params.noTag = true
       if (!this.params.attr.src) return
       this.params.attr.name = this.params.attr.name ?? generateId('alpha')

package/extend/waibuBootstrap/theme/component/factory/layer-html-cluster.js

@@ -64,9 +64,9 @@ async function layerHtmlCluster () {
     }
 
     build = async () => {
-      const { generateId } = this.plugin.app.bajo
-      const { attrToArray, jsonStringify } = this.plugin.app.waibuMpa
-      const { fetch, routePath } = this.plugin.app.waibu
+      const { generateId } = this.app.lib.aneka
+      const { attrToArray, jsonStringify } = this.app.waibuMpa
+      const { fetch, routePath } = this.app.waibu
       const { isString } = this.app.lib._
       if (!this.params.attr.src) return
       this.params.attr.name = this.params.attr.name ?? generateId('alpha')

package/extend/waibuBootstrap/theme/component/factory/map/options.js

@@ -11,9 +11,9 @@ export const opts = {
 
 async function options (params = {}) {
   const { camelCase, isString } = this.app.lib._
-  const { attrToArray } = this.plugin.app.waibuMpa
-  const { routePath } = this.plugin.app.waibu
-  const mapOpts = this.plugin.app.waibuMaps.getConfig().mapOptions
+  const { attrToArray } = this.app.waibuMpa
+  const { routePath } = this.app.waibu
+  const mapOpts = this.app.waibuMaps.getConfig().mapOptions
   mapOpts.container = params.attr.id
   const { $ } = this.component
   for (const key in params.attr) {

package/extend/waibuBootstrap/theme/component/factory/map.js

@@ -20,9 +20,9 @@ async function map () {
     }
 
     build = async () => {
-      const { generateId } = this.plugin.app.bajo
+      const { generateId } = this.app.lib.aneka
       const { without, omit, isString } = this.app.lib._
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { jsonStringify } = this.app.waibuMpa
       const { $ } = this.component
 
       this.params.attr.id = 'map' + (isString(this.params.attr.id) ? this.params.attr.id : generateId('alpha'))

package/extend/waibuBootstrap/theme/component/wmaps-base.js

@@ -17,7 +17,7 @@ async function wmapsBase () {
 
     async getWmapsTemplate (html, type, defEmpty = '') {
       const { trim, isEmpty } = this.app.lib._
-      const { minify } = this.plugin.app.waibuMpa
+      const { minify } = this.app.waibuMpa
       const { $ } = this.component
       let tpl = trim($(`<div>${html}</div>`).find(`wmaps-template[type="${type}"]`).prop('innerHTML'))
       if (isEmpty(tpl)) {