From 069c6b37c834c7db86a63f77e0d21f021b2ccb6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Vigh?= Date: Tue, 18 May 2021 18:06:02 +0200 Subject: [PATCH] MAPG-235 fixed bugs with displaying score and round --- public/static/js/game.js | 216 +++++++++++++++++---------------------- 1 file changed, 94 insertions(+), 122 deletions(-) diff --git a/public/static/js/game.js b/public/static/js/game.js index 3596486..0bb29de 100644 --- a/public/static/js/game.js +++ b/public/static/js/game.js @@ -295,72 +295,110 @@ const GameType = Object.freeze({'SINGLE': 0, 'MULTI': 1, 'CHALLENGE': 2}); return; } - Game.history = this.response.history; - - if (this.response.history !== undefined) { - for (var i = 0; i < this.response.history.length; ++i) { - var round = this.response.history[i]; - - if (round.result) { - Game.rounds.push({ position: round.position, guessPosition: round.result.guessPosition, realMarker: null, guessMarkers: [] }); - Game.addPositionToResultMap(true); - if (round.result.guessPosition) { - Game.addGuessPositionToResultMap(round.result.guessPosition, null, true); - } - Game.scoreSum += round.result.score; - - - if (round.allResults !== undefined) { - for (var j = 0; j < round.allResults.length; ++j) { - var result = round.allResults[j]; - if (result.guessPosition) { - Game.addGuessPositionToResultMap(result.guessPosition, result, true); - } - } - } - - } - } - } + Game.loadHistory(this.response.history); if (this.response.finished) { - // 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'); - } - - if (Game.guessMarker) { - Game.guessMarker.setMap(null); - Game.guessMarker = null; - } - - document.getElementById('guess').classList.add('result'); - - Game.map.setOptions({ - draggableCursor: 'grab' - }); - + Game.transitToResultMap(); Game.showSummary(); - document.getElementById('continueButton').style.display = 'none'; - return; - } - Game.panoId = this.response.place.panoId; - Game.pov = this.response.place.pov; + + } else { + + Game.panoId = this.response.place.panoId; + Game.pov = this.response.place.pov; + + Game.startNewRound(); + } document.getElementById('currentRound').innerHTML = String(Game.rounds.length) + '/' + String(Game.NUMBER_OF_ROUNDS); document.getElementById('currentScoreSum').innerHTML = String(Game.scoreSum) + '/' + String(Game.rounds.length * Game.MAX_SCORE); - - Game.startNewRound(); }); }, + transitToResultMap: function() { + // 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'); + } + + if (Game.guessMarker) { + Game.guessMarker.setMap(null); + Game.guessMarker = null; + } + + document.getElementById('guess').classList.add('result'); + + Game.map.setOptions({ + draggableCursor: 'grab' + }); + + if (Game.rounds.length === Game.NUMBER_OF_ROUNDS) { + document.getElementById('continueButton').style.display = 'none'; + document.getElementById('showSummaryButton').style.display = 'block'; + } else if (Game.type == GameType.MULTI) { + if (Game.multi.owner) { + if (!Game.readyToContinue) { + document.getElementById('continueButton').disabled = true; + } + } else { + document.getElementById('continueButton').style.display = 'none'; + } + } + }, + + loadHistory: function (history) { + if(!history) + return; + + Game.history = history; + + for (var i = 0; i < Game.rounds.length; ++i) { + var round = Game.rounds[i]; + + if (round.realMarker) { + round.realMarker.setMap(null); + } + for (var j = 0; j < round.guessMarkers.length; ++j) { + var guessMarker = round.guessMarkers[j]; + guessMarker.marker.setMap(null); + guessMarker.line.setMap(null); + if (guessMarker.info) { + guessMarker.info.close(); + } + } + } + Game.rounds = []; + + for (var i = 0; i < Game.history.length; ++i) { + var round = Game.history[i]; + + if (round.result) { + Game.rounds.push({ position: round.position, guessPosition: round.result.guessPosition, realMarker: null, guessMarkers: [] }); + Game.addPositionToResultMap(true); + if (round.result.guessPosition) { + Game.addGuessPositionToResultMap(round.result.guessPosition, null, true); + } + Game.scoreSum += round.result.score; + + + if(round.allResults !== undefined) { + for (var j = 0; j < round.allResults.length; ++j) { + var result = round.allResults[j]; + if (result.guessPosition) { + Game.addGuessPositionToResultMap(result.guessPosition, result, true); + } + } + } + } + } + }, + reset: function () { if (Game.guessMarker) { Game.guessMarker.setMap(null); @@ -542,25 +580,9 @@ const GameType = Object.freeze({'SINGLE': 0, 'MULTI': 1, 'CHALLENGE': 2}); }, showResultMap: function (result, resultBounds) { - // TODO: refactor - it is necessary for mobile - if (window.getComputedStyle(document.getElementById('guess')).visibility === 'hidden') { - document.getElementById('showGuessButton').click(); - } + + Game.transitToResultMap(); - if (Game.adaptGuess) { - document.getElementById('guess').classList.remove('adapt'); - } - - if (Game.guessMarker) { - Game.guessMarker.setMap(null); - Game.guessMarker = null; - } - - document.getElementById('guess').classList.add('result'); - - Game.map.setOptions({ - draggableCursor: 'grab' - }); Game.map.fitBounds(resultBounds); var distanceInfo = document.getElementById('distanceInfo'); @@ -579,19 +601,6 @@ const GameType = Object.freeze({'SINGLE': 0, 'MULTI': 1, 'CHALLENGE': 2}); var scoreBar = document.getElementById('scoreBar'); scoreBar.style.backgroundColor = scoreBarProperties.backgroundColor; scoreBar.style.width = scoreBarProperties.width; - - if (Game.rounds.length === Game.NUMBER_OF_ROUNDS) { - document.getElementById('continueButton').style.display = 'none'; - document.getElementById('showSummaryButton').style.display = 'block'; - } else if (roomId) { - if (Game.multi.owner) { - if (!Game.readyToContinue) { - document.getElementById('continueButton').disabled = true; - } - } else { - document.getElementById('continueButton').style.display = 'none'; - } - } }, guess: function () { @@ -783,43 +792,6 @@ const GameType = Object.freeze({'SINGLE': 0, 'MULTI': 1, 'CHALLENGE': 2}); }, showSummary: function () { - for (var i = 0; i < Game.rounds.length; ++i) { - var round = Game.rounds[i]; - - if (round.realMarker) { - round.realMarker.setMap(null); - } - for (var j = 0; j < round.guessMarkers.length; ++j) { - var guessMarker = round.guessMarkers[j]; - guessMarker.marker.setMap(null); - guessMarker.line.setMap(null); - if (guessMarker.info) { - guessMarker.info.close(); - } - } - } - Game.rounds = []; - - for (var i = 0; i < Game.history.length; ++i) { - var round = Game.history[i]; - Game.rounds.push({ position: round.position, guessPosition: round.result.guessPosition, realMarker: null, guessMarkers: [] }); - Game.addPositionToResultMap(true); - if (round.result.guessPosition) { - Game.addGuessPositionToResultMap(round.result.guessPosition, null, true); - } - Game.scoreSum += round.result.score; - - if(round.allResults !== undefined) { - for (var j = 0; j < round.allResults.length; ++j) { - var result = round.allResults[j]; - if (result.guessPosition) { - Game.addGuessPositionToResultMap(result.guessPosition, result, true); - } - } - } - } - - var distanceInfo = document.getElementById('distanceInfo'); distanceInfo.children[0].style.display = 'none'; distanceInfo.children[1].style.display = 'none';