waibu-maps 2.3.1 → 2.4.1

package/extend/bajo/intl/en-US.json

@@ -10,6 +10,7 @@
   "searchIn": "Search in",
   "clearHistory": "Clear History",
   "enterPhrase": "You need to enter a search phrase first",
+  "loading": "Loading...",
   "mapCtrl": {
     "csrc": "Search",
     "navigation-control": "Navigation",

package/extend/bajo/intl/id.json

@@ -12,6 +12,7 @@
   "searchIn": "Cari di",
   "clearHistory": "Hapus Jejak",
   "enterPhrase": "Anda harus memasukkan frase pencarian terlebih dahulu",
+  "loading": "Memuat...",
   "mapCtrl": {
     "csrc": "Cari",
     "navigation-control": "Navigasi",

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

@@ -14,7 +14,7 @@ async function controlGroup () {
       const { generateId } = this.app.lib.aneka
       const { jsonStringify, minify } = this.app.waibuMpa
       const { isString, trim } = this.app.lib._
-      const { $ } = this.component
+      const { $, req } = this.component
       const tpl = await this.component.buildSentence(this.loadTemplate('waibuMaps.partial:/menu.html', { escape: true }), {}, { minify: true })
       const id = isString(this.params.attr.id) ? this.params.attr.id : generateId('alpha')
       const opts = {}
@@ -51,12 +51,12 @@ async function controlGroup () {
         async ${prefix}Trigger (evt) {
           const el = evt.target.closest('button')
           if (!el) return
-          const menu = el.querySelector('.dropdown-menu')
+          const menu = el.querySelector('.dropdown-menu .loading')
           if (!menu) return
           if (menu.children.length > 0) return
           const setting = el.getAttribute('setting') ? ('setting="' + el.getAttribute('setting') + '"') : ''
-          const options = { selector: menu, checkChild: true, theme: '${this.component.theme.name}', iconset: '${this.component.iconset.name}' }
-          await wmpa.addComponent('<c:' + el.getAttribute('component') + ' ' + setting + ' />', options)
+          const options = { selector: menu, checkChild: true }
+          await wmpa.replaceWithComponent('<c:' + el.getAttribute('component') + ' ' + setting + ' />', options)
         }
       `, `
         async ${prefix}Builder (params) {
@@ -69,7 +69,7 @@ async function controlGroup () {
               html: param.html
             }
             if (param.wrapper.includes('component=')) {
-              args.html = ''
+              args.html = '<div class="loading mx-2">${req.t('loading')}</div>'
               args.click = '${prefix}Trigger'
             }
             const wfn = _.template(param.wrapper)

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

@@ -27,7 +27,7 @@ async function controlImage () {
           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, { theme: '${this.component.theme.name}', iconset: '${this.component.iconset.name}' })
+          return await wmpa.createComponent(body)
         }
       `)
 

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

@@ -29,7 +29,7 @@ async function controlLogo () {
       }
       this.addBlock('reactive', `
         async ${prefix}Builder () {
-          const body = ['<c:a href="#" @click="wbs.appLauncher(\\'darkmode language\\', \\'${this.params.attr.menu}\\', { theme: \\'${this.component.theme.name}\\', iconset: \\'${this.component.iconset.name}\\' })">']
+          const body = ['<c:a href="#" @click="wbs.appLauncher(\\'darkmode language\\', \\'${this.params.attr.menu}\\')">']
           body.push('<c:img ${stringifyAttribs(img)} ${animate} />')
           body.push('</c:a>')
           return await wmpa.createComponent(body)

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

@@ -56,8 +56,7 @@ async function controlMousePos () {
       `, `
         async ${prefix}Builder () {
           const body = '<c:div id="${id}" margin="x-2 top-1" text="align:center nowrap"/>'
-          const options = { theme: '${this.component.theme.name}', iconset: '${this.component.iconset.name}' }
-          return await wmpa.createComponent(body, options)
+          return await wmpa.createComponent(body)
         }
       `])
       this.addBlock('run', `

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

@@ -54,7 +54,7 @@ async function controlSearch () {
             '<c:icon name="search" />',
             '</c:button>'
           ]
-          return [await wmpa.createComponent(body, { theme: '${this.component.theme.name}', iconset: '${this.component.iconset.name}' })]
+          return [await wmpa.createComponent(body)]
         }
       `, `
         async ${prefix}Populate () {
@@ -62,7 +62,7 @@ async function controlSearch () {
           feeds.unshift({ code: 'latLng', name: 'gotoLatLng', feed: { id: 'latLng', cmpLabel: 'latLng' } })
           this.$store.mapSearch.feeds = feeds
           const body = feeds.map(feed => '<c:dropdown-item :class="$store.mapSearch.feed === $el.getAttribute(\\'data-code-feedid\\') ? \\'active\\' : \\'\\'" data-code-feedid="' + feed.code + ':' + feed.feed.id + '" t:content="' + feed.feed.cmpLabel + '" @click="$store.mapSearch.feed = \\'' + feed.code + ':' + feed.feed.id + '\\'"/>')
-          const options = { selector: '#${id} .input-group .dropdown-menu', wrapper: 'div', checkChild: true, theme: '${this.component.theme.name}', iconset: '${this.component.iconset.name}' }
+          const options = { selector: '#${id} .input-group .dropdown-menu', wrapper: 'div', checkChild: true }
           await wmpa.addComponent(body, options)
           if (!this.$store.mapSearch.feed) this.$store.mapSearch.feed = feeds[0].code + ':' + feeds[0].feed.id
           const html = this.$store.mapSearch.recent ?? ''

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

@@ -54,7 +54,7 @@ async function controlZbp () {
             ' }',
             '}" />'
           ]
-          return await wmpa.createComponent(body, { theme: '${this.component.theme.name}', iconset: '${this.component.iconset.name}' })
+          return await wmpa.createComponent(body)
         }
       `])
 

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

@@ -1,28 +1,28 @@
 import wmapsBase from '../wmaps-base.js'
 
-export function buildLayers (params) {
+export function buildLayers () {
   const { isString, map } = this.app.lib._
   const { routePath, attrToArray } = this.app.waibu
   const { jsonStringify } = this.app.waibuMpa
 
-  if (!isString(params.attr.layer)) return ''
-  const items = map(attrToArray(params.attr.layer), item => routePath(item))
+  if (!isString(this.params.attr.layer)) return ''
+  const items = map(attrToArray(this.params.attr.layer), item => routePath(item))
   return `
     for (const l of ${jsonStringify(items, true)}) {
       const layer = await this.loadResource(l)
-      layer.source = '${params.attr.name}'
+      layer.source = '${this.params.attr.name}'
       map.addLayer(layer)
     }
   `
 }
 
-export function buildImage (params) {
+export function buildImage () {
   const { isString, map } = this.app.lib._
   const { routePath, attrToArray } = this.app.waibu
   const { jsonStringify } = this.app.waibuMpa
 
-  if (!isString(params.attr.image)) return ''
-  const items = map(attrToArray(params.attr.image), item => routePath(item))
+  if (!isString(this.params.attr.image)) return ''
+  const items = map(attrToArray(this.params.attr.image), item => routePath(item))
   return `
     for (const l of ${jsonStringify(items, true)}) {
       let [item, name] = l.split(';')
@@ -34,35 +34,35 @@ export function buildImage (params) {
   `
 }
 
-export async function buildSrcImages (params) {
+export async function buildSrcImages () {
   const { isString } = this.app.lib._
   const { routePath, fetch } = this.app.waibu
 
-  if (!isString(params.attr.srcImages)) return
-  params.attr.srcImages = routePath(params.attr.srcImages)
-  const items = await fetch(params.attr.srcImages)
+  if (!isString(this.params.attr.srcImages)) return
+  this.params.attr.srcImages = routePath(this.params.attr.srcImages)
+  const items = await fetch(this.params.attr.srcImages)
   const lines = []
   for (const key in items) {
     lines.push(`${items[key]};${key}`)
   }
-  params.attr.image = lines.join(' ')
-  return buildImage.call(this, params)
+  this.params.attr.image = lines.join(' ')
+  return buildImage.call(this)
 }
 
-export function buildSource (params, extra = []) {
+export function buildSource (extra = []) {
   const { routePath } = this.app.waibu
-  params.attr.src = routePath(params.attr.src)
+  this.params.attr.src = routePath(this.params.attr.src)
   return `
-    const rsc = await this.loadResource('${params.attr.src}')
+    const rsc = await this.loadResource('${this.params.attr.src}')
     let data = {}
     if (rsc.type === 'geojson' && rsc.data) data = rsc
     else {
       data.type = 'geojson'
       data.data = rsc
     }
-    ${params.attr.lineGradient ? 'data.lineMetrics = true' : ''}
+    ${this.params.attr.lineGradient ? 'data.lineMetrics = true' : ''}
     ${extra.join('\n')}
-    map.addSource('${params.attr.name}', data)
+    map.addSource('${this.params.attr.name}', data)
   `
 }
 
@@ -91,9 +91,9 @@ async function layerGeojson () {
       }
 
       this.addBlock('mapLoad', `
-        ${this.params.attr.srcImages ? (await buildSrcImages.call(this, this.params)) : buildImage.call(this, this.params)}
-        ${buildSource.call(this, this.params, cluster)}
-        ${buildLayers.call(this, this.params)}
+        ${this.params.attr.srcImages ? (await buildSrcImages.call(this)) : buildImage.call(this)}
+        ${buildSource.call(this, cluster)}
+        ${buildLayers.call(this)}
       `)
       this.params.html = this.writeBlock()
     }

package/extend/waibuMpa/route/wmaps.js

@@ -3,6 +3,7 @@ import { glyphUrl } from './default-style.js'
 const wmaps = {
   url: '/wmaps.js',
   method: 'GET',
+  noCacheReq: true,
   handler: async function (req, reply) {
     const { get } = this.app.lib._
     const { routePath } = this.app.waibu

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-maps",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "description": "Maps for Waibu MPA",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-06-01
+
+- [2.4.1] Bug fix in ```wmaps-layer-geojson``` widget
+
+## 2026-05-25
+
+- [2.4.0] Auto detect theme & iconset
+- [2.4.0] Bug fix in ```control-group``` widget
+- [2.4.0] Add ```noCacheReq``` to ```wmaps.js``` route
+
 ## 2026-05-22
 
 - [2.3.1] Bug fix in icon model schema