waibu-maps 1.2.5 → 1.2.7

package/dobo/fixture/icon.js

@@ -1,16 +1,16 @@
 import path from 'path'
 
 async function icon () {
-  const { map, camelCase } = this.lib._
+  const { map } = 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}`)
+    const id = `icon:/${path.basename(dir)}/${base}`
     return {
-      id: icon.href,
-      name
+      id,
+      url: icon.href
     }
   })
 }

package/dobo/schema/icon.json

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

package/package.json

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

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

@@ -11,7 +11,7 @@ async function controlNavigation () {
 
     build = async () => {
       const { jsonStringify } = this.plugin.app.waibuMpa
-      const opts = { showCompass: false }
+      const opts = { showCompass: true }
       if (this.params.attr.compass) opts.showCompass = true
       if (this.params.attr.noZoom) opts.showZoom = false
       if (this.params.attr.visualizePitch) opts.visualizePitch = true
@@ -19,7 +19,15 @@ async function controlNavigation () {
       opts.classGroup = true
       opts.position = this.ctrlPos.includes(this.params.attr.position) ? this.params.attr.position : 'bottom-right'
       this.addBlock('control', `
-        await wmaps.createControlNative('NavigationControl', ${jsonStringify(opts, true)})
+        const navOpts = ${jsonStringify(opts, true)}
+        if (Alpine.store('map').noMapRotate) {
+          map.dragRotate.disable()
+          map.touchZoomRotate.disableRotation()
+          navOpts.showCompass = false
+        } else {
+          if (Alpine.store('map').hideCompass) navOpts.showCompass = false
+        }
+        await wmaps.createControlNative('NavigationControl', navOpts)
       `)
       this.params.html = this.writeBlock()
     }

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

@@ -62,7 +62,7 @@ async function controlSearch () {
           feeds.unshift({ code: 'latLng', name: 'gotoLatLng', feed: { id: 'latLng', label: '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.label + '" @click="$store.mapSearch.feed = \\'' + feed.code + ':' + feed.feed.id + '\\'"/>')
-          await wmpa.addComponent(body, '#${id} .input-group .dropdown-menu', 'div')
+          await wmpa.addComponent(body, '#${id} .input-group .dropdown-menu', 'div', true)
           if (!this.$store.mapSearch.feed) this.$store.mapSearch.feed = feeds[0].code + ':' + feeds[0].feed.id
           const html = this.$store.mapSearch.recent ?? ''
           wmpa.replaceWithComponentHtml(html, '#${id} .result div', 'div')

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

@@ -68,6 +68,7 @@ async function map () {
               ${(this.block.mapStyle ?? []).join('\n')}
             },
             async onMissingImage (evt) {
+              if (evt.id.startsWith('icon:')) await wmaps.loadIcon(evt.id)
               ${(this.block.missingImage ?? []).join('\n')}
             },
             onLayerVisibility (layerId, shown) {
@@ -117,6 +118,7 @@ async function map () {
           measure: Alpine.$persist('nautical').as('mapMeasure'),
           zoomScrollCenter: Alpine.$persist(false).as('mapZoomScrollCenter'),
           noMapRotate: Alpine.$persist(false).as('mapNoMapRotate'),
+          hideCompass: Alpine.$persist(false).as('mapHideCompass'),
           center: Alpine.$persist(null).as('mapCenter'),
           zoom: Alpine.$persist(null).as('mapZoom'),
           bearing: Alpine.$persist(null).as('mapBearing'),

package/waibuBootstrap/theme/component/factory/modal-misc.js

@@ -0,0 +1,71 @@
+import wmapsBase from '../wmaps-base.js'
+
+async function modalMisc () {
+  const SmapsBase = await wmapsBase.call(this)
+
+  return class SmapsModalMisc extends SmapsBase {
+    constructor (options) {
+      super(options)
+      this.params.noTag = true
+    }
+
+    build = async () => {
+      this.params.html = await this.component.buildSentence(`
+        <c:modal id="${this.params.attr.id}" t:title="generalSettings" x-data="{
+            measure: $store.map.measure,
+            degree: $store.map.degree,
+            zoomScrollCenter: $store.map.zoomScrollCenter,
+            noMapRotate: $store.map.noMapRotate,
+            hideCompass: $store.map.hideCompass,
+            submit () {
+              $store.map.measure = this.measure
+              $store.map.degree = this.degree
+              $store.map.zoomScrollCenter = this.zoomScrollCenter
+              $store.map.noMapRotate = this.noMapRotate
+              $store.map.hideCompass = this.hideCompass
+              window.location.reload()
+            },
+            toggleNoMapRotate (val) {
+              if (val) {
+                $refs.hideCompass.setAttribute('disabled', '')
+                this.hideCompass = false
+              } else {
+                $refs.hideCompass.removeAttribute('disabled')
+              }
+            }
+          }" x-init="
+            toggleNoMapRotate($store.map.noMapRotate)
+            $watch('noMapRotate', val => toggleNoMapRotate(val))
+          ">
+          <c:grid-row>
+            <c:grid-col col="6-md">
+              <c:fieldset t:legend="measurement" legend-type="6" margin="bottom-3">
+                <c:form-radio t:label="nautical" value="nautical" x-model="measure" />
+                <c:form-radio t:label="imperial" value="imperial" x-model="measure" />
+                <c:form-radio t:label="metric" value="metric" x-model="measure" />
+              </c:fieldset>
+            </c:grid-col>
+            <c:grid-col col="6-md">
+              <c:fieldset t:legend="degreeFormat" legend-type="6" margin="bottom-3">
+                <c:form-radio t:label="degreeMinuteSecond" value="DMS" x-model="degree" />
+                <c:form-radio t:label="decimalDegree" value="DD" x-model="degree" />
+              </c:fieldset>
+            </c:grid-col>
+            <c:grid-col col="12">
+              <c:fieldset t:legend="misc" legend-type="6">
+                <c:form-check t:label="zoomScrollFromCenter" value="false" x-model="zoomScrollCenter" />
+                <c:form-check t:label="disableMapRotation" value="false" x-model="noMapRotate" />
+                <c:form-check t:label="hideCompass" value="false" x-model="hideCompass" x-ref="hideCompass"/>
+              </c:fieldset>
+            </c:grid-col>
+          </c:grid-row>
+          <c:div flex="justify-content:end" margin="top-3">
+            <c:btn color="primary" t:content="apply" @click="submit()"/>
+          </c:div>
+        </c:modal>
+      `)
+    }
+  }
+}
+
+export default modalMisc

package/waibuRestApi/route/icon/model-builder.json

@@ -0,0 +1,3 @@
+{
+  "model": "WmapsIcon"
+}