waibu-maps 1.1.3 → 1.1.4

package/bajoTemplate/template/wmaps.js

@@ -1,7 +1,7 @@
 /* global maplibregl, geolib, _, wmpa, WorkerTimers, turf, Alpine */
 
 class WaibuMaps { // eslint-disable-line no-unused-vars
-  constructor (map, scope) {
+  constructor (map, scope, opts = {}) {
     this.map = map
     this.scope = scope
     this.markers = {}
@@ -210,6 +210,11 @@ class WaibuMapsUtil {
     }
   }
 
+  setMap = (map, projection) => {
+    this.map = map
+    if (projection) this.defStyle.projection = projection
+  }
+
   decToDms = (decimal, opts = {}) => {
     if (opts === true || opts === false) opts = { isLng: opts }
     opts.north = opts.north ?? 'N'

package/package.json

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

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

@@ -23,12 +23,12 @@ async function control () {
           Alpine.store('mapControl', {
             attrib: Alpine.$persist(true).as('mapControlAttrib'),
             centerPos: Alpine.$persist(true).as('mapControlCenterPos'),
-            fullscreen: Alpine.$persist(true).as('mapControlFullscreen'),
-            mousePos: Alpine.$persist(true).as('mapControlMousePos'),
+            fullscreen: Alpine.$persist(false).as('mapControlFullscreen'),
+            mousePos: Alpine.$persist(false).as('mapControlMousePos'),
             nav: Alpine.$persist(true).as('mapControlNav'),
-            globe: Alpine.$persist(true).as('mapControlGlobe'),
-            scale: Alpine.$persist(true).as('mapControlScale'),
-            geolocate: Alpine.$persist(true).as('mapControlGeolocate'),
+            // globe: Alpine.$persist(true).as('mapControlGlobe'),
+            scale: Alpine.$persist(false).as('mapControlScale'),
+            geolocate: Alpine.$persist(false).as('mapControlGeolocate'),
             ruler: Alpine.$persist(true).as('mapControlRuler'),
             search: Alpine.$persist(true).as('mapControlSearch')
           })

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

@@ -31,6 +31,7 @@ async function map () {
       this.params.attr['x-data'] = this.params.attr.id
       this.params.attr['@keyup'] = 'onKeyup'
       const mapOptions = await options.call(this, this.params)
+      const projection = this.params.attr.projection ?? 'mercator'
       this.block.reactive.push(`
         async windowLoad () {
           const mapOpts = ${jsonStringify(mapOptions, true)}
@@ -44,6 +45,7 @@ async function map () {
           Alpine.data('${this.params.attr.id}', () => {
             let map
             let wmaps
+            let projection = { type: '${projection}' }
             ${this.block.nonReactive.join('\n')}
             return {
               init () {
@@ -63,6 +65,7 @@ async function map () {
                 this.onMapStyle()
               },
               async onMapStyle () {
+                map.setProjection(projection)
                 ${this.block.mapStyle.join('\n')}
               },
               async onMissingImage (evt) {
@@ -85,6 +88,7 @@ async function map () {
               },
               async run (instance) {
                 map = instance
+                wmapsUtil.setMap(map, projection)
                 wmaps = new WaibuMaps(instance, this)
                 map.on('moveend', evt => {
                   Alpine.store('map').center = evt.target.getCenter().toArray()

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

@@ -22,7 +22,8 @@ async function wmapsBase () {
     }
 
     static controls = ['csrc', 'navigation-control', 'crlr', 'scale-control', 'attribution-control',
-      'fullscreen-control', 'geolocate-control', 'czbp', 'cmp', 'globe-control']
+      // 'fullscreen-control', 'geolocate-control', 'czbp', 'cmp', 'globe-control']
+      'fullscreen-control', 'geolocate-control', 'czbp', 'cmp']
 
     async getWmapsTemplate (html, type, defEmpty = '') {
       const { trim, isEmpty } = this.plugin.app.bajo.lib._