- Change animation in view

- Add new effect on button - Bug fix
Kodo-kakaku · Sep 4, 2023 · 01bafee · 01bafee
1 parent e53744c
commit 01bafee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/luasrc/view/gpoint/js/js.htm b/luasrc/view/gpoint/js/js.htm
@@ -14,25 +14,12 @@
     }
 
     function flyTo(location, z, done) {
-        var duration = 5000;
-        var zoom = z;
-        var parts = 2;
-        var called = false;
-
-        function callback(complete) {
-            --parts;
-            if (called) {
-                return;
-            }
-            if (parts === 0 || !complete) {
-                called = true;
-                done(complete);
-            }
-        }
-
-        view.animate({center: location, duration: duration,}, callback);
-        view.animate({zoom: zoom - 1, duration: duration / 2,},
-            {zoom: zoom, duration: duration / 2,}, callback);
+        const duration = 2500;
+        view.animate({
+            center: location,
+            duration: duration,
+            zoom: z,
+        });
     }
 
     function getAddress(lat, lon) {
@@ -147,7 +134,7 @@
 
     var lon = 55.7522;
     var lat = 37.6156;
-    var zoom = 3;
+    var zoom = 1;
     var spinerStatus = true;
     var CIRCLE_STATUS = true;
 
@@ -187,7 +174,7 @@
 
     var view = new ol.View({
         center: coordinate,
-        zoom: 3,
+        zoom: 1,
     });
 
     var map = new ol.Map({

diff --git a/luasrc/view/gpoint/overview.htm b/luasrc/view/gpoint/overview.htm
@@ -112,7 +112,7 @@ <h3><%:Details:%></h3>
                 }
             }
 
-            if (!geopoint.warning.geofence[0]) {
+            if (!geopoint.warning.app[0] && !geopoint.warning.geofence[0]) {
                 addCircle(geopoint.geofence);
             }