waibu-maps 1.2.3 → 1.2.5

package/bajoTemplate/template/wmaps.js

@@ -7,6 +7,7 @@ class WaibuMaps { // eslint-disable-line no-unused-vars
     this.markers = {}
     this.markersOnScreen = {}
     this.popup = null
+    this.iconPrefix = '<%= iconPrefix %>'
   }
 
   handleClusterClick = async (layerId, clusterId = 'cluster_id') => {
@@ -140,6 +141,13 @@ class WaibuMaps { // eslint-disable-line no-unused-vars
     this.map.addImage(src.name, image.data)
   }
 
+  loadIcon = async (icon) => {
+    if (this.map.listImages().includes(icon)) return
+    const href = this.iconPrefix + icon.split(':')[1]
+    const image = await this.map.loadImage(href)
+    if (!this.map.listImages().includes(icon)) this.map.addImage(icon, image.data)
+  }
+
   loadImages = async (sources, fetch = true) => {
     for (const src of sources) {
       if (fetch) {

package/dobo/fixture/icon.js

@@ -0,0 +1,18 @@
+import path from 'path'
+
+async function icon () {
+  const { map, camelCase } = this.lib._
+  if (!this.app.waibuStatic) return []
+  const icons = await this.app.waibuStatic.listResources(`${this.name}.asset:/icon`)
+  return map(icons, icon => {
+    const base = path.basename(icon.href)
+    const dir = path.dirname(icon.href)
+    const name = camelCase(`${path.basename(dir)} ${base}`)
+    return {
+      id: icon.href,
+      name
+    }
+  })
+}
+
+export default icon

package/package.json

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

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

@@ -55,7 +55,7 @@ async function controlGroup () {
           if (!menu) return
           if (menu.children.length > 0) return
           const setting = el.getAttribute('setting') ? ('setting="' + el.getAttribute('setting') + '"') : ''
-          await wmpa.addComponent('<c:' + el.getAttribute('component') + ' ' + setting + ' />', menu)
+          await wmpa.addComponent('<c:' + el.getAttribute('component') + ' ' + setting + ' />', menu, null, true)
         }
       `, `
         async ${prefix}Builder (params) {

package/waibuMpa/route/wmaps.js

@@ -4,9 +4,12 @@ const wmaps = {
   url: '/wmaps.js',
   method: 'GET',
   handler: async function (req, reply) {
+    const { get } = this.lib._
     const { routePath } = this.app.waibu
     const glyphs = routePath(glyphUrl, { uriEncoded: false })
-    return await reply.view('waibuMaps.template:/wmaps.js', { glyphs })
+    const assetPrefix = get(this, 'app.waibuStatic.config.waibu.prefix')
+    const iconPrefix = `/${assetPrefix}/${this.config.waibu.prefix}/icon`
+    return await reply.view('waibuMaps.template:/wmaps.js', { glyphs, iconPrefix })
   }
 }