Merge pull request #18 from qazsato/fix_rotate

stop rotate while zooming
qazsato · Dec 7, 2024 · ac26efd · ac26efd
2 parents 4e7c66d + 859f718
commit ac26efd
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 28 deletions.
diff --git a/docs/index-srYCoeZP.js → docs/index-ByibBDP4.js b/docs/index-srYCoeZP.js → docs/index-ByibBDP4.js
diff --git a/docs/index.html b/docs/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/maplibre-gl-compass/compass.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>maplibre-gl-compass</title>
-    <script type="module" crossorigin src="/maplibre-gl-compass/index-srYCoeZP.js"></script>
+    <script type="module" crossorigin src="/maplibre-gl-compass/index-ByibBDP4.js"></script>
     <link rel="stylesheet" crossorigin href="/maplibre-gl-compass/index-C4Yj2jNw.css">
   </head>
   <body>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "maplibre-gl-compass",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "A heading-up compass for MapLibre GL JS",
   "type": "module",
   "files": [

diff --git a/src/maplibre-gl-compass.ts b/src/maplibre-gl-compass.ts
@@ -37,26 +37,26 @@ export class CompassControl implements IControl {
   constructor(options?: CompassControlOptions) {
     this.options = { ...defaultOptions, ...options }
     this.compass = new Compass()
+
     this.compass.on('deviceorientation', (event: CompassEvent) => {
-      if (!this.map) return
+      if (!this.map || event.heading === undefined) {
+        return
+      }
       this.currentEvent = event
+      this.compassButton.stopLoading()
       const heading = event.heading
+      const bearing = this.map.getBearing()
+      if (!this.map.isZooming() && Math.abs(heading - bearing) >= 1) {
+        this.map.setBearing(heading)
+      }
       if (this.options.debug) {
         this.updateDebugView()
       }
-      if (heading === undefined) {
-        return
-      }
-      const bearing = this.map.getBearing()
-      if (Math.abs(heading - bearing) >= 1) {
-        this.map?.setBearing(heading)
-      }
-      this.compassButton.stopLoading()
-
       if (this.compassCallback) {
         this.compassCallback(event)
       }
     })
+
     this.compass.on('error', (error: CompassError) => {
       this.disable()
       if (this.errorCallback) {
@@ -65,7 +65,14 @@ export class CompassControl implements IControl {
     })
 
     this.compassButton = new CompassButton(this.container)
-    this.compassButton.on('click', () => this.onClick())
+
+    this.compassButton.on('click', () => {
+      if (this.active) {
+        this.turnOff()
+      } else {
+        this.turnOn()
+      }
+    })
     if (this.options.debug) {
       this.debugView = new DebugView(this.container)
     }
@@ -79,6 +86,7 @@ export class CompassControl implements IControl {
         this.active = false
       }
     })
+
     return this.container
   }
 
@@ -138,14 +146,6 @@ export class CompassControl implements IControl {
     this.active = false
   }
 
-  private onClick() {
-    if (this.active) {
-      this.turnOff()
-    } else {
-      this.turnOn()
-    }
-  }
-
   private updateDebugView() {
     this.debugView?.update(this.currentEvent)
   }