Adjusted orientations for iPhone.

3dcitydb · Jun 30, 2017 · 6c69a13 · 6c69a13
1 parent c021d3b
commit 6c69a13
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 .gitignore
 data
 *.gitignore
+/nbproject/private/
diff --git a/3dwebclient/GPSController.js b/3dwebclient/GPSController.js
@@ -8,7 +8,7 @@
     function GPSController() {
         this._liveTrackingActivated = false;
         this._timer = undefined;
-        this._timerMiliseconds = 1000;
+        this._timerMiliseconds = 500;
         this._savedAlpha = undefined;
         this.createGPSButton();
     }
@@ -96,7 +96,7 @@
         if (navigator.geolocation) {
             navigator.geolocation.getCurrentPosition(showPosition, showError);
         } else {
-            alert("Geolocation is not supported by this browser.");
+            CitydbUtil.showAlertWindow("OK", "Error", "Geolocation is not supported by this browser.");
         }
 
         function showPosition(position) {
@@ -105,12 +105,14 @@
             function getLocation() {
                 if (window.DeviceOrientationEvent) {
                     window.addEventListener('deviceorientation', function auxOrientation(event) {
-                        // one-time event
-                        window.removeEventListener('deviceorientation', auxOrientation, false);
                         flyToLocationWithOrientation(position, event);
+                        setTimeout(function () {
+                            // one-time event
+                            window.removeEventListener('deviceorientation', auxOrientation, false);
+                        }, scope._timerMiliseconds);
                     }, false);
                 } else {
-                    alert("Exact geolocation is not supported by this device.");
+                    CitydbUtil.showAlertWindow("OK", "Error", "Exact geolocation is not supported by this device.");
                     flyToLocationWithOrientation(position, event);
                 }
             }
@@ -169,10 +171,10 @@
                 scope._savedAlpha = oriAlpha;
 
                 cesiumCamera.flyTo({
-                    destination: Cesium.Cartesian3.fromDegrees(position.coords.longitude, position.coords.latitude, 2),
+                    destination: Cesium.Cartesian3.fromDegrees(position.coords.longitude, position.coords.latitude, 150),
                     orientation: {
                         heading: oriAlpha,
-                        pitch: oriBeta,
+                        pitch: Cesium.Math.toRadians(-90),
                         roll: oriGamma
                     },
                     complete: function () {

diff --git a/3dwebclient/index.html b/3dwebclient/index.html
@@ -52,7 +52,7 @@
         <!-- GPS geolocation with device orientation in real-time -->
         <script src="GPSController.js"></script>
         <!-- Mobile utilities -->
-        <script type="text/javascript" src="Mobile.js"></script>
+        <script src="Mobile.js"></script>
 
         <style>
             @import url(../ThirdParty/Cesium/Widgets/widgets.css);