Merge pull request #217 from stadiamaps/browser-geolocaton-speed-fix

Browser geolocaton speed fix

update-release-version.sh

@@ -4,9 +4,19 @@ set -e
 set -u
 
 version=$1
+
+# Swift
 sed -i "" -E "s/(let releaseTag = \")[^\"]+(\")/\1$version\2/g" Package.swift
+
+# Android
 sed -i "" -E "s/(version = \")[^\"]+(\")/\1$version\2/g" android/build.gradle
+
+# Rust
 awk '{ if (!done && /version = \"/) { sub(/(version = \")[^\"]+(\")/, "version = \"" newVersion "\""); done=1 } print }' newVersion="$version" common/ferrostar/Cargo.toml > tmpfile && mv tmpfile common/ferrostar/Cargo.toml
 cd common && cargo check && cd ..
 
-git add Package.swift android/build.gradle common/Cargo.lock common/ferrostar/Cargo.toml
+# Web components
+sed -i "" -E "s/(\"version\": \")[^\"]+(\")/\1$version\2/g" web/package.json
+cd web && npm install && cd ..
+
+git add Package.swift android/build.gradle common/Cargo.lock common/ferrostar/Cargo.toml web/package.json web/package-lock.json

web/index.html

@@ -93,10 +93,10 @@
       }
 
       // Initialize Ferrostar and the control buttons
-      if ( document.readyState === "complete" ) {
-        onload();
-      } else {
+      if ( document.readyState === "loading" ) {
         document.addEventListener("DOMContentLoaded", onload);
+      } else {
+        onload();
       }
     </script>
   </body>

web/package.json

@@ -5,7 +5,7 @@
     "Jacob Fielding <[email protected]>",
     "Luke Seelenbinder <[email protected]>"
   ],
-  "version": "0.1.4",
+  "version": "0.9.2",
   "license": "BSD-3-Clause",
   "type": "module",
   "main": "./dist/ferrostar-webcomponents.js",

web/src/location.ts

@@ -53,15 +53,21 @@ export class BrowserLocationProvider {
         enableHighAccuracy: true,
       };
 
-      this.geolocationWatchId = navigator.geolocation.watchPosition((position) => {
-          this.lastLocation = {
+      this.geolocationWatchId = navigator.geolocation.watchPosition((position: GeolocationPosition) => {
+        let speed = null;
+        if (position.coords.speed) {
+          speed = {
+            value: position.coords.speed
+          }
+        }
+        this.lastLocation = {
             coordinates: { lat: position.coords.latitude, lng: position.coords.longitude },
             horizontalAccuracy: position.coords.accuracy,
             courseOverGround: {
               degrees: Math.floor(position.coords.heading || 0),
             },
             timestamp: position.timestamp,
-            speed: position.coords.speed,
+            speed: speed,
           };
 
           if (this.updateCallback) {