Merge pull request 'MAPG-226 change remaining time calculation' (#21) from feature/MAPG-226-change-timeout-algorithm into develop

Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/21

multi/index.js

@@ -5,7 +5,7 @@ process.title = 'mapguesser-multi';
 class MultiGame {
     static ROUND_TIMEOUT_DEFAULT = 120000;
     static ROUND_TIMEOUT_MINIMUM = 15000;
-    static ROUND_TIMEOUT_DIVIDER = 2;
+    static ROUND_TIMEOUT_DIVIDER = 1.5;
     static ROUND_TIMEOUT_OFFSET = 500;
 
     constructor() {
@@ -155,7 +155,7 @@ class MultiGame {
         } else {
             round.timeout = round.timeout - (new Date() - round.timeoutStarted);
             if (round.timeout > MultiGame.ROUND_TIMEOUT_DIVIDER * MultiGame.ROUND_TIMEOUT_MINIMUM) {
-                round.timeout = round.timeout / MultiGame.ROUND_TIMEOUT_DIVIDER;
+                round.timeout = Math.round(round.timeout / MultiGame.ROUND_TIMEOUT_DIVIDER);
             } else if (round.timeout > MultiGame.ROUND_TIMEOUT_MINIMUM) {
                 round.timeout = MultiGame.ROUND_TIMEOUT_MINIMUM;
             }

public/static/js/game.js

@@ -202,11 +202,6 @@
                     return;
                 }
 
-                // TODO: refactor - it is necessary for mobile
-                if (window.getComputedStyle(document.getElementById('guess')).visibility === 'hidden') {
-                    document.getElementById('showGuessButton').click();
-                }
-
                 document.getElementById('guessButton').disabled = true;
                 document.getElementById('panoCover').style.visibility = 'visible';
 
@@ -466,6 +461,11 @@
         },
 
         showResultMap: function (result, resultBounds) {
+            // TODO: refactor - it is necessary for mobile
+            if (window.getComputedStyle(document.getElementById('guess')).visibility === 'hidden') {
+                document.getElementById('showGuessButton').click();
+            }
+
             if (Game.adaptGuess) {
                 document.getElementById('guess').classList.remove('adapt');
             }