Merge pull request 'MAPG-203 fix wrong variable name' (#11) from bugfix/MAPG-203-fix-condition-in-js into develop

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

.env.example

@@ -1,3 +1,4 @@
+APP_NAME=MapGuesser
 DEV=1
 DB_HOST=mariadb
 DB_USER=mapguesser
@@ -5,3 +6,16 @@ DB_PASSWORD=mapguesser
 DB_NAME=mapguesser
 GOOGLE_MAPS_SERVER_API_KEY=your_google_maps_server_api_key
 GOOGLE_MAPS_JS_API_KEY=your_google_maps_js_api_key
+LEAFLET_TILESERVER_URL=a_leaflet_compatible_tileserver_url
+LEAFLET_TILESERVER_ATTRIBUTION=attribution_to_be_shown_for_tiles
+STATIC_ROOT=/static
+MAIL_FROM=mapguesser@mapguesser-dev.ch
+MAIL_HOST=mail
+MAIL_PORT=2500
+GOOGLE_OAUTH_CLIENT_ID=your_google_oauth_client_id
+GOOGLE_OAUTH_CLIENT_SECRET=your_google_oauth_client_secret
+GOOGLE_ANALITICS_ID=your_google_analytics_id
+MULTI_INTERNAL_HOST=multi
+MULTI_INTERNAL_PORT=5000
+MULTI_WS_URL=mapguesser-dev.ch:8090
+MULTI_WS_PORT=8090

.gitignore

@@ -1,3 +1,4 @@
 .env
 installed
 vendor
+node_modules

.vscode/launch.json

@@ -9,6 +9,14 @@
             "pathMappings": {
                 "/var/www/mapguesser": "${workspaceRoot}",
             }
+        },
+        {
+            "name": "Listen for NodeJS Inspector in Docker",
+            "type": "node",
+            "request": "attach",
+            "port": 9229,
+            "localRoot": "${workspaceFolder}",
+            "remoteRoot": "/var/www/mapguesser"
         }
     ]
 }

README.md

@@ -1,5 +1,71 @@
 # MapGuesser
 
-This is the MapGuesser Application project.
+This is the MapGuesser Application project. This is a game about guessing where you are based on a street view panorama - inspired by existing applications.
 
-License: GNU AGPL 3.0
+## Installation
+
+### Clone the Git repository
+
+The first step is obviously cloning the repository to your machine:
+
+```
+git clone https://gitea.e5tv.hu/esoko/mapguesser.git
+```
+
+All the commands listed here should be executed from the repository root.
+
+### (Optional) Setup Docker stack
+
+The easiest way to build up a fully working application with web server and database is to use Docker Compose with the included `docker-compose.yml`.
+
+All you have to do is executing the following command:
+
+```
+docker-compose up -d
+```
+
+Attach shell to the container of `mapguesser_app`. All of the following commands should be executed there.
+
+**If you don't use the Docker stack you need to install your environment manually. Check `docker-compose.yml` and `docker/Dockerfile` to see the system requirements.**
+
+### Initialize project
+
+This command installes all of the Composer requirements and creates a copy of the example `.env` file.
+
+```
+composer create-project
+```
+
+### Set environment variables
+
+The `.env` file contains several environment variables that are needed by the application to work properly. These should be configured for your environment.
+
+**You should set here the API keys that enable playing the game. Without these API keys the application cannot work well. To get Google API keys visit this page: https://console.developers.google.com/**
+
+One very important variable is `DEV`. This indicates that the application operates in development (staging) and not in produciton mode.
+
+If you install the application in the Docker stack for development (staging) environment, only the variables for external dependencies (API keys, map attribution, etc.) should be adapted. All other variables (for DB connection, static root, mailing, etc.) are fine with the default value.
+
+### (Production only) Create cron job
+
+To maintain database (delete inactive users, old sessions etc.), the command `db:maintain` should be regularly executed. It is recommened to create a cron job that runs every hour:
+
+```
+0 * * * * /path/to/your/installation/mapg db:maintain >>/var/log/cron-mapguesser.log 2>&1
+```
+
+### Finalize installation
+
+After you set the environment variables in the `.env` file, execute the following command:
+
+```
+scripts/install.sh
+```
+
+**And you are done!** The application is ready to use and develop.
+
+If you installed it in the Docker stack, you can reach it on http://localhost. The mails that are sent by the application can be found on http://localhost:8080/. If needed, the database server can be directly reached on localhost:3306.
+
+---
+
+*License: **GNU AGPL 3.0**. Full license text can be found in file `LICENSE`.*

bitbucket-pipelines.yml

@@ -0,0 +1,26 @@
+image: php:7.4.7-cli-buster
+
+pipelines:
+    default:
+        - step:
+              name: Unit Testing
+              caches:
+                  - composer
+              artifacts:
+                  - unit_test_results.xml
+              script:
+                  - apt-get update && apt-get install -y unzip
+                  - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+                  - composer install
+                  - vendor/bin/phpunit --log-junit unit_test_results.xml --testdox tests
+        - step:
+              name: Static Code Analysis
+              caches:
+                  - composer
+              artifacts:
+                  - static_code_analysis_results.json
+              script:
+                  - apt-get update && apt-get install -y unzip
+                  - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+                  - composer install
+                  - php -d memory_limit=1G vendor/bin/phpstan analyse -c phpstan.neon --error-format=prettyJson > static_code_analysis_results.json

cache/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

composer.json

@@ -4,9 +4,15 @@
   "description": "MapGuesser Application",
   "license": "GNU GPL 3.0",
   "require": {
-    "vlucas/phpdotenv": "^4.1"
+    "vlucas/phpdotenv": "^4.1",
+    "symfony/console": "^5.1",
+    "phpmailer/phpmailer": "^6.1",
+    "fzaninotto/faker": "^1.9"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^9",
+    "phpstan/phpstan": "^0.12.32"
   },
-  "require-dev": {},
   "autoload": {
     "psr-4": {
       "MapGuesser\\": "src"

database/migrations/data/20200602_2306_migrations.php

@@ -0,0 +1 @@
+<?php //empty on purpose

database/migrations/data/20200612_2124_map_area.php

@@ -0,0 +1,20 @@
+<?php
+
+use MapGuesser\Database\Query\Modify;
+use MapGuesser\Database\Query\Select;
+use MapGuesser\Interfaces\Database\IResultSet;
+use MapGuesser\Util\Geo\Bounds;
+
+$select = new Select(\Container::$dbConnection, 'maps');
+$select->columns(['id', 'bound_south_lat', 'bound_west_lng', 'bound_north_lat', 'bound_east_lng']);
+
+$result = $select->execute();
+
+while ($map = $result->fetch(IResultSet::FETCH_ASSOC)) {
+    $bounds = Bounds::createDirectly($map['bound_south_lat'], $map['bound_west_lng'], $map['bound_north_lat'], $map['bound_east_lng']);
+
+    $modify = new Modify(\Container::$dbConnection, 'maps');
+    $modify->setId($map['id']);
+    $modify->set('area', $bounds->calculateApproximateArea());
+    $modify->save();
+}

database/migrations/data/20200614_1328_user_confirmation.php

@@ -0,0 +1,17 @@
+<?php
+
+use MapGuesser\Database\Query\Modify;
+use MapGuesser\Database\Query\Select;
+use MapGuesser\Interfaces\Database\IResultSet;
+
+$select = new Select(\Container::$dbConnection, 'users');
+$select->columns(['id']);
+
+$result = $select->execute();
+
+while ($map = $result->fetch(IResultSet::FETCH_ASSOC)) {
+    $modify = new Modify(\Container::$dbConnection, 'users');
+    $modify->setId($map['id']);
+    $modify->set('active', true);
+    $modify->save();
+}

database/migrations/structure/20200602_2306_migrations.sql

@@ -0,0 +1,6 @@
+CREATE TABLE `migrations` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `migration` varchar(255) NOT NULL,
+  `type` enum('structure', 'data') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

database/migrations/structure/20200602_2331_geo_digits.sql

@@ -0,0 +1,17 @@
+ALTER TABLE
+  `maps`
+MODIFY
+  `bound_south_lat` decimal(9, 7) NOT NULL,
+MODIFY
+  `bound_west_lng` decimal(10, 7) NOT NULL,
+MODIFY
+  `bound_north_lat` decimal(9, 7) NOT NULL,
+MODIFY
+  `bound_east_lng` decimal(10, 7) NOT NULL;
+
+ALTER TABLE
+  `places`
+MODIFY
+  `lat` decimal(9, 7) NOT NULL,
+MODIFY
+  `lng` decimal(10, 7) NOT NULL;

database/migrations/structure/20200603_2135_panoid_cache.sql

@@ -0,0 +1,6 @@
+ALTER TABLE
+  `places`
+ADD
+  `pano_id_cached` varchar(255) NULL DEFAULT NULL,
+ADD
+  `pano_id_cached_timestamp` timestamp NULL DEFAULT NULL;

database/migrations/structure/20200606_2352_users.sql

@@ -0,0 +1,8 @@
+CREATE TABLE `users` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `email` varchar(100) NOT NULL,
+  `password` varchar(60) NOT NULL,
+  `type` enum('user', 'admin') NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `email` (`email`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

database/migrations/structure/20200612_2124_map_area.sql

@@ -0,0 +1,4 @@
+ALTER TABLE
+  `maps`
+ADD
+  `area` decimal(13, 4) NOT NULL DEFAULT 0.0;

database/migrations/structure/20200613_1549_sessions.sql

@@ -0,0 +1,6 @@
+CREATE TABLE `sessions` (
+  `id` varchar(64) NOT NULL,
+  `data` text NOT NULL,
+  `updated` timestamp NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

database/migrations/structure/20200614_1328_user_confirmation.sql

@@ -0,0 +1,14 @@
+CREATE TABLE `user_confirmations` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `token` varchar(64) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `user_id` (`user_id`),
+  KEY `token` (`token`),
+  CONSTRAINT `user_confirmations_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+
+ALTER TABLE
+  `users`
+ADD
+  `active` tinyint(1) NOT NULL DEFAULT 0;

database/migrations/structure/20200620_2113_google_login.sql

@@ -0,0 +1,8 @@
+ALTER TABLE
+  `users`
+ADD
+  `google_sub` varchar(255) CHARACTER SET ascii COLLATE ascii_bin NULL DEFAULT NULL,
+ADD
+  UNIQUE `google_sub` (`google_sub`),
+MODIFY
+  `password` varchar(60) NULL DEFAULT NULL;

database/migrations/structure/20200704_0005_pov_for_places.sql

@@ -0,0 +1,8 @@
+ALTER TABLE
+  `places`
+ADD
+  `pov_heading` decimal(6, 3) NOT NULL DEFAULT 0.0,
+ADD
+  `pov_pitch` decimal(5, 3) NOT NULL DEFAULT 0.0,
+ADD
+  `pov_zoom` decimal(5, 4) NOT NULL DEFAULT 0.0;

database/migrations/structure/20200704_1954_password_forgotten.sql

@@ -0,0 +1,10 @@
+CREATE TABLE `user_password_resetters` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `token` varchar(32) CHARACTER SET ascii NOT NULL,
+  `expires` timestamp NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `user_id` (`user_id`),
+  KEY `token` (`token`),
+  CONSTRAINT `user_password_resetters_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

database/migrations/structure/20200705_0118_resend_activation.sql

@@ -0,0 +1,5 @@
+UPDATE `user_confirmations` SET token=SUBSTRING(token, 1, 32);
+
+ALTER TABLE `user_confirmations`
+  ADD `last_sent` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  MODIFY `token` varchar(32) CHARACTER SET ascii NOT NULL;

database/migrations/structure/20200705_0218_fix_timestamp_onupdate.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `sessions`
+  MODIFY `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;

database/migrations/structure/20200705_0219_redefine_tokens.sql

@@ -0,0 +1,4 @@
+UPDATE `sessions` SET id=SUBSTRING(id, 1, 32);
+
+ALTER TABLE `sessions`
+  MODIFY `id` varchar(32) CHARACTER SET ascii NOT NULL;

database/migrations/structure/20200706_1236_user_created.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `users`
+  ADD `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;

database/migrations/structure/20210318_2136_multiplayer.sql

@@ -0,0 +1,9 @@
+CREATE TABLE `multi_rooms` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `room_id` varchar(6) NOT NULL,
+  `state` text NOT NULL,
+  `members` text NOT NULL,
+  `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `room_id` (`room_id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

docker-compose.yml

@@ -1,15 +1,27 @@
 version: '3'
 services:
     app:
-        build: ./docker
+        build:
+            context: ./docker
+            dockerfile: Dockerfile-app
         ports:
             - 80:80
         volumes:
             - .:/var/www/mapguesser
-        links:
-            - 'mariadb'
+    multi:
+        build:
+            context: ./docker
+            dockerfile: Dockerfile-multi
+        ports:
+            - 5000:5000
+            - 8090:8090
+            - 9229:9229
+        volumes:
+            - .:/var/www/mapguesser
     mariadb:
-        image: mariadb:10.1
+        image: mariadb:10.3
+        ports:
+            - 3306:3306
         volumes:
             - mysql:/var/lib/mysql
         environment:
@@ -17,5 +29,10 @@ services:
             MYSQL_DATABASE: 'mapguesser'
             MYSQL_USER: 'mapguesser'
             MYSQL_PASSWORD: 'mapguesser'
+    mail:
+        image: marcopas/docker-mailslurper:latest
+        ports:
+            - 8080:8080
+            - 8085:8085
 volumes:
     mysql:

docker/Dockerfile-app

@@ -4,8 +4,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 # Install Nginx, PHP and further necessary packages
 RUN apt update --fix-missing
-RUN apt install -y curl git mariadb-client nginx \
-    php-apcu php-xdebug php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip
+RUN apt install -y curl git unzip mariadb-client nginx \
+    php-apcu php-xdebug php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php7.4-xml
 
 # Configure Nginx with PHP
 RUN mkdir -p /run/php
@@ -21,7 +21,7 @@ RUN ./install-composer.sh
 # Install Node.js and required packages
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
 RUN apt install -y nodejs
-RUN npm install -g uglify-js clean-css-cli svgo
+RUN npm install -g uglify-js clean-css-cli svgo yarn
 
 EXPOSE 80
 VOLUME /var/www/mapguesser

docker/Dockerfile-multi

@@ -0,0 +1,16 @@
+FROM ubuntu:focal
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# Install necessary packages
+RUN apt update --fix-missing
+RUN apt install -y curl build-essential
+
+# Install Node.js and required packages
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
+RUN apt install -y nodejs
+
+VOLUME /var/www/mapguesser
+WORKDIR /var/www/mapguesser
+
+ENTRYPOINT /usr/bin/node --inspect=0.0.0.0:9229 multi

mail/password-reset.html

@@ -0,0 +1,13 @@
+Hi,
+<br><br>
+You recently requested password reset on {{APP_NAME}} with this email address ({{EMAIL}}).
+To reset the password to your account, please click on the following link:<br>
+<a href="{{RESET_LINK}}" title="Reset password">{{RESET_LINK}}</a>
+<br><br>
+You can reset your password with this link util {{EXPIRES}}.
+<br><br>
+If you did not requested password reset, no further action is required, your account is not touched.
+<br><br>
+Regards,<br>
+{{APP_NAME}}<br>
+<a href="{{BASE_URL}}" title="{{APP_NAME}}">{{BASE_URL}}</a>

mail/signup-noconfirm.html

@@ -0,0 +1,9 @@
+Hi,
+<br><br>
+You recently signed up on {{APP_NAME}} with this Google account ({{EMAIL}}).
+<br><br>
+Have fun on {{APP_NAME}}!
+<br><br>
+Regards,<br>
+{{APP_NAME}}<br>
+<a href="{{BASE_URL}}" title="{{APP_NAME}}">{{BASE_URL}}</a>

mail/signup.html

@@ -0,0 +1,18 @@
+Hi,
+<br><br>
+You recently signed up on {{APP_NAME}} with this email address ({{EMAIL}}).
+To activate your account, please click on the following link:<br>
+<a href="{{ACTIVATE_LINK}}" title="Account activation">{{ACTIVATE_LINK}}</a>
+<br><br>
+You can activate your account until {{ACTIVATABLE_UNTIL}}.
+If you don't activate your account, your email address will be permanently deleted after this point of time.
+<br><br>
+If you did not sign up on {{APP_NAME}} or changed your mind, no further action is required.
+However if you want to immediately delete your email address, please click on the following link:<br>
+<a href="{{CANCEL_LINK}}" title="Sign up cancellation">{{CANCEL_LINK}}</a>
+<br><br>
+Have fun on {{APP_NAME}}!
+<br><br>
+Regards,<br>
+{{APP_NAME}}<br>
+<a href="{{BASE_URL}}" title="{{APP_NAME}}">{{BASE_URL}}</a>

main.php

@@ -1,27 +1,23 @@
 <?php
 
+define('SCRIPT_STARTED', hrtime(true));
+
 require 'vendor/autoload.php';
 
 const ROOT = __DIR__;
+const VERSION = '';
+const REVISION = '';
+const REVISION_DATE = '';
 
 $dotenv = Dotenv\Dotenv::createImmutable(ROOT);
 $dotenv->load();
 
-if (!empty($_ENV['DEV'])) {
-    error_reporting(E_ALL);
-
-    ini_set('display_errors', '1');
-} else {
-    ini_set('display_errors', '0');
-}
-
 class Container
 {
     static MapGuesser\Interfaces\Database\IConnection $dbConnection;
     static MapGuesser\Routing\RouteCollection $routeCollection;
+    static MapGuesser\Interfaces\Session\ISessionHandler $sessionHandler;
+    static MapGuesser\Interfaces\Request\IRequest $request;
 }
 
 Container::$dbConnection = new MapGuesser\Database\Mysql\Connection($_ENV['DB_HOST'], $_ENV['DB_USER'], $_ENV['DB_PASSWORD'], $_ENV['DB_NAME']);
-Container::$routeCollection = new MapGuesser\Routing\RouteCollection();
-
-session_start();

mapg

@@ -0,0 +1,13 @@
+#!/usr/bin/env php
+<?php
+
+require 'main.php';
+
+$app = new Symfony\Component\Console\Application('MapGuesser Console', '');
+
+$app->add(new MapGuesser\Cli\MigrateDatabaseCommand());
+$app->add(new MapGuesser\Cli\AddUserCommand());
+$app->add(new MapGuesser\Cli\LinkViewCommand());
+$app->add(new \MapGuesser\Cli\MaintainDatabaseCommand());
+
+$app->run();

multi/index.js

@@ -0,0 +1,292 @@
+'use strict';
+
+process.title = 'mapguesser-multi';
+
+class State {
+    static OPEN = 1;
+    static PLACE_RECEIVED = 2;
+    static GUESS_SENT = 3;
+}
+
+class MultiGame {
+    constructor() {
+        this.rooms = new Map();
+    }
+
+    cleanupRooms() {
+        this.rooms.forEach(function (room, roomId) {
+            var lastValidDate = new Date(new Date().getTime() - 7 * 24 * 60 * 60 * 1000);
+
+            if (room.updated < lastValidDate) {
+                this.rooms.delete(roomId);
+            }
+        });
+    }
+
+    connectToRoom(roomId, token, connection) {
+        if (!this.rooms.has(roomId) || !this.rooms.get(roomId).members.has(token)) {
+            return;
+        }
+
+        var room = this.rooms.get(roomId)
+        var member = room.members.get(token);
+        member.connection = connection;
+
+        this._sendInitialData(room, member);
+    }
+
+    createRoom(roomId) {
+        this.rooms.set(roomId, { members: new Map(), rounds: [], currentRound: -1, updated: new Date() });
+    }
+
+    joinRoom(roomId, token, userName) {
+        if (!this.rooms.has(roomId)) {
+            console.error('Room does not exist!')
+            return;
+        }
+
+        var room = this.rooms.get(roomId);
+        room.updated = new Date();
+
+        if (room.members.has(token)) {
+            return;
+        }
+
+        var data = { userName: userName };
+        var self = this;
+        room.members.forEach(function (member) {
+            self._sendToMember(member, 'member_joined', data);
+        });
+
+        room.members.set(token, { userName: userName, state: State.OPEN, connection: null });
+    }
+
+    startGame(roomId, places) {
+        if (!this.rooms.has(roomId)) {
+            //TODO: send something back
+            console.log('Room does not exist!')
+            return;
+        }
+
+        var room = this.rooms.get(roomId);
+        room.updated = new Date();
+
+        var rounds = [];
+        places.forEach(function (place) {
+            rounds.push({ place: place, results: new Map() })
+        });
+
+        room.rounds = rounds;
+
+        this.nextRound(roomId, 0);
+    }
+
+    guess(roomId, token, guessPosition, distance, score) {
+        if (!this.rooms.has(roomId)) {
+            //TODO: send something back
+            console.log('Room does not exist!')
+            return;
+        }
+
+        var room = this.rooms.get(roomId);
+        room.updated = new Date();
+
+        var round = room.rounds[room.currentRound];
+        var member = this.rooms.get(roomId).members.get(token);
+
+        this._sendResultsUntilNow(room, member);
+
+        round.results.set(member.userName, { guessPosition: guessPosition, distance: distance, score: score });
+        member.state = State.GUESS_SENT;
+
+        this._broadcastGuess(room, member.userName, guessPosition, distance, score);
+    }
+
+    nextRound(roomId, currentRound) {
+        if (!this.rooms.has(roomId)) {
+            //TODO: send something back
+            console.log('Room does not exist!')
+            return;
+        }
+
+        var room = this.rooms.get(roomId);
+        room.updated = new Date();
+
+        room.currentRound = currentRound;
+
+        var round = room.rounds[room.currentRound];
+
+        var data = {};
+        data.place = { panoId: round.place.panoId, pov: round.place.pov };
+
+        if (room.currentRound > 0) {
+            data.result = { position: room.rounds[room.currentRound - 1].place.position };
+        }
+
+        var self = this;
+        room.members.forEach(function (member) {
+            self._sendToMember(member, 'new_round', data);
+
+            member.state = State.PLACE_RECEIVED;
+        });
+    }
+
+    _sendInitialData(room, member) {
+        var data = {};
+
+        if (room.currentRound >= 0) {
+            data.place = room.rounds[room.currentRound].place;
+        }
+
+        data.history = [];
+        for (var i = 0; i < room.currentRound; ++i) {
+            var round = room.rounds[i];
+            var result;
+            if (round.results.has(member.userName)) {
+                result = round.results.get(member.userName);
+            } else {
+                result = { guessPosition: null, distance: null, score: 0 };
+            }
+
+            data.history.push({
+                position: round.place.position,
+                guessPosition: result.guessPosition,
+                distance: result.distance,
+                score: result.score
+            });
+        }
+
+        data.members = [];
+        room.members.forEach(function (currentMember) {
+            data.members.push({ userName: currentMember.userName, me: member === currentMember });
+        });
+
+        this._sendToMember(member, 'initialize', data);
+    }
+
+    _sendResultsUntilNow(room, member) {
+        if (member.state !== State.GUESS_SENT) {
+            return;
+        }
+
+        var round = room.rounds[room.currentRound];
+
+        var results = [];
+        round.results.forEach(function (result, userName) {
+            results.push({ userName: userName, guessPosition: result.guessPosition, distance: result.distance, score: result.score });
+        });
+
+        this._sendToMember(member, 'results', results);
+    }
+
+    _broadcastGuess(room, userName, guessPosition, distance, score) {
+        var data = { userName: userName, guessPosition: guessPosition, distance: distance, score: score };
+
+        room.members.forEach(function (member) {
+            if (!member.state !== State.GUESS_SENT) {
+                return;
+            }
+
+            this._sendToMember(member, 'guess', data);
+        });
+    }
+
+    _sendToMember(member, type, data) {
+        if (!member.connection) {
+            return;
+        }
+
+        if (member.connection.readyState !== ws.OPEN) {
+            member.connection = null;
+            return;
+        }
+
+        member.connection.send(JSON.stringify({ type: type, data: data }));
+    }
+}
+
+require('dotenv').config();
+
+var
+    net = require('net'),
+    ws = require('ws');
+
+var multiGame = new MultiGame();
+
+//TODO: following should be in a separate class/function
+
+var tcpServer = net.createServer(function (socket) {
+    socket.on('data', function (data) {
+        try {
+            data = JSON.parse(data);
+        } catch (e) {
+            console.error('Cannot parse data: ' + data);
+            return;
+        }
+
+        switch (data.func) {
+            case 'create_room':
+                multiGame.createRoom(data.args.roomId);
+
+                break;
+
+            case 'join_room':
+                multiGame.joinRoom(data.args.roomId, data.args.token, data.args.userName);
+
+                break;
+
+            case 'start_game':
+                multiGame.startGame(data.args.roomId, data.args.places);
+
+                break
+
+            case 'guess':
+                multiGame.guess(data.args.roomId, data.args.token, data.args.guessPosition, data.args.distance, data.args.score);
+
+                break;
+
+            case 'next_round':
+                multiGame.nextRound(data.args.roomId, data.args.currentRound);
+
+                break;
+        }
+
+        socket.write('OK');
+        socket.end();
+    });
+});
+tcpServer.on('listening', function () {
+    console.log('[INFO] TCP server started');
+});
+tcpServer.listen(process.env.MULTI_INTERNAL_PORT);
+
+var wsServer = new ws.Server({ port: process.env.MULTI_WS_PORT });
+wsServer.on('connection', function (connection, request) {
+    console.log('[INFO] New WS connection: ' + request.connection.remoteAddress);
+
+    connection.on('message', function (data) {
+        try {
+            data = JSON.parse(data);
+        } catch (e) {
+            console.error('Cannot parse data: ' + data);
+            return;
+        }
+
+        switch (data.func) {
+            case 'connect_to_room':
+                multiGame.connectToRoom(data.args.roomId, data.args.token, connection);
+                break;
+        }
+    });
+
+    connection.on('close', function () {
+        console.log('[INFO] WS connection ended: ' + request.connection.remoteAddress);
+    });
+});
+wsServer.on('listening', function () {
+    console.log('[INFO] WS server started');
+});
+
+setInterval(function () {
+    multiGame.cleanupRooms();
+}, 24 * 60 * 60 * 1000);

multi/package-lock.json

@@ -0,0 +1,17 @@
+{
+    "name": "mapguesser-multi",
+    "requires": true,
+    "lockfileVersion": 1,
+    "dependencies": {
+        "dotenv": {
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+            "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
+        },
+        "ws": {
+            "version": "7.4.4",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
+            "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="
+        }
+    }
+}

multi/package.json

@@ -0,0 +1,13 @@
+{
+    "name": "mapguesser-multi",
+    "version": "",
+    "description": "MapGuesser Application - Multiplayer",
+    "main": "index.js",
+    "dependencies": {
+        "dotenv": "^8.2.0",
+        "ws": "^7.4.4"
+    },
+    "scripts": {},
+    "author": "Pőcze Bence <bence@pocze.ch>",
+    "license": "GNU AGPL 3.0"
+}

phpstan.neon

@@ -0,0 +1,9 @@
+parameters:
+    level: 5
+    checkMissingIterableValueType: false
+    paths:
+        - main.php
+        - mapg
+        - web.php
+        - src
+        - tests

public/index.php

@@ -1,9 +1,7 @@
 <?php
 
-require '../main.php';
+require '../web.php';
 
-// very basic routing
-$host = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['SERVER_NAME'];
 $method = strtolower($_SERVER['REQUEST_METHOD']);
 $url = substr($_SERVER['REQUEST_URI'], strlen('/'));
 if (($pos = strpos($url, '?')) !== false) {
@@ -11,29 +9,45 @@ if (($pos = strpos($url, '?')) !== false) {
 }
 $url = rawurldecode($url);
 
-Container::$routeCollection->get('index', '', [MapGuesser\Controller\HomeController::class, 'getIndex']);
-Container::$routeCollection->get('maps', 'maps', [MapGuesser\Controller\MapsController::class, 'getMaps']);
-Container::$routeCollection->group('game', function (MapGuesser\Routing\RouteCollection $routeCollection) {
-    $routeCollection->get('game', '{mapId}', [MapGuesser\Controller\GameController::class, 'getGame']);
-    $routeCollection->get('game-json', '{mapId}/json', [MapGuesser\Controller\GameController::class, 'getGameJson']);
-    $routeCollection->get('position-json', '{mapId}/position.json', [MapGuesser\Controller\PositionController::class, 'getPosition']);
-    $routeCollection->post('guess-json', '{mapId}/guess.json', [MapGuesser\Controller\PositionController::class, 'evaluateGuess']);
-});
-
-$match = Container::$routeCollection->match($method, explode('/', $url));
+$match = Container::$routeCollection->match($method, $url == '' ? [] : explode('/', $url));
 
 if ($match !== null) {
     list($route, $params) = $match;
 
-    $response = $route->callController($params);
+    Container::$request->setParsedRouteParams($params);
 
-    if ($response instanceof MapGuesser\Interfaces\Response\IContent) {
-        header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
-        echo $response->render();
-    } elseif ($response instanceof MapGuesser\Interfaces\Response\IRedirect) {
-        header('Location: ' . $host . '/' . $response->getUrl(), true, $response->getHttpCode());
+    $handler = $route->getHandler();
+    $controller = new $handler[0](Container::$request);
+
+    if ($controller instanceof MapGuesser\Interfaces\Authorization\ISecured) {
+        $authorized = $controller->authorize();
+    } else {
+        $authorized = true;
+    }
+
+    if ($method === 'post' && Container::$request->post('anti_csrf_token') !== Container::$request->session()->get('anti_csrf_token')) {
+        $content = new MapGuesser\Response\JsonContent(['error' => 'no_valid_anti_csrf_token']);
+        header('Content-Type: text/html; charset=UTF-8', true, 403);
+        $content->render();
+        return;
+    }
+
+    if ($authorized) {
+        $response = call_user_func([$controller, $handler[1]]);
+
+        if ($response instanceof MapGuesser\Interfaces\Response\IContent) {
+            header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
+            $response->render();
+
+            return;
+        } elseif ($response instanceof MapGuesser\Interfaces\Response\IRedirect) {
+            header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
+
+            return;
+        }
     }
-} else {
-    header('Content-Type: text/html; charset=UTF-8', true, 404);
-    require ROOT . '/views/error/404.php';
 }
+
+$content = new MapGuesser\Response\HtmlContent('error/404');
+header('Content-Type: text/html; charset=UTF-8', true, 404);
+$content->render();

public/static/.gitignore

@@ -0,0 +1 @@
+node_modules

public/static/css/game.css

@@ -0,0 +1,195 @@
+#panorama {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 1;
+}
+
+#panoCover {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #000000;
+    opacity: 0.5;
+    z-index: 3;
+}
+
+#guess {
+    position: absolute;
+    bottom: 30px;
+    right: 20px;
+    z-index: 2;
+}
+
+#guess.result {
+    z-index: 4;
+}
+
+#guess>#continueButtonContainer {
+    display: none;
+}
+
+#guess.result>#closeGuessButtonContainer, #guess.result>#guessButtonContainer {
+    display: none;
+}
+
+#guess.result>#continueButtonContainer {
+    display: block;
+}
+
+#map {
+    width: 100%;
+    border-radius: 3px;
+}
+
+#guess.result>#map {
+    height: calc(100% - 170px);
+}
+
+#resultInfo {
+    margin-top: 5px;
+    width: 100%;
+    height: 120px;
+    padding: 5px 20px;
+    text-align: center;
+    box-sizing: border-box;
+    background-color: #ffffff;
+    border-radius: 3px;
+    display: none;
+}
+
+#guess.result>#resultInfo {
+    display: block;
+}
+
+#resultInfo>div {
+    width: 100%;
+    height: 33.33%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+#resultInfo p {
+    font-size: 24px;
+    line-height: 1;
+}
+
+#distanceInfo>p:nth-child(2), #scoreInfo>p:nth-child(2) {
+    display: none;
+}
+
+#scoreBarBase {
+    height: 24px;
+    margin: 0 auto;
+    background-color: #eeeeee;
+    border-radius: 3px;
+}
+
+#scoreBar {
+    width: 0;
+    height: 100%;
+    border-radius: 3px;
+    transition-property: width;
+    transition-duration: 2.0s;
+}
+
+#showSummaryButton, #startNewGameButton {
+    display: none;
+}
+
+#startMultiGameButton {
+    display: none;
+}
+
+#players > p {
+    font-size: 14px;
+    font-weight: bold;
+}
+
+@media screen and (max-width: 599px) {
+    #mapName {
+        display: none;
+    }
+    #showGuessButtonContainer {
+        position: absolute;
+        left: 20px;
+        bottom: 30px;
+        right: 20px;
+        z-index: 2;
+    }
+    #guess {
+        top: 10px;
+        left: 20px;
+        opacity: 0.95;
+        visibility: hidden;
+    }
+    #map {
+        height: calc(100% - 90px);
+    }
+    #scoreBarBase {
+        width: 100%;
+    }
+}
+
+@media screen and (min-width: 600px) {
+    #showGuessButtonContainer {
+        display: none;
+    }
+    #guess {
+        width: 500px;
+        height: 375px;
+        opacity: 0.95;
+    }
+    #guess.adapt {
+        top: initial;
+        width: 250px;
+        height: 200px;
+        opacity: 0.5;
+        transition-property: width, height, opacity;
+        transition-duration: 0.1s;
+        transition-delay: 0.8s;
+    }
+    #guess.adapt:hover {
+        width: 500px;
+        height: 375px;
+        opacity: 0.95;
+        transition-delay: 0s;
+    }
+    #closeGuessButtonContainer {
+        display: none;
+    }
+    #map {
+        height: calc(100% - 45px);
+    }
+    #guess.result {
+        width: initial;
+        height: initial;
+        top: 10px;
+        left: 50px;
+        right: 50px;
+        bottom: 50px;
+    }
+    #scoreBarBase {
+        width: 60%;
+    }
+    @media screen and (max-height: 424px) {
+        #guess {
+            top: 10px;
+            height: initial;
+        }
+        #guess.adapt:hover {
+            top: 10px;
+            height: initial;
+        }
+        #guess.result {
+            left: 20px;
+            right: 20px;
+            bottom: 30px;
+        }
+    }
+}

public/static/css/map_editor.css

@@ -0,0 +1,92 @@
+#map {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 1;
+}
+
+/* modify the cursor for the Leaflet map */
+.leaflet-container {
+    cursor: crosshair;
+}
+
+#panorama {
+    position: absolute;
+    z-index: 1;
+    visibility: hidden;
+}
+
+#noPano {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    z-index: 2;
+    visibility: hidden;
+    background: #cccccc;
+}
+
+#noPano>p {
+    text-align: center;
+}
+
+#control {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    width: 125px;
+    z-index: 3;
+}
+
+#placeControl {
+    position: absolute;
+    right: 10px;
+    z-index: 3;
+    width: 100px;
+    visibility: hidden;
+}
+
+#deleteButton {
+    display: none;
+}
+
+@media screen and (max-width: 999px) and (min-height: 600px) {
+    #map.selected {
+        height: 50%;
+    }
+    #panorama, #noPano {
+        left: 0;
+        bottom: 0;
+        right: 0;
+        height: 50%;
+    }
+    #placeControl {
+        top: calc(50% + 10px);
+    }
+}
+
+@media screen and (min-width: 1000px), (max-height: 599px) {
+    #map.selected {
+        top: 0;
+        bottom: 0;
+        left: 0;
+        width: 50%;
+    }
+    #panorama, #noPano {
+        top: 0;
+        bottom: 0;
+        right: 0;
+        width: 50%;
+    }
+    #placeControl {
+        top: 10px;
+    }
+    #modified.selected {
+        right: calc(50% + 10px);
+    }
+    #control.selected {
+        right: calc(50% + 10px);
+    }
+}

public/static/css/mapguesser.css

@@ -17,7 +17,17 @@ button::-moz-focus-inner, input::-moz-focus-inner {
     border: 0;
 }
 
-p, h1, h2, button, a {
+/* to be compatible with browsers that don't know <main> */
+main {
+    display: block;
+}
+
+::selection {
+    background-color: #28a745;
+    color: #ffffff;
+}
+
+p, h1, h2, input, textarea, select, button, a {
     font-family: 'Roboto', sans-serif;
 }
 
@@ -37,7 +47,7 @@ h1>a:hover, h1>a:focus {
     text-decoration: none;
 }
 
-h2, div.header.small h1 {
+h2, header.small h1 {
     font-size: 24px;
 }
 
@@ -69,16 +79,17 @@ sub {
     bottom: -0.4em;
 }
 
-.mono {
-    font-family: 'Roboto Mono', monospace;
+hr {
+    border: solid #bbbbbb 1px;
+    margin: 10px 0;
 }
 
 .bold {
     font-weight: 500;
 }
 
-.small {
-    font-size: 12px;
+p.small, span.small {
+    font-size: 14px;
 }
 
 .justify {
@@ -89,11 +100,31 @@ sub {
     margin-top: 10px;
 }
 
+.marginLeft {
+    margin-left: 10px;
+}
+
 .marginBottom {
     margin-bottom: 10px;
 }
 
-svg.inline {
+.marginRight {
+    margin-right: 10px;
+}
+
+.center {
+    text-align: center;
+}
+
+.right {
+    text-align: right;
+}
+
+svg.inline, img.inline {
+    display: inline;
+    width: 1em;
+    height: 1em;
+    margin-right: 0.3em;
     vertical-align: -0.15em;
 }
 
@@ -122,6 +153,27 @@ button, a.button {
     line-height: 35px;
 }
 
+button.small, div.inputWithButton>button {
+    font-size: 14px;
+    padding: 0 12px;
+    height: 32px;
+    line-height: 32px;
+}
+
+button.small {
+    height: 32px;
+    line-height: 32px;
+}
+
+div.inputWithButton>button {
+    border-radius: 2px;
+    height: 27px;
+    line-height: 27px;
+    width: 75px;
+    margin-left: -79px;
+    vertical-align: 2px;
+}
+
 button:enabled:hover, button:enabled:focus, a.button:hover, a.button:focus {
     background-color: #29457f;
     outline: none;
@@ -139,15 +191,158 @@ button.fullWidth, a.button.fullWidth {
     width: 100%;
 }
 
+button.noLeftRadius, a.button.noLeftRadius {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+button.noRightRadius, a.button.noRightRadius {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
 button.gray, a.button.gray {
     background-color: #808080;
 }
 
-button.gray:hover, button.gray:focus, a.button.gray:hover, a.button.gray:focus {
+button.gray:enabled:hover, button.gray:enabled:focus, a.button.gray:hover, a.button.gray:focus {
     background-color: #555555;
 }
 
-div.header {
+button.red, a.button.red {
+    background-color: #aa5e5e;
+}
+
+button.red:enabled:hover, button.red:enabled:focus, a.button.red:hover, a.button.red:focus {
+    background-color: #7f2929;
+}
+
+button.yellow, a.button.yellow {
+    background-color: #e8a349;
+}
+
+button.yellow:enabled:hover, button.yellow:enabled:focus, a.button.yellow:hover, a.button.yellow:focus {
+    background-color: #c37713;
+}
+
+button.green, a.button.green {
+    background-color: #28a745;
+}
+
+button.green:enabled:hover, button.green:enabled:focus, a.button.green:hover, a.button.green:focus {
+    background-color: #1b7d31;
+}
+
+input, select, textarea {
+    background-color: #f9fafb;
+    border: solid #c8d2e1 1px;
+    border-radius: 2px;
+    box-sizing: border-box;
+    font-size: 15px;
+    font-weight: 300;
+}
+
+input, select {
+    height: 30px;
+    line-height: 30px;
+    padding: 0 5px;
+}
+
+textarea {
+    padding: 5px;
+    resize: none;
+}
+
+input.big, select.big, textarea.big, div.inputWithButton>input {
+    font-size: 18px;
+}
+
+input.big, select.big, div.inputWithButton>input {
+    height: 35px;
+    line-height: 35px;
+    padding: 0 6px;
+}
+
+textarea.big {
+    padding: 6px;
+}
+
+input.fullWidth, select.fullWidth, textarea.fullWidth {
+    display: block;
+    width: 100%;
+}
+
+input:disabled, select:disabled, textarea:disabled {
+    background-color: #dfdfdf;
+    border: solid #dfdfdf 1px;
+    color: #000000;
+}
+
+input:focus, select:focus, textarea:focus {
+    background-color: #ffffff;
+    border: solid #29457f 2px;
+    outline: none;
+}
+
+input:focus, select:focus {
+    padding: 0 4px;
+}
+
+textarea:focus {
+    padding: 4px;
+}
+
+input.big:focus, select.big:focus {
+    padding: 0 5px;
+}
+
+div.inputWithButton>input {
+    width: 100%;
+    padding: 0 83px 0 6px;
+}
+
+div.inputWithButton>input:focus {
+    padding: 0 82px 0 5px;
+}
+
+textarea.big:focus {
+    padding: 5px;
+}
+
+div.modal {
+    position: fixed;
+    background-color: #ffffff;
+    border-radius: 3px;
+    box-sizing: border-box;
+    overflow-y: auto;
+    z-index: 6;
+    visibility: hidden;
+}
+
+#cover {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #000000;
+    opacity: 0.5;
+    z-index: 5;
+    visibility: hidden;
+}
+
+p.error, p.formError {
+    color: #7f2929;
+    font-weight: 500;
+}
+
+p.formError {
+    display: none;
+}
+
+header {
+    display: grid;
+    grid-template-columns: auto auto;
     background-color: #333333;
     height: 50px;
     line-height: 50px;
@@ -155,20 +350,51 @@ div.header {
     color: white;
 }
 
-div.header>div.grid {
-    display: grid;
-    grid-template-columns: auto auto;
-}
-
-div.header.small {
+header.small {
     height: 40px;
     line-height: 40px;
 }
 
-div.main {
+header>p {
+    line-height: inherit;
+    text-align: right;
+}
+
+header>p>span {
+    padding-left: 6px;
+}
+
+header>p>span>a:link, header>p>span>a:visited {
+    color: inherit;
+}
+
+header>p>span:not(:last-child) {
+    border-right: solid white 1px;
+    padding-right: 6px;
+}
+
+main {
     padding: 6px 12px;
 }
 
+main.full {
+    position: relative;
+    width: 100%;
+    height: calc(100% - 40px);
+    padding: 0;
+}
+
+footer {
+    background-color: #444444;
+    padding: 6px 12px;
+    color: white;
+    text-align: center;
+}
+
+footer>p {
+    font-size: 13px;
+}
+
 div.buttonContainer {
     height: 35px;
 }
@@ -177,287 +403,112 @@ div.buttonContainer>button {
     margin: 0 auto;
 }
 
-div.mapContainer {
-    display: grid;
-}
-
-div.mapItem {
-    width: 350px;
+#cookiesNotice {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    margin: 20px;
     background-color: #eeeeee;
+    border: solid #888888 1px;
     border-radius: 3px;
-    margin: 10px auto;
-}
-
-div.mapItem>div.title {
-    background-color: #28a745;
-    color: white;
-    border-top-left-radius: 3px;
-    border-top-right-radius: 3px;
-    padding: 4px 8px;
-}
-
-div.mapItem>div.title>p.title {
-    font-weight: 500;
-    font-size: 18px;
-}
-
-div.mapItem>img {
-    width: 100%;
-}
-
-div.mapItem>div.inner {
-    padding: 8px;
-}
-
-div.mapItem>div.inner>div.info {
-    display: grid;
-    grid-template-columns: auto auto;
-}
-
-div.mapItem>div.inner>div.info>p:nth-child(1) {
-    text-align: left;
-}
-
-div.mapItem>div.inner>div.info>p:nth-child(2) {
-    text-align: right;
+    padding: 10px;
+    text-align: center;
+    z-index: 10;
 }
 
 #loading {
-    position: absolute;
+    position: fixed;
     width: 64px;
     height: 64px;
     top: 50%;
     left: 50%;
     margin-top: -32px;
     margin-left: -32px;
-    z-index: 5;
+    z-index: 7;
     visibility: hidden;
 }
 
-#roundInfo {
-    line-height: inherit;
-    text-align: right;
-}
-
-#roundInfo p {
-    font-size: 16px;
-    line-height: inherit;
-}
-
-#panorama {
-    width: 100%;
-    height: calc(100% - 40px);
-    z-index: 1;
-}
-
-#cover {
-    position: absolute;
-    top: 40px;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    background-color: #000000;
-    opacity: 0.5;
-    z-index: 3;
-}
-
-#guess {
-    position: absolute;
-    bottom: 30px;
-    right: 20px;
-    z-index: 2;
-}
-
-#guess.result {
-    z-index: 4;
-}
-
-#guess>#continueButtonContainer {
-    display: none;
-}
-
-#guess.result>#closeGuessButtonContainer, #guess.result>#guessButtonContainer {
-    display: none;
-}
-
-#guess.result>#continueButtonContainer {
-    display: block;
-}
-
-#map {
-    width: 100%;
-    border-radius: 3px;
-}
-
-#guess.result>#map {
-    height: calc(100% - 170px);
-}
-
-#resultInfo {
-    margin-top: 5px;
-    width: 100%;
-    height: 120px;
-    padding: 5px 20px;
-    text-align: center;
-    box-sizing: border-box;
-    background-color: #ffffff;
-    border-radius: 3px;
-    display: none;
-}
-
-#guess.result>#resultInfo {
-    display: block;
-}
-
-#resultInfo>div {
-    width: 100%;
-    height: 33.33%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-#resultInfo p {
-    font-size: 24px;
-    line-height: 1;
-}
-
-#distanceInfo>p:nth-child(2), #scoreInfo>p:nth-child(2) {
-    display: none;
-}
-
-#scoreBarBase {
-    height: 24px;
-    margin: 0 auto;
+div.box {
+    width: 576px;
     background-color: #eeeeee;
     border-radius: 3px;
-}
-
-#scoreBar {
-    width: 0;
-    height: 100%;
-    border-radius: 3px;
-    transition-property: width;
-    transition-duration: 2.0s;
-}
-
-#showSummaryButton, #startNewGameButton {
-    display: none;
-}
-
-@media screen and (min-width: 1504px) {
-    div.mapContainer {
-        grid-template-columns: auto auto auto auto;
-    }
-}
-
-@media screen and (min-width: 1134px) and (max-width: 1503px) {
-    div.mapContainer {
-        grid-template-columns: auto auto auto;
-    }
-}
-
-@media screen and (min-width: 764px) and (max-width: 1133px) {
-    div.mapContainer {
-        grid-template-columns: auto auto;
-    }
-}
-
-@media screen and (max-width: 763px) {
-    div.mapContainer {
-        grid-template-columns: auto;
-    }
-}
-
-@media screen and (max-width: 374px) {
-    div.mapItem {
-        width: initial;
-    }
+    margin: 10px auto;
+    padding: 10px;
+    box-sizing: border-box;
 }
 
 @media screen and (max-width: 599px) {
-    div.header.small h1 span {
+    header h1 span {
         display: none;
     }
-    button {
+    footer>p:not(:first-child) {
+        margin-top: 4px;
+    }
+    button, a.button {
         padding: 0;
         width: 100%;
     }
-    #showGuessButtonContainer {
-        position: absolute;
+    button.marginLeft, a.button.marginLeft {
+        margin-left: 0;
+    }
+    button.marginRight, a.button.marginRight {
+        margin-right: 0;
+    }
+    div.modal {
         left: 20px;
-        bottom: 30px;
         right: 20px;
-        z-index: 2;
+        padding-left: 15px;
+        padding-right: 15px;
     }
-    #guess {
-        top: 50px;
-        left: 20px;
-        opacity: 0.95;
-        visibility: hidden;
-    }
-    #map {
-        height: calc(100% - 90px);
-    }
-    #scoreBarBase {
-        width: 100%;
+    div.box {
+        width: initial;
     }
 }
 
 @media screen and (min-width: 600px) {
-    #showGuessButtonContainer {
-        display: none;
+    footer>p {
+        display: inline;
     }
-    #guess {
-        width: 500px;
-        height: 375px;
-        opacity: 0.95;
+    footer>p:not(:first-child) {
+        padding-left: 6px;
     }
-    #guess.adapt {
-        top: initial;
-        width: 250px;
-        height: 200px;
-        opacity: 0.5;
-        transition-property: width, height, opacity;
-        transition-duration: 0.1s;
-        transition-delay: 0.8s;
+    footer>p:not(:last-child) {
+        border-right: solid white 1px;
+        padding-right: 6px;
     }
-    #guess.adapt:hover {
-        width: 500px;
-        height: 375px;
-        opacity: 0.95;
-        transition-delay: 0s;
+    div.modal {
+        width: 540px;
+        left: 50%;
+        margin-left: -270px;
+        padding-left: 20px;
+        padding-right: 20px;
     }
-    #closeGuessButtonContainer {
-        display: none;
+}
+
+@media screen and (max-height: 399px) {
+    div.modal {
+        top: 20px;
+        max-height: calc(100% - 40px);
+        padding-top: 10px;
+        padding-bottom: 10px;
     }
-    #map {
-        height: calc(100% - 45px);
-    }
-    #guess.result {
-        width: initial;
-        height: initial;
+}
+
+@media screen and (min-height: 400px) and (max-height: 499px) {
+    div.modal {
         top: 50px;
-        left: 50px;
-        right: 50px;
-        bottom: 50px;
-    }
-    #scoreBarBase {
-        width: 60%;
+        max-height: calc(100% - 100px);
+        padding-top: 15px;
+        padding-bottom: 15px;
     }
-    @media screen and (max-height: 424px) {
-        #guess {
-            top: 50px;
-            height: initial;
-        }
-        #guess.adapt:hover {
-            top: 50px;
-            height: initial;
-        }
-        #guess.result {
-            left: 20px;
-            right: 20px;
-            bottom: 30px;
-        }
+}
+
+@media screen and (min-height: 500px) {
+    div.modal {
+        top: 75px;
+        max-height: calc(100% - 150px);
+        padding-top: 15px;
+        padding-bottom: 15px;
     }
 }

public/static/css/maps.css

@@ -0,0 +1,106 @@
+#mapContainer {
+    display: grid;
+}
+
+div.mapItem {
+    width: 350px;
+    margin: 10px auto;
+}
+
+div.mapItem.new {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+div.mapItem>div.title {
+    background-color: #28a745;
+    color: white;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+    padding: 0 8px;
+    height: 35px;
+    line-height: 35px;
+}
+
+div.mapItem>div.title>p {
+    line-height: inherit;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+div.mapItem>div.title>p.title {
+    font-weight: 500;
+    font-size: 18px;
+}
+
+div.mapItem>div.imgContainer {
+    width: 100%;
+    padding-top: 50%;
+    background-color: #cccccc;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: cover;
+}
+
+div.mapItem>div.inner {
+    background-color: #eeeeee;
+    padding: 10px 8px;
+    box-sizing: border-box;
+}
+
+div.mapItem>div.inner>div.info {
+    display: grid;
+    grid-template-columns: auto auto;
+}
+
+div.mapItem>div.inner>div.description {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+div.mapItem>div.inner>div.info>p:nth-child(1) {
+    text-align: left;
+}
+
+div.mapItem>div.inner>div.info>p:nth-child(2) {
+    text-align: right;
+}
+
+div.mapItem>div.buttonContainer {
+    display: grid;
+    grid-auto-columns: 1fr;
+    grid-auto-flow: column;
+}
+
+@media screen and (min-width: 1504px) {
+    #mapContainer {
+        grid-template-columns: auto auto auto auto;
+    }
+}
+
+@media screen and (min-width: 1134px) and (max-width: 1503px) {
+    #mapContainer {
+        grid-template-columns: auto auto auto;
+    }
+}
+
+@media screen and (min-width: 764px) and (max-width: 1133px) {
+    #mapContainer {
+        grid-template-columns: auto auto;
+    }
+}
+
+@media screen and (max-width: 763px) {
+    #mapContainer {
+        grid-template-columns: auto;
+    }
+}
+
+@media screen and (max-width: 374px) {
+    div.mapItem {
+        width: 100%;
+    }
+}

public/static/img/favicon/SOURCE

@@ -0,0 +1,2 @@
+The PNGs in this folder are generated from '../icon.svg'.
+Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'.

public/static/img/icon.svg

@@ -1,4 +1,3 @@
-<!-- The PNGs in this folder are generated from this SVG. -->
 <!-- Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. -->
 <svg viewBox="0 0 16 16" fill="#28a745" xmlns="http://www.w3.org/2000/svg">
     <path fill-rule="evenodd" d="M15.817.613A.5.5 0 0 1 16 1v13a.5.5 0 0 1-.402.49l-5 1a.502.502 0 0 1-.196 0L5.5 14.51l-4.902.98A.5.5 0 0 1 0 15V2a.5.5 0 0 1 .402-.49l5-1a.5.5 0 0 1 .196 0l4.902.98 4.902-.98a.5.5 0 0 1 .415.103zM10 2.41l-4-.8v11.98l4 .8V2.41zm1 11.98l4-.8V1.61l-4 .8v11.98zm-6-.8V1.61l-4 .8v11.98l4-.8z" />

public/static/img/markers/marker-blue.svg

@@ -0,0 +1,16 @@
+<!-- Original image: Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. -->
+<svg viewBox="0 0 12 16" xmlns="http://www.w3.org/2000/svg">
+    <path
+        fill="#3183ce"
+        fill-rule="evenodd"
+        stroke="#19456d"
+        stroke-width="0.3"
+        stroke-linecap="round"
+        d="m 5.9999998,15.849652 c 0,0 5.8511182,-5.579947 5.8511182,-9.8134832 a 5.8511179,5.8880898 0 0 0 -11.7022358,0 c 0,4.2335362 5.8511176,9.8134832 5.8511176,9.8134832" />
+    <circle
+        fill="#19456d"
+        fill-rule="evenodd"
+        cx="6"
+        cy="6"
+        r="3" />
+</svg>

public/static/img/markers/marker-gray-empty.svg

@@ -0,0 +1,10 @@
+<!-- Original image: Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. -->
+<svg viewBox="0 0 12 16" xmlns="http://www.w3.org/2000/svg">
+    <path
+        fill="#828282"
+        fill-rule="evenodd"
+        stroke="#383838"
+        stroke-width="0.3"
+        stroke-linecap="round"
+        d="m 5.9999998,15.849652 c 0,0 5.8511182,-5.579947 5.8511182,-9.8134832 a 5.8511179,5.8880898 0 0 0 -11.7022358,0 c 0,4.2335362 5.8511176,9.8134832 5.8511176,9.8134832" />
+</svg>

public/static/img/markers/marker-gray.svg

@@ -0,0 +1,16 @@
+<!-- Original image: Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. -->
+<svg viewBox="0 0 12 16" xmlns="http://www.w3.org/2000/svg">
+    <path
+        fill="#828282"
+        fill-rule="evenodd"
+        stroke="#383838"
+        stroke-width="0.3"
+        stroke-linecap="round"
+        d="m 5.9999998,15.849652 c 0,0 5.8511182,-5.579947 5.8511182,-9.8134832 a 5.8511179,5.8880898 0 0 0 -11.7022358,0 c 0,4.2335362 5.8511176,9.8134832 5.8511176,9.8134832" />
+    <circle
+        fill="#383838"
+        fill-rule="evenodd"
+        cx="6"
+        cy="6"
+        r="3" />
+</svg>

public/static/img/markers/marker-green-empty.svg

@@ -0,0 +1,10 @@
+<!-- Original image: Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. -->
+<svg viewBox="0 0 12 16" xmlns="http://www.w3.org/2000/svg">
+    <path
+        fill="#28a745"
+        fill-rule="evenodd"
+        stroke="#285624"
+        stroke-width="0.3"
+        stroke-linecap="round"
+        d="m 5.9999998,15.849652 c 0,0 5.8511182,-5.579947 5.8511182,-9.8134832 a 5.8511179,5.8880898 0 0 0 -11.7022358,0 c 0,4.2335362 5.8511176,9.8134832 5.8511176,9.8134832" />
+</svg>

public/static/img/markers/marker-green.svg

@@ -0,0 +1,16 @@
+<!-- Original image: Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. -->
+<svg viewBox="0 0 12 16" xmlns="http://www.w3.org/2000/svg">
+    <path
+        fill="#28a745"
+        fill-rule="evenodd"
+        stroke="#285624"
+        stroke-width="0.3"
+        stroke-linecap="round"
+        d="m 5.9999998,15.849652 c 0,0 5.8511182,-5.579947 5.8511182,-9.8134832 a 5.8511179,5.8880898 0 0 0 -11.7022358,0 c 0,4.2335362 5.8511176,9.8134832 5.8511176,9.8134832" />
+    <circle
+        fill="#285624"
+        fill-rule="evenodd"
+        cx="6"
+        cy="6"
+        r="3" />
+</svg>

public/static/img/markers/marker-red.svg

@@ -0,0 +1,16 @@
+<!-- Original image: Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. -->
+<svg viewBox="0 0 12 16" xmlns="http://www.w3.org/2000/svg">
+    <path
+        fill="#d24d4d"
+        fill-rule="evenodd"
+        stroke="#752929"
+        stroke-width="0.3"
+        stroke-linecap="round"
+        d="m 5.9999998,15.849652 c 0,0 5.8511182,-5.579947 5.8511182,-9.8134832 a 5.8511179,5.8880898 0 0 0 -11.7022358,0 c 0,4.2335362 5.8511176,9.8134832 5.8511176,9.8134832" />
+    <circle
+        fill="#752929"
+        fill-rule="evenodd"
+        cx="6"
+        cy="6"
+        r="3" />
+</svg>

public/static/js/account/account.js

@@ -0,0 +1,69 @@
+var Account = {
+    original: null,
+    countdown: null,
+
+    openGoogleAuthenticate: function () {
+        window.open('/account/googleAuthenticate', 'googleAuthenticate', 'height=600,width=600')
+    },
+
+    authenticatedWithGoogleCallback: function (authenticatedWithGoogleUntil) {
+        var password = document.getElementsByTagName('form')[0].elements.password;
+        var button = document.getElementById('authenticateWithGoogleButton');
+
+        Account.original = {
+            type: password.type,
+            placeholder: password.placeholder,
+            required: password.required,
+            disabled: password.disabled
+        };
+
+        password.type = 'text';
+        password.placeholder = 'Authenticated!'
+        password.value = '';
+        password.required = false;
+        password.disabled = true;
+
+        button.disabled = true;
+
+        Account.countdown = setInterval(function () {
+            var timeLeft = Math.ceil((authenticatedWithGoogleUntil.getTime() - new Date().getTime()) / 1000);
+
+            if (timeLeft > 30) {
+                return;
+            }
+
+            if (timeLeft <= 0) {
+                Account.resetGoogleAuthentication();
+                return;
+            }
+
+            password.placeholder = 'Authenticated! ' + timeLeft + ' seconds left...';
+        }, 1000);
+    },
+
+    resetGoogleAuthentication: function () {
+        if (Account.countdown !== null) {
+            clearInterval(Account.countdown);
+        }
+
+        var password = document.getElementsByTagName('form')[0].elements.password;
+        var button = document.getElementById('authenticateWithGoogleButton');
+
+        password.type = Account.original.type;
+        password.placeholder = Account.original.placeholder
+        password.required = Account.original.required;
+        password.disabled = Account.original.disabled;
+
+        button.disabled = false;
+    }
+};
+
+(function () {
+    document.getElementById('authenticateWithGoogleButton').onclick = function () {
+        Account.openGoogleAuthenticate();
+    };
+
+    document.getElementsByTagName('form')[0].onreset = function () {
+        Account.resetGoogleAuthentication();
+    };
+})();

public/static/js/account/google_authenticate.js

@@ -0,0 +1,10 @@
+(function () {
+    if (success) {
+        window.opener.Account.authenticatedWithGoogleCallback(authenticatedWithGoogleUntil);
+        window.close();
+    } else {
+        document.getElementById('closeWindowButton').onclick = function () {
+            window.close();
+        }
+    }
+})();

public/static/js/game.js

@@ -1,80 +1,270 @@
 'use strict';
 
 (function () {
-    var Core = {
+    var Game = {
         NUMBER_OF_ROUNDS: 5,
         MAX_SCORE: 1000,
 
+        mapBounds: null,
+        multi: { token: null, owner: false },
         rounds: [],
         scoreSum: 0,
         panoId: null,
+        pov: null,
         panorama: null,
         map: null,
         guessMarker: null,
         adaptGuess: false,
         googleLink: null,
 
-        initialize: function () {
+        MultiConnector: {
+            connection: null,
+            reconnectCounter: 0,
+
+            connect: function () {
+                if (Game.MultiConnector.connection && Game.MultiConnector.connection.readyState !== WebSocket.CLOSED) {
+                    return;
+                }
+
+                Game.MultiConnector.connection = new WebSocket((MapGuesser.isSecure ? 'wss' : 'ws') + '://' + multiUrl);
+
+                Game.MultiConnector.connection.onopen = function () {
+                    document.getElementById('loading').style.visibility = 'hidden';
+
+                    Game.MultiConnector.reconnectCounter = 0;
+
+                    Game.MultiConnector.connection.send(JSON.stringify({ func: 'connect_to_room', args: { roomId: roomId, token: Game.multi.token } }));
+                };
+
+                Game.MultiConnector.connection.onclose = Game.MultiConnector.noConnection;
+
+                Game.MultiConnector.connection.onerror = function (event) {
+                    console.error('WebSocket error in Game.MultiConnector:', event);
+                };
+
+                Game.MultiConnector.connection.onmessage = function (message) {
+                    var json;
+
+                    try {
+                        json = JSON.parse(message.data);
+                    } catch (e) {
+                        console.error('Cannot parse message!');
+                        console.error(message.data);
+                        return;
+                    }
+
+                    switch (json.type) {
+                        case 'initialize':
+                            Game.MultiConnector.initialize(json.data);
+                            break;
+
+                        case 'member_joined':
+                            Game.MultiConnector.memberJoined(json.data);
+                            break;
+
+                        case 'new_round':
+                            Game.MultiConnector.newRound(json.data);
+                            break;
+
+                        case 'results':
+                            //TODO
+                            break;
+
+                        case 'guess':
+                            //TODO
+                            break;
+                    }
+                };
+            },
+
+            noConnection: function () {
+                if (Game.MultiConnector.reconnectCounter === 2) {
+                    console.error('Could not reconnect WebSocket for Game.MultiConnector...')
+                }
+
+                setTimeout(function () {
+                    Game.MultiConnector.reconnectCounter++;
+
+                    console.log('Reconnecting WebSocket for Game.MultiConnector... ' + Game.MultiConnector.reconnectCounter);
+                    Game.MultiConnector.connect();
+                }, 1000 + Math.min(Game.MultiConnector.reconnectCounter * 500, 9000));
+            },
+
+            initialize: function (data) {
+                if (data.history) {
+                    for (var i = 0; i < data.history.length; ++i) {
+                        var round = data.history[i];
+                        Game.rounds.push({ position: round.position, guessPosition: round.guessPosition, realMarker: null, guessMarker: null, line: null });
+                        Game.addRealGuessPair(round.position, round.guessPosition, true);
+                        Game.scoreSum += round.score;
+                    }
+
+                    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);
+                }
+
+                if (data.place) {
+                    Game.panoId = data.place.panoId;
+                    Game.pov = data.place.pov;
+
+                    document.getElementById('panoCover').style.visibility = 'hidden';
+                    MapGuesser.hideModal();
+
+                    Game.startNewRound();
+                }
+
+                document.getElementById('loading').style.visibility = 'hidden';
+
+                var div = document.getElementById('players');
+
+                for (var i = 0; i < data.members.length; ++i) {
+                    var member = data.members[i];
+
+                    var p = document.createElement('p');
+                    p.innerHTML = member.userName + (member.me ? ' (me)' : '');
+                    div.appendChild(p);
+                }
+            },
+
+            memberJoined: function (data) {
+                var div = document.getElementById('players');
+
+                var p = document.createElement('p');
+                p.innerHTML = data.userName;
+                div.appendChild(p);
+            },
+
+            newRound: function (data) {
+                //TODO: workaround until results are not sent
+                if (Game.adaptGuess) {
+                    document.getElementById('guess').classList.remove('adapt');
+                }
+
+                if (Game.rounds.length === Game.NUMBER_OF_ROUNDS) {
+                    Game.reset();
+                }
+
+                // if player didn't guess - TODO: show everything on a map
+                if (data.result && Game.rounds.length > 0 && !Game.rounds[Game.rounds.length - 1].position) {
+                    Game.rounds[Game.rounds.length - 1].position = data.result.position;
+                    Game.addRealGuessPair(data.result.position, null);
+                }
+
+                Game.panoId = data.place.panoId;
+                Game.pov = data.place.pov;
+
+                MapGuesser.hideModal();
+                Game.resetRound();
+                Game.startNewRound();
+            }
+        },
+
+        prepare: function () {
+            var data = new FormData();
+            var userNames;
+
+            if (roomId) {
+                var userNames = localStorage.userNames ? JSON.parse(localStorage.userNames) : {};
+                if (!userNames.hasOwnProperty(roomId)) {
+                    userNames[roomId] = prompt('Your name: ');
+                    localStorage.userNames = JSON.stringify(userNames);
+                }
+
+                data.append('userName', userNames[roomId]);
+            }
+
             document.getElementById('loading').style.visibility = 'visible';
-            document.getElementById('cover').style.visibility = 'visible';
-            document.getElementById('currentRound').innerHTML = '1/' + String(Core.NUMBER_OF_ROUNDS);
+
+            var url = roomId ? '/multiGame/' + roomId + '/prepare.json' : '/game/' + mapId + '/prepare.json';
+            MapGuesser.httpRequest('POST', url, function () {
+                document.getElementById('loading').style.visibility = 'hidden';
+
+                document.getElementById('mapName').innerHTML = this.response.mapName;
+                Game.mapBounds = this.response.bounds;
+
+                Game.initialize();
+
+                if (roomId) {
+                    Game.multi.token = this.response.token;
+                    Game.multi.owner = this.response.owner;
+
+                    MapGuesser.showModal('multi');
+                    if (Game.multi.owner) {
+                        document.getElementById('startMultiGameButton').style.display = 'block';
+                    }
+
+                    document.getElementById('loading').style.visibility = 'visible';
+
+                    Game.MultiConnector.connect();
+                }
+            }, data);
+        },
+
+        initialize: function () {
+            document.getElementById('panoCover').style.visibility = 'visible';
+            document.getElementById('currentRound').innerHTML = '1/' + String(Game.NUMBER_OF_ROUNDS);
             document.getElementById('currentScoreSum').innerHTML = '0/0';
 
-            Core.map.setOptions({
+            Game.map.setOptions({
                 draggableCursor: 'crosshair'
             });
-            Core.map.fitBounds(mapBounds);
+            Game.map.fitBounds(Game.mapBounds);
+
+            if (roomId) {
+                // if it is multiplayer mode, data is sent via WS
+                return;
+            }
+
+            document.getElementById('loading').style.visibility = 'visible';
+
+            MapGuesser.httpRequest('POST', '/game/' + mapId + '/initialData.json', function () {
+                document.getElementById('loading').style.visibility = 'hidden';
+                document.getElementById('panoCover').style.visibility = 'hidden';
 
-            var xhr = new XMLHttpRequest();
-            xhr.responseType = 'json';
-            xhr.onload = function () {
                 if (this.response.error) {
                     //TODO: handle this error
                     return;
                 }
 
-                document.getElementById('loading').style.visibility = 'hidden';
-                document.getElementById('cover').style.visibility = 'hidden';
-
-                Core.panoId = this.response.panoId;
+                Game.panoId = this.response.place.panoId;
+                Game.pov = this.response.place.pov;
 
                 if (this.response.history) {
                     for (var i = 0; i < this.response.history.length; ++i) {
                         var round = this.response.history[i];
-                        Core.rounds.push({ position: round.position, guessPosition: round.guessPosition, realMarker: null, guessMarker: null, line: null });
-                        Core.addRealGuessPair(round.position, round.guessPosition, true);
-                        Core.scoreSum += round.score;
+                        Game.rounds.push({ position: round.position, guessPosition: round.guessPosition, realMarker: null, guessMarker: null, line: null });
+                        Game.addRealGuessPair(round.position, round.guessPosition, true);
+                        Game.scoreSum += round.score;
                     }
 
-                    document.getElementById('currentRound').innerHTML = String(Core.rounds.length) + '/' + String(Core.NUMBER_OF_ROUNDS);
-                    document.getElementById('currentScoreSum').innerHTML = String(Core.scoreSum) + '/' + String(Core.rounds.length * Core.MAX_SCORE);
+                    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);
                 }
 
-                Core.startNewRound();
-            };
-
-            xhr.open('GET', '/game/' + mapId + '/position.json', true);
-            xhr.send();
+                Game.startNewRound();
+            });
         },
 
-        resetGame: function () {
-            if (Core.guessMarker) {
-                Core.guessMarker.setMap(null);
-                Core.guessMarker = null;
+        reset: function () {
+            if (Game.guessMarker) {
+                Game.guessMarker.setMap(null);
+                Game.guessMarker = null;
             }
 
-            for (var i = 0; i < Core.rounds.length; ++i) {
-                var round = Core.rounds[i];
+            for (var i = 0; i < Game.rounds.length; ++i) {
+                var round = Game.rounds[i];
 
-                if (round.realMarker && round.guessMarker && round.line) {
+                if (round.realMarker) {
                     round.realMarker.setMap(null);
+                }
+                if (round.guessMarker) {
                     round.guessMarker.setMap(null);
                     round.line.setMap(null);
                 }
             }
 
-            Core.rounds = [];
-            Core.scoreSum = 0;
+            Game.rounds = [];
+            Game.scoreSum = 0;
 
             var distanceInfo = document.getElementById('distanceInfo');
             distanceInfo.children[0].style.display = null;
@@ -89,164 +279,200 @@
             document.getElementById('guess').style.visibility = null;
             document.getElementById('guess').classList.remove('result');
 
-            Core.initialize();
+            Game.initialize();
         },
 
         resetRound: function () {
             document.getElementById('scoreBar').style.width = null;
 
-            if (Core.rounds.length > 0) {
-                var lastRound = Core.rounds[Core.rounds.length - 1];
+            if (Game.rounds.length > 0) {
+                var lastRound = Game.rounds[Game.rounds.length - 1];
 
                 lastRound.realMarker.setVisible(false);
-                lastRound.guessMarker.setVisible(false);
-                lastRound.line.setVisible(false);
+                if (lastRound.guessMarker) {
+                    lastRound.guessMarker.setVisible(false);
+                    lastRound.line.setVisible(false);
+                }
             }
 
-            document.getElementById('cover').style.visibility = 'hidden';
+            document.getElementById('panoCover').style.visibility = 'hidden';
             document.getElementById('showGuessButton').style.visibility = null;
             document.getElementById('guess').style.visibility = null;
             document.getElementById('guess').classList.remove('result')
 
-            Core.map.setOptions({
+            Game.map.setOptions({
                 draggableCursor: 'crosshair'
             });
-            Core.map.fitBounds(mapBounds);
+            Game.map.fitBounds(Game.mapBounds);
 
-            Core.startNewRound();
+            if (roomId) {
+                // if it is multiplayer mode, data is sent via WS
+                return;
+            }
+
+            Game.startNewRound();
         },
 
         startNewRound: function () {
-            Core.rounds.push({ position: null, guessPosition: null, realMarker: null, guessMarker: null, line: null });
+            Game.rounds.push({ position: null, guessPosition: null, realMarker: null, guessMarker: null, line: null });
 
-            document.getElementById('currentRound').innerHTML = String(Core.rounds.length) + '/' + String(Core.NUMBER_OF_ROUNDS);
+            document.getElementById('currentRound').innerHTML = String(Game.rounds.length) + '/' + String(Game.NUMBER_OF_ROUNDS);
 
-            Core.loadPano(Core.panoId);
+            Game.loadPano(Game.panoId, Game.pov);
         },
 
         handleErrorResponse: function (error) {
             // for the time being we only handle the "no_session_found" error and reset the game
 
-            var xhr = new XMLHttpRequest();
-            xhr.responseType = 'json';
-            xhr.onload = function () {
-                mapBounds = this.response.bounds;
+            if (roomId) {
+                //TODO: better error message
+                alert('Your session is invalid, please start multiplayer again!')
+                return;
+            }
 
-                Core.resetGame();
-            };
+            MapGuesser.httpRequest('GET', '/game/' + mapId + '/prepare.json', function () {
+                Game.mapBounds = this.response.bounds;
 
-            xhr.open('GET', '/game/' + mapId + '/position.json', true);
-            xhr.send();
+                Game.reset();
+            });
         },
 
-        loadPano: function (panoId) {
-            if (Core.adaptGuess) {
+        loadPano: function (panoId, pov) {
+            if (Game.adaptGuess) {
                 document.getElementById('guess').classList.add('adapt');
             }
 
-            Core.panorama.setPov({ heading: 0, pitch: 0 });
-            Core.panorama.setZoom(0);
-            Core.panorama.setPano(panoId);
+            Game.panorama.setPov({ heading: pov.heading, pitch: pov.pitch });
+            Game.panorama.setZoom(pov.zoom);
+            Game.panorama.setPano(panoId);
         },
 
         evaluateGuess: function () {
-            var guessPosition = Core.guessMarker.getPosition().toJSON();
-            Core.rounds[Core.rounds.length - 1].guessPosition = guessPosition;
+            if (!Game.guessMarker) {
+                return;
+            }
 
-            if (Core.adaptGuess) {
+            var guessPosition = Game.guessMarker.getPosition().toJSON();
+            Game.rounds[Game.rounds.length - 1].guessPosition = guessPosition;
+
+            document.getElementById('guessButton').disabled = true;
+            if (Game.adaptGuess) {
                 document.getElementById('guess').classList.remove('adapt');
             }
             document.getElementById('loading').style.visibility = 'visible';
-            document.getElementById('cover').style.visibility = 'visible';
+            document.getElementById('panoCover').style.visibility = 'visible';
 
             var data = new FormData();
             data.append('lat', String(guessPosition.lat));
             data.append('lng', String(guessPosition.lng));
 
-            var xhr = new XMLHttpRequest();
-            xhr.responseType = 'json';
-            xhr.onload = function () {
+            var url = roomId ? '/multiGame/' + roomId + '/guess.json' : '/game/' + mapId + '/guess.json';
+            MapGuesser.httpRequest('POST', url, function () {
                 if (this.response.error) {
-                    Core.handleErrorResponse(this.response.error);
+                    Game.handleErrorResponse(this.response.error);
                     return;
                 }
 
-                Core.guessMarker.setMap(null);
-                Core.guessMarker = null;
+                Game.guessMarker.setMap(null);
+                Game.guessMarker = null;
 
                 document.getElementById('loading').style.visibility = 'hidden';
                 document.getElementById('guess').classList.add('result');
 
-                Core.scoreSum += this.response.result.score;
-                document.getElementById('currentScoreSum').innerHTML = String(Core.scoreSum) + '/' + String(Core.rounds.length * Core.MAX_SCORE);
+                Game.scoreSum += this.response.result.score;
+                document.getElementById('currentScoreSum').innerHTML = String(Game.scoreSum) + '/' + String(Game.rounds.length * Game.MAX_SCORE);
 
-                Core.rounds[Core.rounds.length - 1].position = this.response.result.position;
-                Core.addRealGuessPair(this.response.result.position, guessPosition);
+                Game.rounds[Game.rounds.length - 1].position = this.response.result.position;
+                Game.addRealGuessPair(this.response.result.position, guessPosition);
 
                 var resultBounds = new google.maps.LatLngBounds();
                 resultBounds.extend(this.response.result.position);
                 resultBounds.extend(guessPosition);
 
-                Core.map.setOptions({
+                Game.map.setOptions({
                     draggableCursor: 'grab'
                 });
-                Core.map.fitBounds(resultBounds);
+                Game.map.fitBounds(resultBounds);
 
                 document.getElementById('distance').innerHTML = Util.printDistanceForHuman(this.response.result.distance);
                 document.getElementById('score').innerHTML = this.response.result.score;
 
-                var scoreBarProperties = Core.calculateScoreBarProperties(this.response.result.score, Core.MAX_SCORE);
+                var scoreBarProperties = Game.calculateScoreBarProperties(this.response.result.score, Game.MAX_SCORE);
                 var scoreBar = document.getElementById('scoreBar');
                 scoreBar.style.backgroundColor = scoreBarProperties.backgroundColor;
                 scoreBar.style.width = scoreBarProperties.width;
 
-                if (Core.rounds.length === Core.NUMBER_OF_ROUNDS) {
+                if (Game.rounds.length === Game.NUMBER_OF_ROUNDS) {
                     document.getElementById('continueButton').style.display = 'none';
                     document.getElementById('showSummaryButton').style.display = 'block';
                 }
 
-                Core.panoId = this.response.panoId;
-            };
-
-            xhr.open('POST', '/game/' + mapId + '/guess.json', true);
-            xhr.send(data);
+                if (this.response.place) {
+                    Game.panoId = this.response.place.panoId;
+                    Game.pov = this.response.place.pov;
+                } else {
+                    if (!Game.multi.owner) {
+                        //TODO: "waiting for" disabled button
+                        document.getElementById('continueButton').style.display = 'none';
+                    }
+                    Game.panoId = null;
+                    Game.pov = null;
+                }
+            }, data);
         },
 
         addRealGuessPair: function (position, guessPosition, hidden) {
-            var round = Core.rounds[Core.rounds.length - 1];
+            var round = Game.rounds[Game.rounds.length - 1];
 
             round.realMarker = new google.maps.Marker({
-                map: Core.map,
+                map: Game.map,
                 visible: !hidden,
                 position: position,
                 title: 'Open in Google Maps',
-                zIndex: Core.rounds.length * 2,
+                zIndex: Game.rounds.length * 2,
                 clickable: true,
-                draggable: false
+                draggable: false,
+                icon: {
+                    url: STATIC_ROOT + '/img/markers/marker-green.svg?rev=' + REVISION,
+                    size: new google.maps.Size(24, 32),
+                    scaledSize: new google.maps.Size(24, 32),
+                    anchor: new google.maps.Point(12, 32)
+                },
             });
 
             round.realMarker.addListener('click', function () {
                 window.open('https://www.google.com/maps/search/?api=1&query=' + this.getPosition().toUrlValue(), '_blank');
             });
 
+            if (!guessPosition) {
+                return;
+            }
+
             round.guessMarker = new google.maps.Marker({
-                map: Core.map,
+                map: Game.map,
                 visible: !hidden,
                 position: guessPosition,
-                zIndex: Core.rounds.length,
+                zIndex: Game.rounds.length,
                 clickable: false,
                 draggable: false,
+                icon: {
+                    url: STATIC_ROOT + '/img/markers/marker-gray-empty.svg?rev=' + REVISION,
+                    size: new google.maps.Size(24, 32),
+                    scaledSize: new google.maps.Size(24, 32),
+                    anchor: new google.maps.Point(12, 32),
+                    labelOrigin: new google.maps.Point(12, 14)
+                },
                 label: {
                     color: '#ffffff',
                     fontFamily: 'Roboto',
-                    fontSize: '18px',
+                    fontSize: '16px',
                     fontWeight: '500',
                     text: '?'
                 }
             });
 
             round.line = new google.maps.Polyline({
-                map: Core.map,
+                map: Game.map,
                 visible: !hidden,
                 path: [
                     position,
@@ -293,54 +519,69 @@
             scoreInfo.children[0].style.display = 'none';
             scoreInfo.children[1].style.display = 'block';
             document.getElementById('showSummaryButton').style.display = null;
-            document.getElementById('startNewGameButton').style.display = 'block';
+
+            if (!roomId || Game.multi.owner) {
+                document.getElementById('startNewGameButton').style.display = 'block';
+            }
 
             var resultBounds = new google.maps.LatLngBounds();
 
-            for (var i = 0; i < Core.rounds.length; ++i) {
-                var round = Core.rounds[i];
+            for (var i = 0; i < Game.rounds.length; ++i) {
+                var round = Game.rounds[i];
 
+                round.realMarker.setIcon({
+                    url: STATIC_ROOT + '/img/markers/marker-green-empty.svg?rev=' + REVISION,
+                    size: new google.maps.Size(24, 32),
+                    scaledSize: new google.maps.Size(24, 32),
+                    anchor: new google.maps.Point(12, 32),
+                    labelOrigin: new google.maps.Point(12, 14)
+                });
                 round.realMarker.setLabel({
-                    color: '#812519',
+                    color: '#285624',
                     fontFamily: 'Roboto',
                     fontSize: '16px',
                     fontWeight: '500',
                     text: String(i + 1)
                 });
+
                 round.realMarker.setVisible(true);
-                round.guessMarker.setVisible(true);
-                round.line.setVisible(true);
+                if (round.guessMarker) {
+                    round.guessMarker.setVisible(true);
+                    round.line.setVisible(true);
+                }
 
                 resultBounds.extend(round.position);
-                resultBounds.extend(round.guessPosition);
+                if (round.guessMarker) {
+                    resultBounds.extend(round.guessPosition);
+                }
             }
 
-            Core.map.fitBounds(resultBounds);
+            Game.map.fitBounds(resultBounds);
 
-            document.getElementById('scoreSum').innerHTML = String(Core.scoreSum);
+            document.getElementById('scoreSum').innerHTML = String(Game.scoreSum);
 
-            var scoreBarProperties = Core.calculateScoreBarProperties(Core.scoreSum, Core.NUMBER_OF_ROUNDS * Core.MAX_SCORE);
+            var scoreBarProperties = Game.calculateScoreBarProperties(Game.scoreSum, Game.NUMBER_OF_ROUNDS * Game.MAX_SCORE);
             var scoreBar = document.getElementById('scoreBar');
             scoreBar.style.backgroundColor = scoreBarProperties.backgroundColor;
             scoreBar.style.width = scoreBarProperties.width;
         },
 
         rewriteGoogleLink: function () {
-            if (!Core.googleLink) {
+            if (!Game.googleLink) {
                 var anchors = document.getElementById('panorama').getElementsByTagName('a');
                 for (var i = 0; i < anchors.length; i++) {
                     var a = anchors[i];
                     if (a.href.indexOf('maps.google.com/maps') !== -1) {
-                        Core.googleLink = a;
+                        Game.googleLink = a;
                         break;
                     }
                 }
             }
 
             setTimeout(function () {
-                if (Core.googleLink) {
-                    Core.googleLink.title = 'Google Maps';
-                    Core.googleLink.href = 'https://maps.google.com/maps';
+                if (Game.googleLink) {
+                    Game.googleLink.title = 'Google Maps';
+                    Game.googleLink.href = 'https://maps.google.com/maps';
                 }
             }, 1);
         }
@@ -360,35 +601,44 @@
         }
     };
 
+    MapGuesser.sessionAvailableHooks.reinitializeGame = Game.prepare;
+
     if (!('ontouchstart' in document.documentElement)) {
-        Core.adaptGuess = true;
+        Game.adaptGuess = true;
     }
 
-    Core.map = new google.maps.Map(document.getElementById('map'), {
+    Game.map = new google.maps.Map(document.getElementById('map'), {
         disableDefaultUI: true,
         clickableIcons: false,
         draggingCursor: 'grabbing'
     });
 
-    Core.map.addListener('click', function (e) {
-        if (Core.rounds[Core.rounds.length - 1].guessPosition) {
+    Game.map.addListener('click', function (e) {
+        if (Game.rounds[Game.rounds.length - 1].guessPosition) {
             return;
         }
 
-        if (Core.guessMarker) {
-            Core.guessMarker.setPosition(e.latLng);
+        if (Game.guessMarker) {
+            Game.guessMarker.setPosition(e.latLng);
             return;
         }
 
-        Core.guessMarker = new google.maps.Marker({
-            map: Core.map,
+        Game.guessMarker = new google.maps.Marker({
+            map: Game.map,
             position: e.latLng,
             clickable: false,
             draggable: true,
+            icon: {
+                url: STATIC_ROOT + '/img/markers/marker-gray-empty.svg?rev=' + REVISION,
+                size: new google.maps.Size(24, 32),
+                scaledSize: new google.maps.Size(24, 32),
+                anchor: new google.maps.Point(12, 32),
+                labelOrigin: new google.maps.Point(12, 14)
+            },
             label: {
                 color: '#ffffff',
                 fontFamily: 'Roboto',
-                fontSize: '18px',
+                fontSize: '16px',
                 fontWeight: '500',
                 text: '?'
             }
@@ -397,22 +647,24 @@
         document.getElementById('guessButton').disabled = false;
     });
 
-    Core.panorama = new google.maps.StreetViewPanorama(document.getElementById('panorama'), {
+    Game.panorama = new google.maps.StreetViewPanorama(document.getElementById('panorama'), {
         disableDefaultUI: true,
         linksControl: true,
         showRoadLabels: false,
         motionTracking: false
     });
 
-    Core.panorama.addListener('position_changed', function () {
-        Core.rewriteGoogleLink();
+    Game.panorama.addListener('position_changed', function () {
+        Game.rewriteGoogleLink();
     });
 
-    Core.panorama.addListener('pov_changed', function () {
-        Core.rewriteGoogleLink();
+    Game.panorama.addListener('pov_changed', function () {
+        Game.rewriteGoogleLink();
     });
 
-    Core.initialize();
+    if (COOKIES_CONSENT) {
+        Game.prepare();
+    }
 
     document.getElementById('showGuessButton').onclick = function () {
         this.style.visibility = 'hidden';
@@ -425,24 +677,55 @@
     }
 
     document.getElementById('guessButton').onclick = function () {
-        if (!Core.guessMarker) {
-            return;
-        }
-
-        this.disabled = true;
-
-        Core.evaluateGuess();
+        Game.evaluateGuess();
     }
 
     document.getElementById('continueButton').onclick = function () {
-        Core.resetRound();
+        if (roomId) {
+            if (!Game.multi.owner) {
+                return;
+            }
+
+            document.getElementById('loading').style.visibility = 'visible';
+
+            MapGuesser.httpRequest('POST', '/multiGame/' + roomId + '/nextRound.json', function () {
+                document.getElementById('loading').style.visibility = 'hidden';
+            });
+        } else {
+            Game.resetRound();
+        }
     }
 
     document.getElementById('showSummaryButton').onclick = function () {
-        Core.showSummary();
+        Game.showSummary();
     }
 
     document.getElementById('startNewGameButton').onclick = function () {
-        Core.resetGame();
+        if (roomId) {
+            if (!Game.multi.owner) {
+                return;
+            }
+
+            document.getElementById('loading').style.visibility = 'visible';
+
+            MapGuesser.httpRequest('POST', '/multiGame/' + roomId + '/initialData.json', function () {
+                document.getElementById('loading').style.visibility = 'hidden';
+            });
+        } else {
+            Game.reset();
+        }
+    }
+
+    document.getElementById('startMultiGameButton').onclick = function () {
+        if (!roomId || !Game.multi.owner) {
+            return;
+        }
+
+        MapGuesser.hideModal();
+        document.getElementById('loading').style.visibility = 'visible';
+
+        MapGuesser.httpRequest('POST', '/multiGame/' + roomId + '/initialData.json', function () {
+            document.getElementById('loading').style.visibility = 'hidden';
+        });
     }
 })();

public/static/js/login/google_signup.js

@@ -0,0 +1,9 @@
+(function () {
+    document.getElementById('cancelGoogleSignupButton').onclick = function () {
+        document.getElementById('loading').style.visibility = 'visible';
+
+        MapGuesser.httpRequest('POST', '/signup/google/reset', function () {
+            window.location.replace('/signup');
+        });
+    };
+})();

public/static/js/login/signup.js

@@ -0,0 +1,12 @@
+(function () {
+    var resetSignupButton = document.getElementById('resetSignupButton');
+    if (resetSignupButton) {
+        resetSignupButton.onclick = function () {
+            document.getElementById('loading').style.visibility = 'visible';
+
+            MapGuesser.httpRequest('POST', '/signup/reset', function () {
+                window.location.reload();
+            });
+        };
+    }
+})();

public/static/js/map_editor.js

@@ -0,0 +1,443 @@
+'use strict';
+
+(function () {
+    var MapEditor = {
+        metadata: {
+            name: null,
+            description: null
+        },
+        map: null,
+        markers: null,
+        panorama: null,
+        selectedMarker: null,
+        added: {},
+        edited: {},
+        deleted: {},
+
+        editMetadata: function () {
+            var form = document.getElementById('metadataForm');
+
+            MapEditor.metadata.name = form.elements.name.value;
+            MapEditor.metadata.description = form.elements.description.value;
+
+            document.getElementById('mapName').innerHTML = form.elements.name.value ? form.elements.name.value : '[unnamed map]';
+
+            MapGuesser.hideModal();
+
+            document.getElementById('saveButton').disabled = false;
+        },
+
+        getPlace: function (placeId, marker) {
+            MapGuesser.httpRequest('GET', '/admin/place.json/' + placeId, function () {
+                document.getElementById('loading').style.visibility = 'hidden';
+
+                if (!this.response.panoId) {
+                    document.getElementById('noPano').style.visibility = 'visible';
+
+                    places[marker.placeId].panoId = -1;
+                    places[marker.placeId].noPano = true;
+
+                    return;
+                }
+
+                places[marker.placeId].panoId = this.response.panoId;
+                places[marker.placeId].noPano = false;
+
+                MapEditor.loadPano(this.response.panoId, places[marker.placeId].pov);
+            });
+        },
+
+        loadPano: function (panoId, pov) {
+            MapEditor.panorama.setVisible(true);
+            MapEditor.panorama.setPov({ heading: pov.heading, pitch: pov.pitch });
+            MapEditor.panorama.setZoom(pov.zoom);
+            MapEditor.panorama.setPano(panoId);
+        },
+
+        loadPanoForNewPlace: function (panoLocationData) {
+            var placeId = MapEditor.selectedMarker.placeId;
+
+            if (!panoLocationData) {
+                places[placeId].panoId = -1;
+                places[placeId].noPano = true;
+
+                document.getElementById('noPano').style.visibility = 'visible';
+
+                return;
+            }
+
+            var latLng = panoLocationData.latLng;
+
+            places[placeId].panoId = panoLocationData.pano;
+            places[placeId].lat = latLng.lat();
+            places[placeId].lng = latLng.lng();
+
+            MapEditor.selectedMarker.setLatLng({ lat: places[placeId].lat, lng: places[placeId].lng });
+            MapEditor.map.panTo(MapEditor.selectedMarker.getLatLng());
+
+            MapEditor.panorama.setVisible(true);
+            MapEditor.panorama.setPov({ heading: 0.0, pitch: 0.0 });
+            MapEditor.panorama.setZoom(0.0);
+            MapEditor.panorama.setPano(panoLocationData.pano);
+        },
+
+        requestPanoData: function (location, canBeIndoor) {
+            var sv = new google.maps.StreetViewService();
+
+            sv.getPanorama({
+                location: location,
+                preference: google.maps.StreetViewPreference.NEAREST,
+                radius: 100,
+                source: canBeIndoor ? google.maps.StreetViewSource.DEFAULT : google.maps.StreetViewSource.OUTDOOR
+            }, function (data, status) {
+                var panoLocationData = status === google.maps.StreetViewStatus.OK ? data.location : null;
+
+                if (panoLocationData === null && !canBeIndoor) {
+                    MapEditor.requestPanoData(location, true);
+                    return;
+                }
+
+                document.getElementById('loading').style.visibility = 'hidden';
+
+                MapEditor.loadPanoForNewPlace(panoLocationData);
+            });
+        },
+
+        select: function (marker) {
+            if (MapEditor.selectedMarker === marker) {
+                MapEditor.closePlace();
+                return;
+            }
+
+            document.getElementById('map').classList.add('selected');
+            document.getElementById('control').classList.add('selected');
+            document.getElementById('noPano').style.visibility = 'hidden';
+            document.getElementById('panorama').style.visibility = 'visible';
+            document.getElementById('placeControl').style.visibility = 'visible';
+
+            MapEditor.resetSelected();
+            MapEditor.selectedMarker = marker;
+
+            MapEditor.map.invalidateSize(true);
+            MapEditor.map.panTo(marker.getLatLng());
+
+            MapEditor.panorama.setVisible(false);
+
+            if (marker.placeId) {
+                MapEditor.markers.removeLayer(MapEditor.selectedMarker);
+                MapEditor.map.addLayer(MapEditor.selectedMarker);
+                marker.setIcon(IconCollection.iconBlue);
+                marker.setZIndexOffset(2000);
+
+                document.getElementById('deleteButton').style.display = 'block';
+
+                if (places[marker.placeId].panoId) {
+                    if (places[marker.placeId].panoId === -1) {
+                        document.getElementById('noPano').style.visibility = 'visible';
+                    } else {
+                        MapEditor.loadPano(places[marker.placeId].panoId, places[marker.placeId].pov);
+                    }
+
+                    return;
+                }
+
+                document.getElementById('loading').style.visibility = 'visible';
+
+                MapEditor.getPlace(marker.placeId, marker);
+            } else {
+                marker.placeId = 'new_' + new Date().getTime();
+
+                var latLng = marker.getLatLng();
+
+                places[marker.placeId] = { id: null, lat: latLng.lat, lng: latLng.lng, panoId: null, pov: { heading: 0.0, pitch: 0.0, zoom: 0 }, noPano: false };
+
+                document.getElementById('loading').style.visibility = 'visible';
+
+                MapEditor.requestPanoData(latLng);
+            }
+        },
+
+        resetSelected: function (del) {
+            if (!MapEditor.selectedMarker) {
+                return;
+            }
+
+            var placeId = MapEditor.selectedMarker.placeId
+
+            if (places[placeId].id && !del) {
+                MapEditor.map.removeLayer(MapEditor.selectedMarker);
+                MapEditor.markers.addLayer(MapEditor.selectedMarker);
+                MapEditor.selectedMarker.setIcon(places[placeId].noPano ? IconCollection.iconRed : IconCollection.iconGreen);
+                MapEditor.selectedMarker.setZIndexOffset(1000);
+            } else {
+                delete places[placeId];
+                MapEditor.map.removeLayer(MapEditor.selectedMarker);
+            }
+
+            document.getElementById('deleteButton').style.display = 'none';
+        },
+
+        applyPlace: function () {
+            var placeId = MapEditor.selectedMarker.placeId;
+
+            if (!places[placeId].noPano) {
+                var latLng = MapEditor.panorama.getPosition();
+                var pov = MapEditor.panorama.getPov();
+                var zoom = MapEditor.panorama.getZoom();
+
+                places[placeId].lat = latLng.lat();
+                places[placeId].lng = latLng.lng();
+                places[placeId].panoId = MapEditor.panorama.getPano();
+                places[placeId].pov = { heading: pov.heading, pitch: pov.pitch, zoom: zoom };
+            }
+
+            if (!places[placeId].id) {
+                places[placeId].id = placeId;
+                MapEditor.added[placeId] = places[placeId];
+
+                document.getElementById('added').innerHTML = String(Object.keys(MapEditor.added).length);
+
+                document.getElementById('deleteButton').style.display = 'block';
+            } else {
+                if (!MapEditor.added[placeId]) {
+                    MapEditor.edited[placeId] = places[placeId];
+
+                    document.getElementById('edited').innerHTML = String(Object.keys(MapEditor.edited).length);
+                } else {
+                    MapEditor.added[placeId] = places[placeId];
+                }
+            }
+
+            MapEditor.selectedMarker.setLatLng({ lat: places[placeId].lat, lng: places[placeId].lng });
+
+            document.getElementById('saveButton').disabled = false;
+        },
+
+        closePlace: function (del) {
+            document.getElementById('map').classList.remove('selected');
+            document.getElementById('control').classList.remove('selected');
+            document.getElementById('noPano').style.visibility = 'hidden';
+            document.getElementById('panorama').style.visibility = 'hidden';
+            document.getElementById('placeControl').style.visibility = 'hidden';
+
+            MapEditor.resetSelected(del);
+            MapEditor.selectedMarker = null;
+
+            MapEditor.map.invalidateSize(true);
+        },
+
+        deletePlace: function () {
+            var placeId = MapEditor.selectedMarker.placeId;
+
+            if (places[placeId].id && !MapEditor.added[placeId]) {
+                MapEditor.deleted[placeId] = places[placeId];
+
+                document.getElementById('deleted').innerHTML = String(Object.keys(MapEditor.deleted).length);
+            }
+
+            MapEditor.closePlace(true);
+
+            delete MapEditor.added[placeId];
+            delete MapEditor.edited[placeId];
+
+            document.getElementById('added').innerHTML = String(Object.keys(MapEditor.added).length);
+            document.getElementById('edited').innerHTML = String(Object.keys(MapEditor.edited).length);
+
+            document.getElementById('saveButton').disabled = false;
+        },
+
+        saveMap: function () {
+            document.getElementById('loading').style.visibility = 'visible';
+
+            var data = new FormData();
+
+            if (MapEditor.metadata.name !== null) {
+                data.append('name', MapEditor.metadata.name);
+            }
+            if (MapEditor.metadata.description !== null) {
+                data.append('description', MapEditor.metadata.description);
+            }
+
+            for (var placeId in MapEditor.added) {
+                if (!MapEditor.added.hasOwnProperty(placeId)) {
+                    continue;
+                }
+                data.append('added[]', JSON.stringify(MapEditor.added[placeId]));
+            }
+            for (var placeId in MapEditor.edited) {
+                if (!MapEditor.edited.hasOwnProperty(placeId)) {
+                    continue;
+                }
+                data.append('edited[]', JSON.stringify(MapEditor.edited[placeId]));
+            }
+            for (var placeId in MapEditor.deleted) {
+                if (!MapEditor.deleted.hasOwnProperty(placeId)) {
+                    continue;
+                }
+                data.append('deleted[]', JSON.stringify(MapEditor.deleted[placeId]));
+            }
+
+            MapGuesser.httpRequest('POST', '/admin/saveMap/' + mapId + '/json', function () {
+                document.getElementById('loading').style.visibility = 'hidden';
+
+                if (this.response.error) {
+                    //TODO: handle this error
+                    return;
+                }
+
+                MapEditor.replacePlaceIdsToReal(this.response.added);
+
+                if (mapId === 0) {
+                    mapId = this.response.mapId;
+                    window.history.replaceState(null, '', '/admin/mapEditor/' + mapId);
+                }
+
+                MapEditor.added = {};
+                MapEditor.edited = {};
+                MapEditor.deleted = {};
+
+                document.getElementById('added').innerHTML = '0';
+                document.getElementById('edited').innerHTML = '0';
+                document.getElementById('deleted').innerHTML = '0';
+
+                document.getElementById('saveButton').disabled = true;
+            }, data);
+        },
+
+        replacePlaceIdsToReal: function (addedPlaces) {
+            for (var i = 0; i < addedPlaces.length; ++i) {
+                var tempId = addedPlaces[i].tempId;
+                var placeId = addedPlaces[i].id;
+                places[tempId].id = placeId;
+            }
+        }
+    };
+
+    var IconCollection = {
+        iconGreen: L.icon({
+            iconUrl: STATIC_ROOT + '/img/markers/marker-green.svg?rev' + REVISION,
+            iconSize: [24, 32],
+            iconAnchor: [12, 32]
+        }),
+        iconRed: L.icon({
+            iconUrl: STATIC_ROOT + '/img/markers/marker-red.svg?rev=' + REVISION,
+            iconSize: [24, 32],
+            iconAnchor: [12, 32]
+        }),
+        iconBlue: L.icon({
+            iconUrl: STATIC_ROOT + '/img/markers/marker-blue.svg?rev=' + REVISION,
+            iconSize: [24, 32],
+            iconAnchor: [12, 32]
+        }),
+    };
+
+    var Util = {
+        getHighResData: function () {
+            if (window.devicePixelRatio >= 4) {
+                return { ppi: 320, tileSize: 128, zoomOffset: 1, minZoom: 0, maxZoom: 18 };
+            } else if (window.devicePixelRatio >= 2) {
+                return { ppi: 250, tileSize: 256, zoomOffset: 0, minZoom: 1, maxZoom: 19 };
+            } else {
+                return { ppi: 72, tileSize: 512, zoomOffset: -1, minZoom: 2, maxZoom: 20 };
+            }
+        }
+    };
+
+    MapEditor.map = L.map('map', {
+        zoomControl: false
+    });
+
+    MapEditor.map.on('click', function (e) {
+        var marker = L.marker(e.latlng, {
+            icon: IconCollection.iconBlue,
+            zIndexOffset: 2000
+        })
+            .addTo(MapEditor.map)
+            .on('click', function () {
+                MapEditor.select(this);
+            });
+
+        MapEditor.select(marker);
+    });
+
+    var highResData = Util.getHighResData();
+
+    L.tileLayer(tileUrl, {
+        attribution: tileAttribution,
+        subdomains: '1234',
+        ppi: highResData.ppi,
+        tileSize: highResData.tileSize,
+        zoomOffset: highResData.zoomOffset,
+        minZoom: highResData.minZoom,
+        maxZoom: highResData.maxZoom
+    }).addTo(MapEditor.map);
+
+    MapEditor.map.fitBounds(L.latLngBounds({ lat: mapBounds.south, lng: mapBounds.west }, { lat: mapBounds.north, lng: mapBounds.east }));
+
+    MapEditor.markers = L.markerClusterGroup({
+        maxClusterRadius: 50
+    });
+
+    for (var placeId in places) {
+        if (!places.hasOwnProperty(placeId)) {
+            continue;
+        }
+
+        var place = places[placeId];
+
+        var marker = L.marker({ lat: place.lat, lng: place.lng }, {
+            icon: place.noPano ? IconCollection.iconRed : IconCollection.iconGreen,
+            zIndexOffset: 1000
+        })
+            .addTo(MapEditor.markers)
+            .on('click', function () {
+                MapEditor.select(this);
+            });
+
+        marker.placeId = place.id;
+    }
+
+    MapEditor.map.addLayer(MapEditor.markers);
+
+    MapEditor.panorama = new google.maps.StreetViewPanorama(document.getElementById('panorama'), {
+        // switch off fullscreenControl because positioning doesn't work
+        fullscreenControl: false,
+        fullscreenControlOptions: {
+            position: google.maps.ControlPosition.LEFT_TOP
+        },
+        motionTracking: false
+    });
+
+    document.getElementById('mapName').onclick = function (e) {
+        e.preventDefault();
+
+        MapGuesser.showModal('metadata');
+        document.getElementById('metadataForm').elements.name.select();
+    };
+
+    document.getElementById('metadataForm').onsubmit = function (e) {
+        e.preventDefault();
+
+        MapEditor.editMetadata();
+    };
+
+    document.getElementById('closeMetadataButton').onclick = function () {
+        MapGuesser.hideModal();
+    };
+
+    document.getElementById('saveButton').onclick = function () {
+        MapEditor.saveMap();
+    };
+
+    document.getElementById('applyButton').onclick = function () {
+        MapEditor.applyPlace();
+    };
+
+    document.getElementById('closeButton').onclick = function () {
+        MapEditor.closePlace();
+    };
+
+    document.getElementById('deleteButton').onclick = function () {
+        MapEditor.deletePlace();
+    };
+})();

public/static/js/mapguesser.js

@@ -0,0 +1,267 @@
+var MapGuesser = {
+    isSecure: window.location.protocol === 'https:',
+    cookiesAgreed: false,
+    sessionAvailableHooks: {},
+
+    initGoogleAnalitics: function () {
+        if (typeof GOOGLE_ANALITICS_ID === 'undefined') {
+            return;
+        }
+
+        // Global site tag (gtag.js) - Google Analytics
+        var script = document.createElement('script');
+        script.src = 'https://www.googletagmanager.com/gtag/js?id=' + GOOGLE_ANALITICS_ID;
+        script.async = true;
+
+        document.head.appendChild(script);
+
+        window.dataLayer = window.dataLayer || [];
+        function gtag() { dataLayer.push(arguments); }
+        gtag('js', new Date());
+        gtag('config', GOOGLE_ANALITICS_ID);
+    },
+
+    agreeCookies: function () {
+        if (MapGuesser.cookiesAgreed) {
+            return;
+        }
+
+        var expirationDate = new Date(new Date().getTime() + 20 * 365 * 24 * 60 * 60 * 1000).toUTCString();
+        document.cookie = 'COOKIES_CONSENT=1; expires=' + expirationDate + '; path=/';
+
+        MapGuesser.initGoogleAnalitics();
+        MapGuesser.httpRequest('GET', '/startSession.json', function () {
+            ANTI_CSRF_TOKEN = this.response.antiCsrfToken;
+
+            for (var hookId in MapGuesser.sessionAvailableHooks) {
+                if (!MapGuesser.sessionAvailableHooks.hasOwnProperty(hookId)) {
+                    continue;
+                }
+
+                MapGuesser.sessionAvailableHooks[hookId]();
+            }
+        });
+
+        MapGuesser.cookiesAgreed = true;
+    },
+
+    httpRequest: function (method, url, callback, data) {
+        var xhr = new XMLHttpRequest();
+
+        xhr.onload = callback;
+
+        xhr.open(method, url, true);
+
+        xhr.responseType = 'json';
+
+        if (method === 'POST') {
+            if (typeof data === 'undefined') {
+                data = new FormData();
+            }
+
+            data.append('anti_csrf_token', ANTI_CSRF_TOKEN);
+
+            xhr.send(data);
+        } else {
+            xhr.send();
+        }
+    },
+
+    setOnsubmitForForm: function (form) {
+        form.onsubmit = function (e) {
+            e.preventDefault();
+
+            document.getElementById('loading').style.visibility = 'visible';
+
+            var formData = new FormData(form);
+            var formError = form.getElementsByClassName('formError')[0];
+            var pageLeaveOnSuccess = form.dataset.redirectOnSuccess || form.dataset.reloadOnSuccess;
+
+            MapGuesser.httpRequest('POST', form.action, function () {
+                if (!pageLeaveOnSuccess) {
+                    document.getElementById('loading').style.visibility = 'hidden';
+                }
+
+                if (this.response.error) {
+                    if (pageLeaveOnSuccess) {
+                        document.getElementById('loading').style.visibility = 'hidden';
+                    }
+
+                    formError.style.display = 'block';
+                    formError.innerHTML = this.response.error.errorText;
+
+                    return;
+                }
+
+                if (this.response.redirect) {
+                    window.location.replace(this.response.redirect.target);
+
+                    return;
+                }
+
+                if (!pageLeaveOnSuccess) {
+                    formError.style.display = 'none';
+                    form.reset();
+                } else {
+                    if (form.dataset.redirectOnSuccess) {
+                        window.location.replace(form.dataset.redirectOnSuccess);
+                    } else if (form.dataset.reloadOnSuccess) {
+                        window.location.reload();
+                    }
+                }
+            }, formData);
+        }
+    },
+
+    showModal: function (id) {
+        document.getElementById(id).style.visibility = 'visible';
+        document.getElementById('cover').style.visibility = 'visible';
+    },
+
+    showModalWithContent: function (title, body, extraButtons) {
+        if (typeof extraButtons === 'undefined') {
+            extraButtons = [];
+        }
+
+        MapGuesser.showModal('modal');
+
+        document.getElementById('modalTitle').textContent = title;
+
+        if (typeof body === 'object') {
+            document.getElementById('modalText').appendChild(body);
+        } else {
+            document.getElementById('modalText').textContent = body;
+        }
+
+        var buttons = document.getElementById('modalButtons');
+        buttons.textContent = '';
+
+        for (var i = 0; i < extraButtons.length; i++) {
+            var extraButton = extraButtons[i];
+            var button = document.createElement(extraButton.type);
+
+            if (extraButton.type === 'a') {
+                button.classList.add('button');
+            }
+
+            for (var i = 0; i < extraButton.classNames.length; i++) {
+                button.classList.add(extraButton.classNames[i]);
+            }
+
+            button.classList.add('marginTop');
+            button.classList.add('marginRight');
+            button.textContent = extraButton.text;
+
+            if (extraButton.type === 'a') {
+                button.href = extraButton.href;
+            } else if (extraButton.type === 'button') {
+                button.onclick = extraButton.onclick;
+            }
+
+            buttons.appendChild(button);
+        }
+
+        var closeButton = document.createElement('button');
+
+        closeButton.classList.add('gray');
+        closeButton.classList.add('marginTop');
+        closeButton.textContent = 'Close';
+        closeButton.onclick = function () {
+            MapGuesser.hideModal();
+        };
+
+        buttons.appendChild(closeButton);
+    },
+
+    hideModal: function () {
+        var modals = document.getElementsByClassName('modal');
+
+        for (var i = 0; i < modals.length; i++) {
+            modals[i].style.visibility = 'hidden';
+        }
+
+        document.getElementById('cover').style.visibility = 'hidden';
+    },
+
+    observeInput: function (input, buttonToToggle) {
+        if (input.defaultValue !== input.value) {
+            buttonToToggle.disabled = false;
+        } else {
+            buttonToToggle.disabled = true;
+        }
+    },
+
+    observeInputsInForm: function (form, observedInputs) {
+        for (var i = 0; i < observedInputs.length; i++) {
+            var input = form.elements[observedInputs[i]];
+
+            switch (input.tagName) {
+                case 'INPUT':
+                case 'TEXTAREA':
+                    input.oninput = function () {
+                        MapGuesser.observeInput(this, form.elements.submit);
+                    };
+                    break;
+                case 'SELECT':
+                    input.onchange = function () {
+                        MapGuesser.observeInput(this, form.elements.submit);
+                    };
+                    break;
+            }
+        }
+
+        form.onreset = function () {
+            form.elements.submit.disabled = true;
+        }
+    }
+};
+
+(function () {
+    var anchors = document.getElementsByTagName('a');
+    for (var i = 0; i < anchors.length; i++) {
+        var a = anchors[i];
+        if (a.href !== 'javascript:;' && a.target !== '_blank') {
+            a.onclick = function () {
+                document.getElementById('loading').style.visibility = 'visible';
+            }
+        }
+    }
+
+    var forms = document.getElementsByTagName('form');
+    for (var i = 0; i < forms.length; i++) {
+        var form = forms[i];
+
+        if (form.dataset.noSubmit) {
+            continue;
+        }
+
+        MapGuesser.setOnsubmitForForm(form);
+
+        if (form.dataset.observeInputs) {
+            MapGuesser.observeInputsInForm(form, form.dataset.observeInputs.split(','));
+        }
+    }
+
+    document.getElementById('cover').onclick = function () {
+        MapGuesser.hideModal();
+    };
+
+    if (COOKIES_CONSENT) {
+        MapGuesser.initGoogleAnalitics();
+    } else {
+        // we don't want user to agree cookies when clicking on the notice itself
+        document.getElementById('cookiesNotice').onclick = function (e) {
+            e.stopPropagation();
+        };
+
+        document.getElementById('agreeCookiesButton').onclick = function () {
+            MapGuesser.agreeCookies();
+
+            document.getElementById('cookiesNotice').style.display = 'none';
+        };
+
+        window.onclick = function () {
+            MapGuesser.agreeCookies();
+        };
+    }
+})();

public/static/js/maps.js

@@ -0,0 +1,112 @@
+(function () {
+    var Maps = {
+        descriptionDivs: null,
+
+        addStaticMaps: function () {
+            var imgContainers = document.getElementById('mapContainer').getElementsByClassName('imgContainer');
+            for (var i = 0; i < imgContainers.length; i++) {
+                var imgContainer = imgContainers[i];
+
+                var imgSrc = 'https://maps.googleapis.com/maps/api/staticmap?size=350x175&' +
+                    'scale=' + (window.devicePixelRatio >= 2 ? 2 : 1) + '&' +
+                    'visible=' + imgContainer.dataset.boundSouthLat + ',' + imgContainer.dataset.boundWestLng + '|' +
+                    imgContainer.dataset.boundNorthLat + ',' + imgContainer.dataset.boundEastLng +
+                    '&key=' + GOOGLE_MAPS_JS_API_KEY;
+
+                imgContainer.style.backgroundImage = 'url("' + imgSrc + '")';
+            }
+        },
+
+        initializeDescriptionDivs: function () {
+            Maps.descriptionDivs = document.getElementById('mapContainer').getElementsByClassName('description');
+
+            for (var i = 0; i < Maps.descriptionDivs.length; i++) {
+                var description = Maps.descriptionDivs[i];
+                var boundingClientRect = description.getBoundingClientRect();
+
+                description.defaultHeight = boundingClientRect.height;
+            }
+        },
+
+        calculateDescriptionDivHeights: function () {
+            var currentY;
+            var rows = [];
+            for (var i = 0; i < Maps.descriptionDivs.length; i++) {
+                var description = Maps.descriptionDivs[i];
+                var boundingClientRect = description.getBoundingClientRect();
+
+                if (currentY !== boundingClientRect.y) {
+                    rows.push([]);
+                }
+
+                rows[rows.length - 1].push(description);
+
+                currentY = boundingClientRect.y;
+            }
+
+            for (var i = 0; i < rows.length; i++) {
+                var row = rows[i];
+
+                var maxHeight = 0;
+                for (var j = 0; j < row.length; j++) {
+                    var description = row[j];
+
+                    if (description.defaultHeight > maxHeight) {
+                        maxHeight = description.defaultHeight;
+                    }
+                }
+
+                for (var j = 0; j < row.length; j++) {
+                    var description = row[j];
+
+                    description.style.height = maxHeight + 'px';
+                }
+            }
+        }
+    };
+
+    Maps.addStaticMaps();
+
+    Maps.initializeDescriptionDivs();
+    Maps.calculateDescriptionDivHeights();
+
+    window.onresize = function () {
+        Maps.calculateDescriptionDivHeights();
+    };
+
+    document.getElementById('multiForm').onsubmit = function (e) {
+        e.preventDefault();
+
+        var roomId = this.elements.roomId.value;
+        if (roomId.length !== 6) {
+            return;
+        }
+
+        window.location.href = '/multiGame/' + this.elements.roomId.value;
+    };
+
+    document.getElementById('multiButton').onclick = function () {
+        MapGuesser.showModal('multi');
+        document.getElementById('createNewRoomButton').href = '/multiGame/new/' + this.dataset.mapId;
+        document.getElementById('multiForm').elements.roomId.select();
+    }
+
+    document.getElementById('closePlayModeButton').onclick = function () {
+        MapGuesser.hideModal();
+    };
+
+    document.getElementById('closeMultiButton').onclick = function () {
+        MapGuesser.hideModal();
+    };
+
+    var buttons = document.getElementById('mapContainer').getElementsByClassName('playButton');
+    for (var i = 0; i < buttons.length; i++) {
+        var button = buttons[i];
+
+        button.onclick = function () {
+            MapGuesser.showModal('playMode');
+            document.getElementById('singleButton').href = '/game/' + this.dataset.mapId;
+            document.getElementById('multiButton').dataset.mapId = this.dataset.mapId;
+        };
+    }
+})();

public/static/js/maps_admin.js

@@ -0,0 +1,34 @@
+(function () {
+    Maps = {
+        deleteMap: function (mapId, mapName) {
+            MapGuesser.showModalWithContent('Delete map', 'Are you sure you want to delete map \'' + mapName + '\'?', [{
+                type: 'button',
+                classNames: ['red'],
+                text: 'Delete',
+                onclick: function () {
+                    document.getElementById('loading').style.visibility = 'visible';
+
+                    MapGuesser.httpRequest('POST', '/admin/deleteMap/' + mapId, function () {
+                        if (this.response.error) {
+                            document.getElementById('loading').style.visibility = 'hidden';
+
+                            //TODO: handle this error
+                            return;
+                        }
+
+                        window.location.reload();
+                    });
+                }
+            }]);
+        }
+    };
+
+    var buttons = document.getElementById('mapContainer').getElementsByClassName('deleteButton');
+    for (var i = 0; i < buttons.length; i++) {
+        var button = buttons[i];
+
+        button.onclick = function () {
+            Maps.deleteMap(this.dataset.mapId, this.dataset.mapName);
+        };
+    }
+})();

public/static/package.json

@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "leaflet": "^1.6.0",
+    "leaflet.markercluster": "^1.4.1"
+  }
+}

public/static/yarn.lock

@@ -0,0 +1,13 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+leaflet.markercluster@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/leaflet.markercluster/-/leaflet.markercluster-1.4.1.tgz#b53f2c4f2ca7306ddab1dbb6f1861d5e8aa6c5e5"
+  integrity sha512-ZSEpE/EFApR0bJ1w/dUGwTSUvWlpalKqIzkaYdYB7jaftQA/Y2Jav+eT4CMtEYFj+ZK4mswP13Q2acnPBnhGOw==
+
+leaflet@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.6.0.tgz#aecbb044b949ec29469eeb31c77a88e2f448f308"
+  integrity sha512-CPkhyqWUKZKFJ6K8umN5/D2wrJ2+/8UIpXppY7QDnUZW5bZL5+SEI2J7GBpwh4LIupOKqbNSQXgqmrEJopHVNQ==

scripts/deploy-to-multiple-worktrees.py

@@ -0,0 +1,147 @@
+#!/usr/bin/python3
+
+# Usage: ./deploy-to-multiple-worktrees.py REPO_PATH WORKTREE_DEVELOPMENT_PATH WORKTREE_PRODUCTION_PATH
+
+import sys
+import os
+import subprocess
+import re
+
+WORKTREE_REGEX = r"^worktree (.*)\nHEAD ([a-f0-9]*)\n(?:branch refs\/heads\/(.*)|detached)$"
+
+if len(sys.argv) < 4:
+    print("Usage: ./deploy-to-multiple-worktrees.py REPO_PATH WORKTREE_DEVELOPMENT_PATH WORKTREE_PRODUCTION_PATH")
+    exit(1)
+
+REPO = os.path.abspath(sys.argv[1])
+WORKTREE_DEVELOPMENT = os.path.abspath(sys.argv[2])
+WORKTREE_PRODUCTION = os.path.abspath(sys.argv[3])
+
+class Worktree:
+    def __init__(self, path, branch, revision, version):
+        self.path = path
+        self.branch = branch
+        self.revision = revision
+        self.version = version
+        self.newRevision = None
+        self.newVersion = None
+
+def getDataForWorktrees():
+    ret = subprocess.check_output(["git", "worktree", "list", "--porcelain"], cwd=REPO).decode().strip()
+    blocks = ret.split("\n\n")
+
+    worktrees = []
+
+    for block in blocks:
+        matches = re.search(WORKTREE_REGEX, block)
+
+        if matches:
+            path = matches.group(1)
+            revision = matches.group(2)
+            branch = matches.group(3)
+            version = getVersion(revision)
+
+            worktrees.append(Worktree(path, branch, revision, version))
+
+    return worktrees
+
+def findWorktree(path):
+    for worktree in worktrees:
+        if worktree.path == path:
+            return worktree
+
+    return None
+
+def getVersion(branch):
+    return subprocess.check_output(["git", "describe", "--tags", "--always", "--match", "Release_*", branch], cwd=REPO).decode().strip()
+
+def getRevisionForRef(ref):
+    return subprocess.check_output(["git", "rev-list", "-1", ref], cwd=REPO).decode().strip()
+
+def getLatestReleaseTag():
+    return subprocess.check_output(["git", "for-each-ref", "refs/tags/Release*", "--count=1", "--sort=-creatordate", "--format=%(refname:short)"], cwd=REPO).decode().strip()
+
+def updateRepoFromRemote():
+    subprocess.call(["git", "fetch", "origin", "--prune"], cwd=REPO)
+
+def checkoutWorktree(worktreePath, ref):
+    subprocess.call(["git", "checkout", "-f", ref], cwd=worktreePath)
+
+def cleanWorktree(worktreePath):
+    subprocess.call(["git", "clean", "-f", "-d"], cwd=worktreePath)
+
+def updateAppInWorktree(worktreePath):
+    subprocess.call([worktreePath + "/scripts/update.sh"], cwd=worktreePath)
+
+def updateAppVersionInWorktree(worktreePath):
+    subprocess.call([worktreePath + "/scripts/update-version.sh"], cwd=worktreePath)
+
+worktrees = getDataForWorktrees()
+
+updateRepoFromRemote()
+
+print("Repo is updated from origin")
+
+print("----------------------------------------------")
+print("----------------------------------------------")
+
+developmentWorktree = findWorktree(WORKTREE_DEVELOPMENT)
+
+developmentWorktree.newRevision = getRevisionForRef(developmentWorktree.branch)
+developmentWorktree.newVersion = getVersion(developmentWorktree.revision)
+
+print("DEVELOPMENT (" + developmentWorktree.path + ") is on branch " + developmentWorktree.branch)
+print(developmentWorktree.revision + " = " + developmentWorktree.branch + " (" + developmentWorktree.version + ")")
+print(developmentWorktree.newRevision + " = origin/" + developmentWorktree.branch + " (" + developmentWorktree.newVersion + ")")
+
+if developmentWorktree.revision != developmentWorktree.newRevision:
+    print("-> DEVELOPMENT (" + developmentWorktree.path + ") will be UPDATED")
+    print("----------------------------------------------")
+
+    checkoutWorktree(developmentWorktree.path, developmentWorktree.branch)
+    cleanWorktree(developmentWorktree.path)
+
+    print(developmentWorktree.path + " is checked out to " + developmentWorktree.branch + " and cleaned")
+
+    updateAppInWorktree(developmentWorktree.path)
+    updateAppVersionInWorktree(developmentWorktree.path)
+
+    print("MapGuesser is updated in " + developmentWorktree.path)
+elif developmentWorktree.version != developmentWorktree.newVersion:
+    print("-> DEVELOPMENT " + developmentWorktree.path + "'s version info will be UPDATED")
+
+    updateAppVersionInWorktree(developmentWorktree.path)
+
+    print("MapGuesser version is updated in " + developmentWorktree.path)
+else:
+    print("-> DEVELOPMENT (" + developmentWorktree.path + ") WON'T be updated")
+
+print("----------------------------------------------")
+print("----------------------------------------------")
+
+productionWorktree = findWorktree(WORKTREE_PRODUCTION)
+
+productionWorktree.newVersion = getLatestReleaseTag()
+productionWorktree.newRevision = getRevisionForRef(productionWorktree.newVersion)
+
+print("PRODUCTION (" + productionWorktree.path + ")")
+print(productionWorktree.revision + " = " + productionWorktree.version)
+print(productionWorktree.newRevision + " = " + productionWorktree.newVersion)
+
+if productionWorktree.revision != productionWorktree.newRevision:
+    print("-> PRODUCTION (" + productionWorktree.path + ") will be UPDATED")
+
+    checkoutWorktree(productionWorktree.path, productionWorktree.newRevision)
+    cleanWorktree(productionWorktree.path)
+
+    print(productionWorktree.path + " is checked out to " + productionWorktree.newRevision + " and cleaned")
+
+    updateAppInWorktree(productionWorktree.path)
+    updateAppVersionInWorktree(productionWorktree.path)
+
+    print("MapGuesser is updated in " + productionWorktree.path)
+else:
+    print("-> PRODUCTION (" + productionWorktree.path + ") WON'T be updated")
+
+print("----------------------------------------------")
+print("----------------------------------------------")

scripts/gitHooks/prepare-commit-msg

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+BRANCH_NAME=$(git symbolic-ref --short HEAD)
+BRANCH_PATTERN="^(bugfix|feature|hotfix)\/([A-Z]+-[0-9]+).*"
+
+if [[ "${BRANCH_NAME}" =~ $BRANCH_PATTERN ]]; then
+    TICKET_ID=$(echo $BRANCH_NAME | sed -E "s@$BRANCH_PATTERN@\\2@")
+
+    COMMIT_MESSAGE=$(head -n 1 $1)
+    COMMIT_MESSAGE_REGEX="^$TICKET_ID .*"
+
+    if [[ ! "${COMMIT_MESSAGE}" =~ $COMMIT_MESSAGE_REGEX ]]; then
+        sed -i.bak -e "1s/^/$TICKET_ID /" $1
+    fi
+fi

scripts/install.sh

@@ -9,14 +9,24 @@ if [ -f ${ROOT_DIR}/installed ]; then
     exit 1
 fi
 
-echo "Installing MapGuesser DB..."
+echo "Installing NPM packages..."
+(cd ${ROOT_DIR}/multi && npm install)
 
+echo "Installing Yarn packages..."
+(cd ${ROOT_DIR}/public/static && yarn install)
+
+echo "Installing MapGuesser DB..."
 mysql --host=${DB_HOST} --user=${DB_USER} --password=${DB_PASSWORD} ${DB_NAME} < ${ROOT_DIR}/db/mapguesser.sql
 
+echo "Migrating DB..."
+(cd ${ROOT_DIR} && ./mapg db:migrate)
+
 if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
     echo "Minifying JS, CSS and SVG files..."
-
     ${ROOT_DIR}/scripts/minify.sh
+
+    echo "Linking view files..."
+    (cd ${ROOT_DIR} && ./mapg view:link)
 fi
 
 touch ${ROOT_DIR}/installed

scripts/minify.sh

@@ -4,6 +4,8 @@ ROOT_DIR=$(dirname $(readlink -f "$0"))/..
 
 . ${ROOT_DIR}/.env
 
-uglifyjs ${ROOT_DIR}/public/static/js/game.js -c -m -o ${ROOT_DIR}/public/static/js/game.js
-cleancss ${ROOT_DIR}/public/static/css/mapguesser.css -o ${ROOT_DIR}/public/static/css/mapguesser.css
-svgo ${ROOT_DIR}/public/static/img/loading.svg -o ${ROOT_DIR}/public/static/img/loading.svg
+find ${ROOT_DIR}/public/static/js -type f -iname '*.js' -exec uglifyjs {} -c -m -o {} \;
+
+find ${ROOT_DIR}/public/static/css -type f -iname '*.css' -exec cleancss {} -o {} \;
+
+find ${ROOT_DIR}/public/static/img -type f -iname '*.svg' -exec svgo {} -o {} \;

scripts/run-sql.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [ "$#" -lt 1 ]; then
+    echo "Usage: $0 <sql_file>"
+    exit 1
+fi
+
+SQL_FILE=$1
+
+ROOT_DIR=$(dirname $(readlink -f "$0"))/..
+
+. ${ROOT_DIR}/.env
+
+if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
+    echo "This script can only be used in DEV mode!"
+    exit 1
+fi
+
+echo "Running SQL on DB..."
+mysql --host=${DB_HOST} --user=${DB_USER} --password=${DB_PASSWORD} ${DB_NAME} < ${SQL_FILE}

scripts/update-version.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+ROOT_DIR=$(dirname $(readlink -f "$0"))/..
+
+. ${ROOT_DIR}/.env
+
+cd ${ROOT_DIR}
+
+echo "Updating version info..."
+
+VERSION=$(git describe --tags --always --match "Release_*" HEAD)
+REVISION=$(git rev-parse --short HEAD)
+REVISION_DATE=$(git show -s --format=%aI HEAD)
+
+sed -i -E "s/const VERSION = '(.*)';/const VERSION = '${VERSION}';/" main.php
+sed -i -E "s/const REVISION = '(.*)';/const REVISION = '${REVISION}';/" main.php
+sed -i -E "s/const REVISION_DATE = '(.*)';/const REVISION_DATE = '${REVISION_DATE}';/" main.php

scripts/update.sh

@@ -5,10 +5,25 @@ ROOT_DIR=$(dirname $(readlink -f "$0"))/..
 . ${ROOT_DIR}/.env
 
 echo "Installing Composer packages..."
-(cd ${ROOT_DIR} && composer install)
+if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
+    (cd ${ROOT_DIR} && composer install --no-dev)
+else
+    (cd ${ROOT_DIR} && composer install --dev)
+fi
+
+echo "Installing NPM packages..."
+(cd ${ROOT_DIR}/multi && npm install)
+
+echo "Installing Yarn packages..."
+(cd ${ROOT_DIR}/public/static && yarn install)
+
+echo "Migrating DB..."
+(cd ${ROOT_DIR} && ./mapg db:migrate)
 
 if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
     echo "Minifying JS, CSS and SVG files..."
-
     ${ROOT_DIR}/scripts/minify.sh
+
+    echo "Linking view files..."
+    (cd ${ROOT_DIR} && ./mapg view:link)
 fi

src/Cli/AddUserCommand.php

@@ -0,0 +1,51 @@
+<?php namespace MapGuesser\Cli;
+
+use DateTime;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\PersistentData\Model\User;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class AddUserCommand extends Command
+{
+    public function configure(): void
+    {
+        $this->setName('user:add')
+            ->setDescription('Adding of user.')
+            ->addArgument('email', InputArgument::REQUIRED, 'Email of user')
+            ->addArgument('password', InputArgument::REQUIRED, 'Password of user')
+            ->addArgument('type', InputArgument::OPTIONAL, 'Type of user');;
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $user = new User();
+        $user->setEmail($input->getArgument('email'));
+        $user->setPlainPassword($input->getArgument('password'));
+        $user->setActive(true);
+        $user->setCreatedDate(new DateTime());
+
+        if ($input->hasArgument('type')) {
+            $user->setType($input->getArgument('type'));
+        }
+
+        try {
+            $pdm = new PersistentDataManager();
+            $pdm->saveToDb($user);
+        } catch (\Exception $e) {
+            $output->writeln('<error>Adding user failed!</error>');
+            $output->writeln('');
+
+            $output->writeln((string) $e);
+            $output->writeln('');
+
+            return 1;
+        }
+
+        $output->writeln('<info>User was successfully added!</info>');
+
+        return 0;
+    }
+}

src/Cli/LinkViewCommand.php

@@ -0,0 +1,69 @@
+<?php namespace MapGuesser\Cli;
+
+use FilesystemIterator;
+use MapGuesser\View\Linker;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class LinkViewCommand extends Command
+{
+    public function configure(): void
+    {
+        $this->setName('view:link')
+            ->setDescription('Linking of views.')
+            ->addArgument('view', InputArgument::OPTIONAL, 'View file to be linked.');
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $views = [];
+
+        $view = $input->getArgument('view');
+
+        if ($view !== null) {
+            $views[] = $view;
+        } else {
+            $folder = ROOT . '/views';
+            $folderLength = strlen($folder) + 1;
+
+            $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($folder, FilesystemIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST);
+
+            foreach ($iterator as $file) {
+                if ($file->isDir() || $file->getExtension() !== 'php') {
+                    continue;
+                }
+
+                $view = substr($file->getPath(), $folderLength) . '/' . $file->getBasename('.php');
+
+                if (strpos($view, 'templates') === 0 || strpos($view, 'tests') === 0) {
+                    continue;
+                }
+
+                $views[] = $view;
+            }
+        }
+
+        try {
+            foreach ($views as $view) {
+                $generator = new Linker($view);
+                $generator->generate();
+            }
+        } catch (\Exception $e) {
+            $output->writeln('<error>Linking view(s) failed!</error>');
+            $output->writeln('');
+
+            $output->writeln((string) $e);
+            $output->writeln('');
+
+            return 1;
+        }
+
+        $output->writeln('<info>View(s) successfully linked!</info>');
+
+        return 0;
+    }
+}

src/Cli/MaintainDatabaseCommand.php

@@ -0,0 +1,119 @@
+<?php namespace MapGuesser\Cli;
+
+use DateTime;
+use MapGuesser\Database\Query\Modify;
+use MapGuesser\Database\Query\Select;
+use MapGuesser\Interfaces\Database\IResultSet;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\Repository\MultiRoomRepository;
+use MapGuesser\Repository\UserConfirmationRepository;
+use MapGuesser\Repository\UserPasswordResetterRepository;
+use MapGuesser\Repository\UserRepository;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class MaintainDatabaseCommand extends Command
+{
+    private PersistentDataManager $pdm;
+
+    private UserRepository $userRepository;
+
+    private UserConfirmationRepository $userConfirmationRepository;
+
+    private UserPasswordResetterRepository $userPasswordResetterRepository;
+
+    private MultiRoomRepository $multiRoomRepository;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->pdm = new PersistentDataManager();
+        $this->userRepository = new UserRepository();
+        $this->userConfirmationRepository = new UserConfirmationRepository();
+        $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
+        $this->multiRoomRepository = new MultiRoomRepository();
+    }
+
+    public function configure(): void
+    {
+        $this->setName('db:maintain')
+            ->setDescription('Maintain database.');
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        try {
+            $this->deleteInactiveExpiredUsers();
+            $this->deleteExpiredPasswordResetters();
+            $this->deleteExpiredRooms();
+            $this->deleteExpiredSessions();
+        } catch (\Exception $e) {
+            $output->writeln('<error>Maintenance failed!</error>');
+            $output->writeln('');
+
+            $output->writeln((string) $e);
+            $output->writeln('');
+
+            return 1;
+        }
+
+        $output->writeln('<info>Maintenance was successful!</info>');
+        $output->writeln('');
+
+        return 0;
+    }
+
+    private function deleteInactiveExpiredUsers(): void
+    {
+        \Container::$dbConnection->startTransaction();
+
+        foreach ($this->userRepository->getAllInactiveExpired() as $user) {
+            //TODO: these can be in some wrapper class
+            $userConfirmation = $this->userConfirmationRepository->getByUser($user);
+            if ($userConfirmation !== null) {
+                $this->pdm->deleteFromDb($userConfirmation);
+            }
+
+            $userPasswordResetter = $this->userPasswordResetterRepository->getByUser($user);
+            if ($userPasswordResetter !== null) {
+                $this->pdm->deleteFromDb($userPasswordResetter);
+            }
+
+            $this->pdm->deleteFromDb($user);
+        }
+
+        \Container::$dbConnection->commit();
+    }
+
+    private function deleteExpiredPasswordResetters(): void
+    {
+        foreach ($this->userPasswordResetterRepository->getAllExpired() as $passwordResetter) {
+            $this->pdm->deleteFromDb($passwordResetter);
+        }
+    }
+
+    private function deleteExpiredRooms(): void
+    {
+        foreach ($this->multiRoomRepository->getAllExpired() as $multiRoom) {
+            $this->pdm->deleteFromDb($multiRoom);
+        }
+    }
+
+    private function deleteExpiredSessions(): void
+    {
+        //TODO: model may be used for sessions too
+        $select = new Select(\Container::$dbConnection, 'sessions');
+        $select->columns(['id']);
+        $select->where('updated', '<', (new DateTime('-7 days'))->format('Y-m-d H:i:s'));
+
+        $result = $select->execute();
+
+        while ($session = $result->fetch(IResultSet::FETCH_ASSOC)) {
+            $modify = new Modify(\Container::$dbConnection, 'sessions');
+            $modify->setId($session['id']);
+            $modify->delete();
+        }
+    }
+}

src/Cli/MigrateDatabaseCommand.php

@@ -0,0 +1,122 @@
+<?php namespace MapGuesser\Cli;
+
+use MapGuesser\Database\Query\Modify;
+use MapGuesser\Database\Query\Select;
+use MapGuesser\Interfaces\Database\IResultSet;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class MigrateDatabaseCommand extends Command
+{
+    public function configure(): void
+    {
+        $this->setName('db:migrate')
+            ->setDescription('Migration of database changes.');
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $db = \Container::$dbConnection;
+
+        $db->startTransaction();
+
+        $success = [];
+        try {
+            foreach ($this->readDir('structure') as $file) {
+                $db->multiQuery(file_get_contents($file));
+
+                $success[] = $this->saveToDB($file, 'structure');
+            }
+
+            foreach ($this->readDir('data') as $file) {
+                require $file;
+
+                $success[] = $this->saveToDB($file, 'data');
+            }
+        } catch (\Exception $e) {
+            $db->rollback();
+
+            $output->writeln('<error>Migration failed!</error>');
+            $output->writeln('');
+
+            $output->writeln((string) $e);
+            $output->writeln('');
+
+            return 1;
+        }
+
+        $db->commit();
+
+        $output->writeln('<info>Migration was successful!</info>');
+        $output->writeln('');
+
+        if (count($success) > 0) {
+            foreach ($success as $migration) {
+                $output->writeln($migration);
+            }
+
+            $output->writeln('');
+        }
+
+        return 0;
+    }
+
+    private function readDir(string $type): array
+    {
+        $done = [];
+
+        $migrationTableExists = \Container::$dbConnection->query('SELECT count(*)
+            FROM information_schema.tables
+            WHERE table_schema = \'' . $_ENV['DB_NAME'] . '\'
+            AND table_name = \'migrations\';')
+            ->fetch(IResultSet::FETCH_NUM)[0];
+
+        if ($migrationTableExists != 0) {
+            $select = new Select(\Container::$dbConnection, 'migrations');
+            $select->columns(['migration']);
+            $select->where('type', '=', $type);
+            $select->orderBy('migration');
+
+            $result = $select->execute();
+
+            while ($migration = $result->fetch(IResultSet::FETCH_ASSOC)) {
+                $done[] = $migration['migration'];
+            }
+        }
+
+        $path = ROOT . '/database/migrations/' . $type;
+        $dir = opendir($path);
+
+        if ($dir === false) {
+            throw new \Exception('Cannot open dir: ' . $path);
+        }
+
+        $files = [];
+        while ($file = readdir($dir)) {
+            $filePath = $path . '/' . $file;
+
+            if (!is_file($filePath) || in_array(pathinfo($file, PATHINFO_FILENAME), $done)) {
+                continue;
+            }
+
+            $files[] = $filePath;
+        }
+
+        natsort($files);
+
+        return $files;
+    }
+
+    private function saveToDB(string $file, string $type): string
+    {
+        $baseName = pathinfo($file, PATHINFO_FILENAME);
+
+        $modify = new Modify(\Container::$dbConnection, 'migrations');
+        $modify->set('migration', $baseName);
+        $modify->set('type', $type);
+        $modify->save();
+
+        return $baseName . ' (' . $type . ')';
+    }
+}

src/Controller/GameController.php

@@ -1,53 +1,166 @@
 <?php namespace MapGuesser\Controller;
 
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Util\Geo\Bounds;
+use DateTime;
+use Faker\Factory;
+use MapGuesser\Interfaces\Request\IRequest;
 use MapGuesser\Response\HtmlContent;
 use MapGuesser\Response\JsonContent;
 use MapGuesser\Interfaces\Response\IContent;
+use MapGuesser\Interfaces\Response\IRedirect;
+use MapGuesser\Multi\MultiConnector;
+use MapGuesser\PersistentData\Model\MultiRoom;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\Repository\MapRepository;
+use MapGuesser\Repository\MultiRoomRepository;
+use MapGuesser\Response\Redirect;
 
 class GameController
 {
-    public function getGame(array $parameters): IContent
+    private IRequest $request;
+
+    private PersistentDataManager $pdm;
+
+    private MultiConnector $multiConnector;
+
+    private MultiRoomRepository $multiRoomRepository;
+
+    private MapRepository $mapRepository;
+
+    public function __construct(IRequest $request)
     {
-        $mapId = (int) $parameters['mapId'];
-        $data = $this->prepareGame($mapId);
-        return new HtmlContent('game', $data);
+        $this->request = $request;
+        $this->pdm = new PersistentDataManager();
+        $this->multiConnector = new MultiConnector();
+        $this->multiRoomRepository = new MultiRoomRepository();
+        $this->mapRepository = new MapRepository();
     }
 
-    public function getGameJson(array $parameters): IContent
+    public function getGame(): IContent
     {
-        $mapId = (int) $parameters['mapId'];
-        $data = $this->prepareGame($mapId);
-        return new JsonContent($data);
+        $mapId = (int) $this->request->query('mapId');
+
+        return new HtmlContent('game', ['mapId' => $mapId]);
     }
 
-    private function prepareGame(int $mapId)
+    public function getNewMultiGame(): IRedirect
     {
-        $bounds = $this->getMapBounds($mapId);
+        $mapId = (int) $this->request->query('mapId');
+        $map = $this->mapRepository->getById($mapId);
+        $roomId = bin2hex(random_bytes(3));
+        $token = $this->getMultiToken($roomId);
 
-        if (!isset($_SESSION['state']) || $_SESSION['state']['mapId'] !== $mapId) {
-            $_SESSION['state'] = [
+        $room = new MultiRoom();
+        $room->setRoomId($roomId);
+        $room->setStateArray([
+            'mapId' => $mapId,
+            'area' => $map->getArea(),
+            'rounds' => [],
+            'currentRound' => -1
+        ]);
+        $room->setMembersArray(['owner' => $token, 'all' => []]);
+        $room->setUpdatedDate(new DateTime());
+
+        $this->pdm->saveToDb($room);
+
+        $this->multiConnector->sendMessage('create_room', ['roomId' => $roomId]);
+
+        return new Redirect(
+            \Container::$routeCollection
+                ->getRoute('multiGame')
+                ->generateLink(['roomId' => $roomId]),
+            IRedirect::TEMPORARY
+        );
+    }
+
+    public function getMultiGame(): IContent
+    {
+        $roomId = $this->request->query('roomId');
+
+        return new HtmlContent('game', ['roomId' => $roomId]);
+    }
+
+    public function prepareGame(): IContent
+    {
+        $mapId = (int) $this->request->query('mapId');
+        $map = $this->mapRepository->getById($mapId);
+        $session = $this->request->session();
+
+        if (!($state = $session->get('state')) || $state['mapId'] !== $mapId) {
+            $session->set('state', [
                 'mapId' => $mapId,
-                'area' => $bounds->calculateApproximateArea(),
-                'rounds' => []
-            ];
+                'area' => $map->getArea(),
+                'rounds' => [],
+                'currentRound' => -1
+            ]);
         }
 
-        return ['mapId' => $mapId, 'bounds' => $bounds->toArray()];
+        return new JsonContent([
+            'mapId' => $mapId,
+            'mapName' => $map->getName(),
+            'bounds' => $map->getBounds()->toArray()
+        ]);
     }
 
-    private function getMapBounds(int $mapId): Bounds
+    public function prepareMultiGame(): IContent
     {
-        $select = new Select(\Container::$dbConnection, 'maps');
-        $select->columns(['bound_south_lat', 'bound_west_lng', 'bound_north_lat', 'bound_east_lng']);
-        $select->whereId($mapId);
+        $roomId = $this->request->query('roomId');
+        $userName = $this->request->post('userName');
+        if (empty($userName)) {
+            $faker = Factory::create();
+            $userName = $faker->userName;
+        }
 
-        $map = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+        $room = $this->multiRoomRepository->getByRoomId($roomId);
+        $state = $room->getStateArray();
+        $map = $this->mapRepository->getById($state['mapId']);
+        $token = $this->getMultiToken($roomId);
 
-        $bounds = Bounds::createDirectly($map['bound_south_lat'], $map['bound_west_lng'], $map['bound_north_lat'], $map['bound_east_lng']);
+        $members = $room->getMembersArray();
 
-        return $bounds;
+        if (!in_array($token, $members['all'])) {
+            if ($state['currentRound'] >= 0) {
+                return new JsonContent(['error' => 'game_already_started']);
+            }
+
+            $members['all'][] = $token;
+        }
+
+        $room->setMembersArray($members);
+        $room->setUpdatedDate(new DateTime());
+
+        $this->pdm->saveToDb($room);
+
+        $this->multiConnector->sendMessage('join_room', [
+            'roomId' => $roomId,
+            'token' => $token,
+            'userName' => $userName
+        ]);
+
+        return new JsonContent([
+            'roomId' => $roomId,
+            'token' => $token,
+            'owner' => $members['owner'] == $token,
+            'mapId' => $state['mapId'],
+            'mapName' => $map->getName(),
+            'bounds' => $map->getBounds()->toArray()
+        ]);
+    }
+
+    private function getMultiToken(string $roomId): string
+    {
+        $session = $this->request->session();
+
+        if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
+            $token = bin2hex(random_bytes(16));
+
+            $session->set('multiState', [
+                'roomId' => $roomId,
+                'token' => $token
+            ]);
+        } else {
+            $token = $multiState['token'];
+        }
+
+        return $token;
     }
 }

src/Controller/GameFlowController.php

@@ -0,0 +1,252 @@
+<?php namespace MapGuesser\Controller;
+
+use DateTime;
+use MapGuesser\Interfaces\Request\IRequest;
+use MapGuesser\Util\Geo\Position;
+use MapGuesser\Response\JsonContent;
+use MapGuesser\Interfaces\Response\IContent;
+use MapGuesser\Multi\MultiConnector;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\Repository\MultiRoomRepository;
+use MapGuesser\Repository\PlaceRepository;
+
+class GameFlowController
+{
+    const NUMBER_OF_ROUNDS = 5;
+    const MAX_SCORE = 1000;
+
+    private IRequest $request;
+
+    private PersistentDataManager $pdm;
+
+    private MultiConnector $multiConnector;
+
+    private MultiRoomRepository $multiRoomRepository;
+
+    private PlaceRepository $placeRepository;
+
+    public function __construct(IRequest $request)
+    {
+        $this->request = $request;
+        $this->pdm = new PersistentDataManager();
+        $this->multiConnector = new MultiConnector();
+        $this->multiRoomRepository = new MultiRoomRepository();
+        $this->placeRepository = new PlaceRepository();
+    }
+
+    public function initialData(): IContent
+    {
+        $mapId = (int) $this->request->query('mapId');
+        $session = $this->request->session();
+
+        if (!($state = $session->get('state')) || $state['mapId'] !== $mapId) {
+            return new JsonContent(['error' => 'no_session_found']);
+        }
+
+        if (!isset($state['currentRound']) || $state['currentRound'] == -1 || $state['currentRound'] >= static::NUMBER_OF_ROUNDS) {
+            $this->startNewGame($state, $mapId);
+            $session->set('state', $state);
+        }
+
+        $response = [];
+
+        $last = $state['rounds'][$state['currentRound']];
+        $response['place'] = [
+            'panoId' => $last['panoId'],
+            'pov' => $last['pov']->toArray()
+        ];
+
+        $response['history'] = [];
+        for ($i = 0; $i < $state['currentRound']; ++$i) {
+            $round = $state['rounds'][$i];
+            $response['history'][] = [
+                'position' => $round['position']->toArray(),
+                'guessPosition' => $round['guessPosition']->toArray(),
+                'distance' => $round['distance'],
+                'score' => $round['score']
+            ];
+        }
+
+        return new JsonContent($response);
+    }
+
+    public function multiInitialData(): IContent
+    {
+        $roomId = $this->request->query('roomId');
+        $session = $this->request->session();
+
+        if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
+            return new JsonContent(['error' => 'no_session_found']);
+        }
+
+        $room = $this->multiRoomRepository->getByRoomId($roomId);
+        $state = $room->getStateArray();
+        $members = $room->getMembersArray();
+
+        if ($members['owner'] !== $multiState['token']) {
+            return new JsonContent(['error' => 'not_owner_of_room']);
+        }
+
+        if ($state['currentRound'] == -1 || $state['currentRound'] >= static::NUMBER_OF_ROUNDS - 1) {
+            $this->startNewGame($state, $state['mapId']);
+            $room->setStateArray($state);
+            $room->setUpdatedDate(new DateTime());
+            $this->pdm->saveToDb($room);
+        }
+
+        $places = [];
+        foreach ($state['rounds'] as $round) {
+            $places[] = [
+                'position' => $round['position']->toArray(),
+                'panoId' => $round['panoId'],
+                'pov' => $round['pov']->toArray()
+            ];
+        }
+
+        $this->multiConnector->sendMessage('start_game', ['roomId' => $roomId, 'places' => $places]);
+
+        return new JsonContent(['ok' => true]);
+    }
+
+    public function guess(): IContent
+    {
+        $mapId = (int) $this->request->query('mapId');
+        $session = $this->request->session();
+
+        if (!($state = $session->get('state')) || $state['mapId'] !== $mapId) {
+            return new JsonContent(['error' => 'no_session_found']);
+        }
+
+        $last = $state['rounds'][$state['currentRound']];
+        $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
+        $result = $this->evalueteGuess($last['position'], $guessPosition, $state['area']);
+
+        $last['guessPosition'] = $guessPosition;
+        $last['distance'] = $result['distance'];
+        $last['score'] = $result['score'];
+
+        $response = [
+            'result' => [
+                'position' => $last['position']->toArray(),
+                'distance' => $result['distance'],
+                'score' => $result['score']
+            ]
+        ];
+
+        $state['rounds'][$state['currentRound']] = $last;
+        $state['currentRound'] += 1;
+        if ($state['currentRound'] < static::NUMBER_OF_ROUNDS) {
+            $next = $state['rounds'][$state['currentRound']];
+
+            $response['place'] = [
+                'panoId' => $next['panoId'],
+                'pov' => $next['pov']->toArray()
+            ];
+        }
+
+        $session->set('state', $state);
+
+        return new JsonContent($response);
+    }
+
+    public function multiGuess(): IContent
+    {
+        $roomId = $this->request->query('roomId');
+        $session = $this->request->session();
+
+        if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
+            return new JsonContent(['error' => 'no_session_found']);
+        }
+
+        $room = $this->multiRoomRepository->getByRoomId($roomId);
+        $state = $room->getStateArray();
+
+        $last = $state['rounds'][$state['currentRound']];
+        $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
+        $result = $this->evalueteGuess($last['position'], $guessPosition, $state['area']);
+
+        $this->multiConnector->sendMessage('guess', [
+            'roomId' => $roomId,
+            'token' => $multiState['token'],
+            'guess' => $guessPosition->toArray(),
+            'distance' => $result['distance'],
+            'score' => $result['score']
+        ]);
+
+        $response = [
+            'result' => [
+                'position' => $last['position']->toArray(),
+                'distance' => $result['distance'],
+                'score' => $result['score']
+            ]
+        ];
+
+        return new JsonContent($response);
+    }
+
+    public function multiNextRound(): IContent
+    {
+        $roomId = $this->request->query('roomId');
+        $session = $this->request->session();
+
+        if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
+            return new JsonContent(['error' => 'no_session_found']);
+        }
+
+        $room = $this->multiRoomRepository->getByRoomId($roomId);
+        $state = $room->getStateArray();
+        $members = $room->getMembersArray();
+
+        if ($members['owner'] !== $multiState['token']) {
+            return new JsonContent(['error' => 'not_owner_of_room']);
+        }
+
+        $state['currentRound'] += 1;
+        if ($state['currentRound'] < static::NUMBER_OF_ROUNDS) {
+            $this->multiConnector->sendMessage('next_round', ['roomId' => $roomId, 'currentRound' => $state['currentRound']]);
+        }
+
+        $room->setStateArray($state);
+        $room->setUpdatedDate(new DateTime());
+        $this->pdm->saveToDb($room);
+
+        return new JsonContent(['ok' => true]);
+    }
+
+    private function evalueteGuess(Position $realPosition, Position $guessPosition, float $area)
+    {
+        $distance = $this->calculateDistance($realPosition, $guessPosition);
+        $score = $this->calculateScore($distance, $area);
+
+        return ['distance' => $distance, 'score' => $score];
+    }
+
+    private function startNewGame(array &$state, int $mapId): void
+    {
+        $places = $this->placeRepository->getRandomNForMapWithValidPano($mapId, static::NUMBER_OF_ROUNDS);
+
+        $state['rounds'] = [];
+        $state['currentRound'] = 0;
+
+        foreach ($places as $place) {
+            $state['rounds'][] = [
+                'placeId' => $place->getId(),
+                'position' => $place->getPosition(),
+                'panoId' => $place->getPanoIdCached(),
+                'pov' => $place->getPov()
+            ];
+        }
+    }
+
+    private function calculateDistance(Position $realPosition, Position $guessPosition): float
+    {
+        return $realPosition->calculateDistanceTo($guessPosition);
+    }
+
+    private function calculateScore(float $distance, float $area): int
+    {
+        $goodness = 1.0 - ($distance / (sqrt($area) * 1000));
+
+        return (int) round(pow(static::MAX_SCORE, $goodness));
+    }
+}

src/Controller/HomeController.php

@@ -1,12 +1,29 @@
 <?php namespace MapGuesser\Controller;
 
+use MapGuesser\Interfaces\Request\IRequest;
+use MapGuesser\Interfaces\Response\IContent;
 use MapGuesser\Interfaces\Response\IRedirect;
+use MapGuesser\Response\JsonContent;
 use MapGuesser\Response\Redirect;
 
 class HomeController
 {
+    private IRequest $request;
+
+    public function __construct(IRequest $request)
+    {
+        $this->request = $request;
+    }
+
     public function getIndex(): IRedirect
     {
-        return new Redirect([\Container::$routeCollection->getRoute('maps'), []], IRedirect::TEMPORARY);
+        return new Redirect(\Container::$routeCollection->getRoute('maps')->generateLink(), IRedirect::TEMPORARY);
+    }
+
+    public function startSession(): IContent
+    {
+        // session starts with the request, this method just sends valid data to the client
+
+        return new JsonContent(['antiCsrfToken' => $this->request->session()->get('anti_csrf_token')]);
     }
 }

src/Controller/LoginController.php

@@ -0,0 +1,611 @@
+<?php namespace MapGuesser\Controller;
+
+use DateInterval;
+use DateTime;
+use MapGuesser\Http\Request;
+use MapGuesser\Interfaces\Request\IRequest;
+use MapGuesser\Interfaces\Response\IContent;
+use MapGuesser\Interfaces\Response\IRedirect;
+use MapGuesser\Mailing\Mail;
+use MapGuesser\OAuth\GoogleOAuth;
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\PersistentData\Model\UserConfirmation;
+use MapGuesser\PersistentData\Model\UserPasswordResetter;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\Repository\UserConfirmationRepository;
+use MapGuesser\Repository\UserPasswordResetterRepository;
+use MapGuesser\Repository\UserRepository;
+use MapGuesser\Response\HtmlContent;
+use MapGuesser\Response\JsonContent;
+use MapGuesser\Response\Redirect;
+use MapGuesser\Util\JwtParser;
+
+class LoginController
+{
+    private IRequest $request;
+
+    private PersistentDataManager $pdm;
+
+    private UserRepository $userRepository;
+
+    private UserConfirmationRepository $userConfirmationRepository;
+
+    private UserPasswordResetterRepository $userPasswordResetterRepository;
+
+    public function __construct(IRequest $request)
+    {
+        $this->request = $request;
+        $this->pdm = new PersistentDataManager();
+        $this->userRepository = new UserRepository();
+        $this->userConfirmationRepository = new UserConfirmationRepository();
+        $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
+    }
+
+    public function getLoginForm()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        return new HtmlContent('login/login');
+    }
+
+    public function getGoogleLoginRedirect(): IRedirect
+    {
+        $state = bin2hex(random_bytes(16));
+        $nonce = bin2hex(random_bytes(16));
+
+        $this->request->session()->set('oauth_state', $state);
+        $this->request->session()->set('oauth_nonce', $nonce);
+
+        $oAuth = new GoogleOAuth(new Request());
+        $url = $oAuth->getDialogUrl(
+            $state,
+            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('login-google-action')->generateLink(),
+            $nonce
+        );
+
+        return new Redirect($url, IRedirect::TEMPORARY);
+    }
+
+    public function getSignupForm()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        if ($this->request->session()->has('tmp_user_data')) {
+            $tmpUserData = $this->request->session()->get('tmp_user_data');
+
+            $data = ['email' => $tmpUserData['email']];
+        } else {
+            $data = [];
+        }
+
+        return new HtmlContent('login/signup', $data);
+    }
+
+    public function getSignupSuccess(): IContent
+    {
+        return new HtmlContent('login/signup_success');
+    }
+
+    public function getSignupWithGoogleForm()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        if (!$this->request->session()->has('google_user_data')) {
+            return new Redirect(\Container::$routeCollection->getRoute('login-google')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        $userData = $this->request->session()->get('google_user_data');
+
+        $user = $this->userRepository->getByEmail($userData['email']);
+
+        return new HtmlContent('login/google_signup', ['found' => $user !== null, 'email' => $userData['email']]);
+    }
+
+    public function getRequestPasswordResetForm()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        return new HtmlContent('login/password_reset_request', ['email' => $this->request->query('email')]);
+    }
+
+    public function getRequestPasswordResetSuccess(): IContent
+    {
+        return new HtmlContent('login/password_reset_request_success');
+    }
+
+    public function getResetPasswordForm()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        $token = $this->request->query('token');
+        $resetter = $this->userPasswordResetterRepository->getByToken($token);
+
+        if ($resetter === null || $resetter->getExpiresDate() < new DateTime()) {
+            return new HtmlContent('login/reset_password', ['success' => false]);
+        }
+
+        $user = $this->userRepository->getById($resetter->getUserId());
+
+        return new HtmlContent('login/reset_password', ['success' => true, 'token' => $token, 'email' => $user->getEmail()]);
+    }
+
+    public function login(): IContent
+    {
+        if ($this->request->user() !== null) {
+            return new JsonContent(['success' => true]);
+        }
+
+        $user = $this->userRepository->getByEmail($this->request->post('email'));
+
+        if ($user === null) {
+            if (strlen($this->request->post('password')) < 6) {
+                return new JsonContent([
+                    'error' => [
+                        'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
+                    ]
+                ]);
+            }
+
+            $tmpUser = new User();
+            $tmpUser->setPlainPassword($this->request->post('password'));
+
+            $this->request->session()->set('tmp_user_data', [
+                'email' => $this->request->post('email'),
+                'password_hashed' => $tmpUser->getPassword()
+            ]);
+
+            return new JsonContent([
+                'redirect' => [
+                    'target' => '/' . \Container::$routeCollection->getRoute('signup')->generateLink()
+                ]
+            ]);
+        }
+
+        if (!$user->getActive()) {
+            $this->resendConfirmationEmail($user);
+
+            return new JsonContent([
+                'error' => [
+                    'errorText' => 'User found with the given email address, but the account is not activated. ' .
+                        'Please check your email and click on the activation link!'
+                ]
+            ]);
+        }
+
+        if (!$user->checkPassword($this->request->post('password'))) {
+            return new JsonContent([
+                'error' => [
+                    'errorText' => 'The given password is wrong. You can <a href="/password/requestReset?email=' .
+                        urlencode($user->getEmail()) . '" title="Request password reset">request password reset</a>!'
+                ]
+            ]);
+        }
+
+        $this->request->setUser($user);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function loginWithGoogle()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
+            return new HtmlContent('login/google_login');
+        }
+
+        $oAuth = new GoogleOAuth(new Request());
+        $tokenData = $oAuth->getToken(
+            $this->request->query('code'),
+            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('login-google-action')->generateLink()
+        );
+
+        if (!isset($tokenData['id_token'])) {
+            return new HtmlContent('login/google_login');
+        }
+
+        $jwtParser = new JwtParser($tokenData['id_token']);
+        $idToken = $jwtParser->getPayload();
+
+        if ($idToken['nonce'] !== $this->request->session()->get('oauth_nonce')) {
+            return new HtmlContent('login/google_login');
+        }
+
+        if (!$idToken['email_verified']) {
+            return new HtmlContent('login/google_login');
+        }
+
+        $user = $this->userRepository->getByGoogleSub($idToken['sub']);
+
+        if ($user === null) {
+            $this->request->session()->set('google_user_data', ['sub' => $idToken['sub'], 'email' => $idToken['email']]);
+
+            return new Redirect(\Container::$routeCollection->getRoute('signup-google')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        $this->request->setUser($user);
+
+        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+    }
+
+    public function logout(): IRedirect
+    {
+        $this->request->setUser(null);
+
+        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+    }
+
+    public function signup(): IContent
+    {
+        if ($this->request->user() !== null) {
+            return new JsonContent(['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()]]);
+        }
+
+        $user = $this->userRepository->getByEmail($this->request->post('email'));
+
+        if ($user !== null) {
+            if ($user->getActive()) {
+                if (!$user->checkPassword($this->request->post('password'))) {
+                    return new JsonContent([
+                        'error' => [
+                            'errorText' => 'There is a user already registered with the given email address, ' .
+                                'but the given password is wrong. You can <a href="/password/requestReset?email=' .
+                                urlencode($user->getEmail()) . '" title="Request password reset">request password reset</a>!'
+                        ]
+                    ]);
+                }
+
+                $this->request->setUser($user);
+
+                $data = ['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('index')->generateLink()]];
+            } else {
+                $data = [
+                    'error' => [
+                        'errorText' => 'There is a user already registered with the given email address. ' .
+                            'Please check your email and click on the activation link!'
+                    ]
+                ];
+            }
+            return new JsonContent($data);
+        }
+
+        if (filter_var($this->request->post('email'), FILTER_VALIDATE_EMAIL) === false) {
+            return new JsonContent(['error' => ['errorText' => 'The given email address is not valid.']]);
+        }
+
+        if ($this->request->session()->has('tmp_user_data')) {
+            $tmpUserData = $this->request->session()->get('tmp_user_data');
+
+            $tmpUser = new User();
+            $tmpUser->setPassword($tmpUserData['password_hashed']);
+
+            if (!$tmpUser->checkPassword($this->request->post('password'))) {
+                return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
+            }
+        } else {
+            if (strlen($this->request->post('password')) < 6) {
+                return new JsonContent([
+                    'error' => [
+                        'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
+                    ]
+                ]);
+            }
+
+            if ($this->request->post('password') !== $this->request->post('password_confirm')) {
+                return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
+            }
+        }
+
+        $user = new User();
+        $user->setEmail($this->request->post('email'));
+        $user->setPlainPassword($this->request->post('password'));
+        $user->setCreatedDate(new DateTime());
+
+        \Container::$dbConnection->startTransaction();
+
+        $this->pdm->saveToDb($user);
+
+        $token = bin2hex(random_bytes(16));
+
+        $confirmation = new UserConfirmation();
+        $confirmation->setUser($user);
+        $confirmation->setToken($token);
+        $confirmation->setLastSentDate(new DateTime());
+
+        $this->pdm->saveToDb($confirmation);
+
+        \Container::$dbConnection->commit();
+
+        $this->sendConfirmationEmail($user->getEmail(), $token, $user->getCreatedDate());
+
+        $this->request->session()->delete('tmp_user_data');
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function signupWithGoogle(): IContent
+    {
+        if ($this->request->user() !== null) {
+            return new JsonContent(['success' => true]);
+        }
+
+        $userData = $this->request->session()->get('google_user_data');
+
+        $user = $this->userRepository->getByEmail($userData['email']);
+
+        if ($user === null) {
+            $sendWelcomeEmail = true;
+
+            $user = new User();
+            $user->setEmail($userData['email']);
+            $user->setCreatedDate(new DateTime());
+        } else {
+            $sendWelcomeEmail = false;
+        }
+
+        $user->setActive(true);
+        $user->setGoogleSub($userData['sub']);
+
+        $this->pdm->saveToDb($user);
+
+        if ($sendWelcomeEmail) {
+            $this->sendWelcomeEmail($user->getEmail());
+        }
+
+        $this->request->session()->delete('google_user_data');
+        $this->request->setUser($user);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function resetSignup(): IContent
+    {
+        $this->request->session()->delete('tmp_user_data');
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function resetGoogleSignup(): IContent
+    {
+        $this->request->session()->delete('google_user_data');
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function activate()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
+
+        if ($confirmation === null) {
+            return new HtmlContent('login/activate');
+        }
+
+        \Container::$dbConnection->startTransaction();
+
+        $this->pdm->deleteFromDb($confirmation);
+
+        $user = $this->userRepository->getById($confirmation->getUserId());
+        $user->setActive(true);
+
+        $this->pdm->saveToDb($user);
+
+        \Container::$dbConnection->commit();
+
+        $this->request->setUser($user);
+
+        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+    }
+
+    public function cancel()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
+
+        if ($confirmation === null) {
+            return new HtmlContent('login/cancel', ['success' => false]);
+        }
+
+        \Container::$dbConnection->startTransaction();
+
+        $this->pdm->deleteFromDb($confirmation);
+
+        $user = $this->userRepository->getById($confirmation->getUserId());
+
+        $this->pdm->deleteFromDb($user);
+
+        \Container::$dbConnection->commit();
+
+        return new HtmlContent('login/cancel', ['success' => true]);
+    }
+
+    public function requestPasswordReset(): IContent
+    {
+        if ($this->request->user() !== null) {
+            return new JsonContent([
+                'redirect' => [
+                    'target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()
+                ]
+            ]);
+        }
+
+        $user = $this->userRepository->getByEmail($this->request->post('email'));
+
+        if ($user === null) {
+            return new JsonContent([
+                'error' => [
+                    'errorText' => 'No user found with the given email address. You can <a href="/signup" title="Sign up">sign up</a>!'
+                ]
+            ]);
+        }
+
+        if (!$user->getActive()) {
+            $this->resendConfirmationEmail($user);
+
+            return new JsonContent([
+                'error' => [
+                    'errorText' => 'User found with the given email address, but the account is not activated. ' .
+                        'Please check your email and click on the activation link!'
+                ]
+            ]);
+        }
+
+        $existingResetter = $this->userPasswordResetterRepository->getByUser($user);
+
+        if ($existingResetter !== null && $existingResetter->getExpiresDate() > new DateTime()) {
+            return new JsonContent([
+                'error' => [
+                    'errorText' => 'Password reset was recently requested for this account. Please check your email, or try again later!'
+                ]
+            ]);
+        }
+
+        $token = bin2hex(random_bytes(16));
+        $expires = new DateTime('+1 hour');
+
+        $passwordResetter = new UserPasswordResetter();
+        $passwordResetter->setUser($user);
+        $passwordResetter->setToken($token);
+        $passwordResetter->setExpiresDate($expires);
+
+        \Container::$dbConnection->startTransaction();
+
+        if ($existingResetter !== null) {
+            $this->pdm->deleteFromDb($existingResetter);
+        }
+
+        $this->pdm->saveToDb($passwordResetter);
+
+        \Container::$dbConnection->commit();
+
+        $this->sendPasswordResetEmail($user->getEmail(), $token, $expires);
+
+        return new JsonContent(['success' => true]);
+    }
+
+
+    public function resetPassword(): IContent
+    {
+        if ($this->request->user() !== null) {
+            return new JsonContent([
+                'redirect' => [
+                    'target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()
+                ]
+            ]);
+        }
+
+        $token = $this->request->query('token');
+        $resetter = $this->userPasswordResetterRepository->getByToken($token);
+
+        if ($resetter === null || $resetter->getExpiresDate() < new DateTime()) {
+            return new JsonContent([
+                'redirect' => [
+                    'target' => '/' . \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token])
+                ]
+            ]);
+        }
+
+        if (strlen($this->request->post('password')) < 6) {
+            return new JsonContent([
+                'error' => [
+                    'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
+                ]
+            ]);
+        }
+
+        if ($this->request->post('password') !== $this->request->post('password_confirm')) {
+            return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
+        }
+
+        \Container::$dbConnection->startTransaction();
+
+        $this->pdm->deleteFromDb($resetter);
+
+        $user = $this->userRepository->getById($resetter->getUserId());
+        $user->setPlainPassword($this->request->post('password'));
+
+        $this->pdm->saveToDb($user);
+
+        \Container::$dbConnection->commit();
+
+        $this->request->setUser($user);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    private function sendConfirmationEmail(string $email, string $token, DateTime $created): void
+    {
+        $mail = new Mail();
+        $mail->addRecipient($email);
+        $mail->setSubject('Welcome to ' . $_ENV['APP_NAME'] . ' - Activate your account');
+        $mail->setBodyFromTemplate('signup', [
+            'EMAIL' => $email,
+            'ACTIVATE_LINK' => $this->request->getBase() . '/' .
+                \Container::$routeCollection->getRoute('signup.activate')->generateLink(['token' => $token]),
+            'CANCEL_LINK' => $this->request->getBase() . '/' .
+                \Container::$routeCollection->getRoute('signup.cancel')->generateLink(['token' => $token]),
+            'ACTIVATABLE_UNTIL' => (clone $created)->add(new DateInterval('P1D'))->format('Y-m-d H:i T')
+        ]);
+        $mail->send();
+    }
+
+    private function resendConfirmationEmail(User $user): bool
+    {
+        $confirmation = $this->userConfirmationRepository->getByUser($user);
+
+        if ($confirmation === null || (clone $confirmation->getLastSentDate())->add(new DateInterval('PT1H')) > new DateTime()) {
+            return false;
+        }
+
+        $confirmation->setLastSentDate(new DateTime());
+
+        $this->pdm->saveToDb($confirmation);
+
+        $this->sendConfirmationEmail($user->getEmail(), $confirmation->getToken(), $user->getCreatedDate());
+
+        return true;
+    }
+
+    private function sendWelcomeEmail(string $email): void
+    {
+        $mail = new Mail();
+        $mail->addRecipient($email);
+        $mail->setSubject('Welcome to ' . $_ENV['APP_NAME']);
+        $mail->setBodyFromTemplate('signup-noconfirm', [
+            'EMAIL' => $email,
+        ]);
+        $mail->send();
+    }
+
+    private function sendPasswordResetEmail(string $email, string $token, DateTime $expires): void
+    {
+        $mail = new Mail();
+        $mail->addRecipient($email);
+        $mail->setSubject($_ENV['APP_NAME'] . ' - Password reset');
+        $mail->setBodyFromTemplate('password-reset', [
+            'EMAIL' => $email,
+            'RESET_LINK' => $this->request->getBase() . '/' .
+                \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token]),
+            'EXPIRES' => $expires->format('Y-m-d H:i T')
+        ]);
+        $mail->send();
+    }
+}

src/Controller/MapAdminController.php

@@ -0,0 +1,220 @@
+<?php namespace MapGuesser\Controller;
+
+use DateTime;
+use MapGuesser\Interfaces\Authentication\IUser;
+use MapGuesser\Interfaces\Authorization\ISecured;
+use MapGuesser\Interfaces\Request\IRequest;
+use MapGuesser\Interfaces\Response\IContent;
+use MapGuesser\PersistentData\Model\Map;
+use MapGuesser\PersistentData\Model\Place;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\Repository\MapRepository;
+use MapGuesser\Repository\PlaceRepository;
+use MapGuesser\Response\HtmlContent;
+use MapGuesser\Response\JsonContent;
+use MapGuesser\Util\Geo\Bounds;
+use MapGuesser\Util\Panorama\Pov;
+
+class MapAdminController implements ISecured
+{
+    private static string $unnamedMapName = '[unnamed map]';
+
+    private IRequest $request;
+
+    private PersistentDataManager $pdm;
+
+    private MapRepository $mapRepository;
+
+    private PlaceRepository $placeRepository;
+
+    public function __construct(IRequest $request)
+    {
+        $this->request = $request;
+        $this->pdm = new PersistentDataManager();
+        $this->mapRepository = new MapRepository();
+        $this->placeRepository = new PlaceRepository();
+    }
+
+    public function authorize(): bool
+    {
+        $user = $this->request->user();
+
+        return $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN);
+    }
+
+    public function getMapEditor(): IContent
+    {
+        $mapId = (int) $this->request->query('mapId');
+
+        if ($mapId) {
+            $map = $this->mapRepository->getById($mapId);
+            $places = $this->getPlaces($map);
+        } else {
+            $map = new Map();
+            $map->setName(self::$unnamedMapName);
+            $places = [];
+        }
+
+        return new HtmlContent('admin/map_editor', [
+            'mapId' => $mapId,
+            'mapName' => $map->getName(),
+            'mapDescription' => str_replace('<br>', "\n", $map->getDescription()),
+            'bounds' => $map->getBounds()->toArray(),
+            'places' => &$places
+        ]);
+    }
+
+    public function getPlace(): IContent
+    {
+        $placeId = (int) $this->request->query('placeId');
+
+        $place = $this->placeRepository->getById($placeId);
+
+        return new JsonContent(['panoId' => $place->getFreshPanoId()]);
+    }
+
+    public function saveMap(): IContent
+    {
+        $mapId = (int) $this->request->query('mapId');
+
+        \Container::$dbConnection->startTransaction();
+
+        if ($mapId) {
+            $map = $this->mapRepository->getById($mapId);
+        } else {
+            $map = new Map();
+            $map->setName(self::$unnamedMapName);
+            $this->pdm->saveToDb($map);
+        }
+
+        if (isset($_POST['added'])) {
+            $addedIds = [];
+            foreach ($_POST['added'] as $placeRaw) {
+                $placeRaw = json_decode($placeRaw, true);
+
+                $place = new Place();
+                $place->setMap($map);
+                $place->setLat((float) $placeRaw['lat']);
+                $place->setLng((float) $placeRaw['lng']);
+                $place->setPov(new Pov(
+                    (float) $placeRaw['pov']['heading'],
+                    (float) $placeRaw['pov']['pitch'],
+                    (float) $placeRaw['pov']['zoom']
+                ));
+
+                if ($placeRaw['panoId'] === -1) {
+                    $place->setPanoIdCachedTimestampDate(new DateTime('-1 day'));
+                }
+
+                $this->pdm->saveToDb($place);
+
+                $addedIds[] = ['tempId' => $placeRaw['id'], 'id' => $place->getId()];
+            }
+        } else {
+            $addedIds = [];
+        }
+
+        if (isset($_POST['edited'])) {
+            foreach ($_POST['edited'] as $placeRaw) {
+                $placeRaw = json_decode($placeRaw, true);
+
+                $place = $this->placeRepository->getById((int) $placeRaw['id']);
+                $place->setLat((float) $placeRaw['lat']);
+                $place->setLng((float) $placeRaw['lng']);
+                $place->setPov(new Pov(
+                    (float) $placeRaw['pov']['heading'],
+                    (float) $placeRaw['pov']['pitch'],
+                    (float) $placeRaw['pov']['zoom']
+                ));
+                $place->setPanoIdCachedTimestampDate(new DateTime('-1 day'));
+
+                $this->pdm->saveToDb($place);
+            }
+        }
+
+        if (isset($_POST['deleted'])) {
+            foreach ($_POST['deleted'] as $placeRaw) {
+                $placeRaw = json_decode($placeRaw, true);
+
+                $place = $this->placeRepository->getById((int) $placeRaw['id']);
+
+                $this->pdm->deleteFromDb($place);
+            }
+        }
+
+        $mapBounds = $this->calculateMapBounds($map);
+
+        $map->setBounds($mapBounds);
+        $map->setArea($mapBounds->calculateApproximateArea());
+
+        if (isset($_POST['name'])) {
+            $map->setName($_POST['name'] ? $_POST['name'] : self::$unnamedMapName);
+        }
+        if (isset($_POST['description'])) {
+            $map->setDescription(str_replace(["\n", "\r\n"], '<br>', $_POST['description']));
+        }
+
+        $this->pdm->saveToDb($map);
+
+        \Container::$dbConnection->commit();
+
+        return new JsonContent(['mapId' => $map->getId(), 'added' => $addedIds]);
+    }
+
+    public function deleteMap(): IContent
+    {
+        $mapId = (int) $this->request->query('mapId');
+
+        $map = $this->mapRepository->getById($mapId);
+
+        \Container::$dbConnection->startTransaction();
+
+        $this->deletePlaces($map);
+
+        $this->pdm->deleteFromDb($map);
+
+        \Container::$dbConnection->commit();
+
+        return new JsonContent(['success' => true]);
+    }
+
+    private function deletePlaces(Map $map): void
+    {
+        foreach ($this->placeRepository->getAllForMap($map) as $place) {
+            $this->pdm->deleteFromDb($place);
+        }
+    }
+
+    private function calculateMapBounds(Map $map): Bounds
+    {
+        $bounds = new Bounds();
+
+        foreach ($this->placeRepository->getAllForMap($map) as $place) {
+            $bounds->extend($place->getPosition());
+        }
+
+        return $bounds;
+    }
+
+    private function &getPlaces(Map $map): array
+    {
+        $places = [];
+
+        foreach ($this->placeRepository->getAllForMap($map) as $place) {
+            $noPano = $place->getPanoIdCachedTimestampDate() !== null && $place->getPanoIdCached() === null;
+
+            $placeId = $place->getId();
+
+            $places[$placeId] = [
+                'id' => $placeId,
+                'lat' => $place->getLat(),
+                'lng' => $place->getLng(),
+                'panoId' => null,
+                'pov' => $place->getPov()->toArray(),
+                'noPano' => $noPano
+            ];
+        }
+
+        return $places;
+    }
+}

src/Controller/MapsController.php

@@ -2,15 +2,24 @@
 
 use MapGuesser\Database\Query\Select;
 use MapGuesser\Database\RawExpression;
+use MapGuesser\Interfaces\Authentication\IUser;
 use MapGuesser\Interfaces\Database\IResultSet;
+use MapGuesser\Interfaces\Request\IRequest;
 use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Util\Geo\Bounds;
 use MapGuesser\Response\HtmlContent;
 
 class MapsController
 {
+    private IRequest $request;
+
+    public function __construct(IRequest $request)
+    {
+        $this->request = $request;
+    }
+
     public function getMaps(): IContent
     {
+        //TODO: from repository - count should be added
         $select = new Select(\Container::$dbConnection, 'maps');
         $select->columns([
             ['maps', 'id'],
@@ -20,43 +29,54 @@ class MapsController
             ['maps', 'bound_west_lng'],
             ['maps', 'bound_north_lat'],
             ['maps', 'bound_east_lng'],
+            ['maps', 'area'],
             new RawExpression('COUNT(places.id) AS num_places')
         ]);
         $select->leftJoin('places', ['places', 'map_id'], '=', ['maps', 'id']);
+        $select->groupBy(['maps', 'id']);
         $select->orderBy('name');
 
         $result = $select->execute();
 
         $maps = [];
         while ($map = $result->fetch(IResultSet::FETCH_ASSOC)) {
-            $bounds = Bounds::createDirectly($map['bound_south_lat'], $map['bound_west_lng'], $map['bound_north_lat'], $map['bound_east_lng']);
-
-            $map['area'] = $this->formatMapAreaForHuman($bounds->calculateApproximateArea());
+            $map['area'] = $this->formatMapAreaForHuman($map['area']);
 
             $maps[] = $map;
         }
 
-        $data = ['maps' => $maps];
-        return new HtmlContent('maps', $data);
+        $user = $this->request->user();
+        return new HtmlContent('maps', [
+            'maps' => $maps,
+            'isAdmin' => $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN)
+        ]);
     }
 
     private function formatMapAreaForHuman(float $area): array
     {
-        if ($area < 100000.0) {
+        if ($area < 0.01) {
+            $digits = 0;
+            $rounded = round($area * 1000000.0, -2);
+            $unit = 'm';
+        } elseif ($area < 0.1) {
+            $digits = 0;
+            $rounded = round($area * 1000000.0, -3);
+            $unit = 'm';
+        } elseif ($area < 1.0) {
+            $digits = 2;
+            $rounded = round($area, 2);
+            $unit = 'km';
+        } elseif ($area < 100.0) {
             $digits = 0;
             $rounded = round($area, 0);
-            $unit = 'm';
-        } elseif ($area < 100000000.0) {
-            $digits = 0;
-            $rounded = round($area / 1000000.0, 0);
             $unit = 'km';
-        } elseif ($area < 10000000000.0) {
+        } elseif ($area < 10000.0) {
             $digits = 0;
-            $rounded = round($area / 1000000.0, -2);
+            $rounded = round($area, -2);
             $unit = 'km';
         } else {
             $digits = 0;
-            $rounded = round($area / 1000000.0, -4);
+            $rounded = round($area, -4);
             $unit = 'km';
         }
 

src/Controller/PositionController.php

@@ -1,174 +0,0 @@
-<?php namespace MapGuesser\Controller;
-
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Http\Request;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Util\Geo\Position;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Interfaces\Response\IContent;
-
-class PositionController
-{
-    const NUMBER_OF_ROUNDS = 5;
-    const MAX_SCORE = 1000;
-
-    public function getPosition(array $parameters): IContent
-    {
-        $mapId = (int) $parameters['mapId'];
-
-        if (!isset($_SESSION['state']) || $_SESSION['state']['mapId'] !== $mapId) {
-            $data = ['error' => 'No valid session found!'];
-            return new JsonContent($data);
-        }
-
-        if (count($_SESSION['state']['rounds']) === 0) {
-            $newPosition = $this->getNewPosition($mapId);
-            $_SESSION['state']['rounds'][] = $newPosition;
-
-            $data = ['panoId' => $newPosition['panoId']];
-        } else {
-            $rounds = count($_SESSION['state']['rounds']);
-            $last = $_SESSION['state']['rounds'][$rounds - 1];
-
-            $history = [];
-            for ($i = 0; $i < $rounds - 1; ++$i) {
-                $round = $_SESSION['state']['rounds'][$i];
-                $history[] = [
-                    'position' => $round['position']->toArray(),
-                    'guessPosition' => $round['guessPosition']->toArray(),
-                    'distance' => $round['distance'],
-                    'score' => $round['score']
-                ];
-            }
-
-            $data = [
-                'history' => $history,
-                'panoId' => $last['panoId']
-            ];
-        }
-
-        return new JsonContent($data);
-    }
-
-    public function evaluateGuess(array $parameters): IContent
-    {
-        $mapId = (int) $parameters['mapId'];
-
-        if (!isset($_SESSION['state']) || $_SESSION['state']['mapId'] !== $mapId) {
-            $data = ['error' => 'No valid session found!'];
-            return new JsonContent($data);
-        }
-
-        $last = &$_SESSION['state']['rounds'][count($_SESSION['state']['rounds']) - 1];
-
-        $position = $last['position'];
-        $guessPosition = new Position((float) $_POST['lat'], (float) $_POST['lng']);
-
-        $last['guessPosition'] = $guessPosition;
-
-        $distance = $this->calculateDistance($position, $guessPosition);
-        $score = $this->calculateScore($distance, $_SESSION['state']['area']);
-
-        $last['distance'] = $distance;
-        $last['score'] = $score;
-
-        if (count($_SESSION['state']['rounds']) < static::NUMBER_OF_ROUNDS) {
-            $exclude = [];
-
-            foreach ($_SESSION['state']['rounds'] as $round) {
-                $exclude = array_merge($exclude, $round['placesWithoutPano'], [$round['placeId']]);
-            }
-
-            $newPosition = $this->getNewPosition($mapId, $exclude);
-            $_SESSION['state']['rounds'][] = $newPosition;
-
-            $panoId = $newPosition['panoId'];
-        } else {
-            $_SESSION['state']['rounds'] = [];
-
-            $panoId = null;
-        }
-
-        $data = [
-            'result' => [
-                'position' => $position->toArray(),
-                'distance' => $distance,
-                'score' => $score
-            ],
-            'panoId' => $panoId
-        ];
-        return new JsonContent($data);
-    }
-
-    private function getNewPosition(int $mapId, array $exclude = []): array
-    {
-        $placesWithoutPano = [];
-
-        do {
-            $place = $this->selectNewPlace($mapId, $exclude);
-            $position = new Position($place['lat'], $place['lng']);
-            $panoId = $this->getPanorama($position);
-
-            if ($panoId === null) {
-                $placesWithoutPano[] = $place['id'];
-            }
-        } while ($panoId === null);
-
-        return [
-            'placesWithoutPano' => $placesWithoutPano,
-            'placeId' => $place['id'],
-            'position' => $position,
-            'panoId' => $panoId
-        ];
-    }
-
-    private function selectNewPlace(int $mapId, array $exclude): array
-    {
-        $select = new Select(\Container::$dbConnection, 'places');
-        $select->columns(['id', 'lat', 'lng']);
-        $select->where('id', 'NOT IN', $exclude);
-        $select->where('map_id', '=', $mapId);
-
-        $numberOfPlaces = $select->count();// TODO: what if 0
-        $randomOffset = random_int(0, $numberOfPlaces - 1);
-
-        $select->orderBy('id');
-        $select->limit(1, $randomOffset);
-
-        $place = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
-        return $place;
-    }
-
-    private function getPanorama(Position $position): ?string
-    {
-        $request = new Request('https://maps.googleapis.com/maps/api/streetview/metadata', Request::HTTP_GET);
-        $request->setQuery([
-            'key' => $_ENV['GOOGLE_MAPS_SERVER_API_KEY'],
-            'location' => $position->getLat() . ',' . $position->getLng(),
-            'source' => 'outdoor'
-        ]);
-
-        $response = $request->send();
-
-        $panoData = json_decode($response->getBody(), true);
-
-        if ($panoData['status'] !== 'OK') {
-            return null;
-        }
-
-        return $panoData['pano_id'];
-    }
-
-    private function calculateDistance(Position $realPosition, Position $guessPosition): float
-    {
-        return $realPosition->calculateDistanceTo($guessPosition);
-    }
-
-    private function calculateScore(float $distance, float $area): int
-    {
-        $goodness = 1.0 - ($distance / sqrt($area));
-
-        return (int) round(pow(static::MAX_SCORE, $goodness));
-    }
-}

src/Controller/UserController.php

@@ -0,0 +1,231 @@
+<?php namespace MapGuesser\Controller;
+
+use DateTime;
+use MapGuesser\Http\Request;
+use MapGuesser\Interfaces\Authorization\ISecured;
+use MapGuesser\Interfaces\Request\IRequest;
+use MapGuesser\Interfaces\Response\IContent;
+use MapGuesser\Interfaces\Response\IRedirect;
+use MapGuesser\OAuth\GoogleOAuth;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\Repository\UserConfirmationRepository;
+use MapGuesser\Repository\UserPasswordResetterRepository;
+use MapGuesser\Response\HtmlContent;
+use MapGuesser\Response\JsonContent;
+use MapGuesser\Response\Redirect;
+use MapGuesser\Util\JwtParser;
+
+class UserController implements ISecured
+{
+    private IRequest $request;
+
+    private PersistentDataManager $pdm;
+
+    private UserConfirmationRepository $userConfirmationRepository;
+
+    private UserPasswordResetterRepository $userPasswordResetterRepository;
+
+    public function __construct(IRequest $request)
+    {
+        $this->request = $request;
+        $this->pdm = new PersistentDataManager();
+        $this->userConfirmationRepository = new UserConfirmationRepository();
+        $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
+    }
+
+    public function authorize(): bool
+    {
+        $user = $this->request->user();
+
+        return $user !== null;
+    }
+
+    public function getAccount(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = $this->request->user();
+
+        return new HtmlContent('account/account', ['user' => $user->toArray()]);
+    }
+
+    public function getGoogleAuthenticateRedirect(): IRedirect
+    {
+        /**
+         * @var User $user
+         */
+        $user = $this->request->user();
+
+        $state = bin2hex(random_bytes(16));
+        $nonce = bin2hex(random_bytes(16));
+
+        $this->request->session()->set('oauth_state', $state);
+        $this->request->session()->set('oauth_nonce', $nonce);
+
+        $oAuth = new GoogleOAuth(new Request());
+
+        $url = $oAuth->getDialogUrl(
+            $state,
+            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink(),
+            $nonce,
+            $user->getEmail()
+        );
+
+        return new Redirect($url, IRedirect::TEMPORARY);
+    }
+
+    public function authenticateWithGoogle(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = $this->request->user();
+
+        if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
+            return new HtmlContent('account/google_authenticate', ['success' => false]);
+        }
+
+        $oAuth = new GoogleOAuth(new Request());
+        $tokenData = $oAuth->getToken(
+            $this->request->query('code'),
+            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink()
+        );
+
+        if (!isset($tokenData['id_token'])) {
+            return new HtmlContent('account/google_authenticate', ['success' => false]);
+        }
+
+        $jwtParser = new JwtParser($tokenData['id_token']);
+        $idToken = $jwtParser->getPayload();
+
+        if ($idToken['nonce'] !== $this->request->session()->get('oauth_nonce')) {
+            return new HtmlContent('account/google_authenticate', ['success' => false]);
+        }
+
+        if ($idToken['sub'] !== $user->getGoogleSub()) {
+            return new HtmlContent('account/google_authenticate', [
+                'success' => false,
+                'errorText' => 'This Google account is not linked to your account.'
+            ]);
+        }
+
+        $authenticatedWithGoogleUntil = new DateTime('+45 seconds');
+        $this->request->session()->set('authenticated_with_google_until', $authenticatedWithGoogleUntil);
+
+        return new HtmlContent('account/google_authenticate', [
+            'success' => true,
+            'authenticatedWithGoogleUntil' => $authenticatedWithGoogleUntil
+        ]);
+    }
+
+    public function getDeleteAccount(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = $this->request->user();
+
+        return new HtmlContent('account/delete', ['user' => $user->toArray()]);
+    }
+
+    public function saveAccount(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = $this->request->user();
+
+        if (!$this->confirmUserIdentity(
+            $user,
+            $this->request->session()->get('authenticated_with_google_until'),
+            $this->request->post('password'),
+            $error
+        )) {
+            return new JsonContent(['error' => ['errorText' => $error]]);
+        }
+
+        if (strlen($this->request->post('password_new')) > 0) {
+            if (strlen($this->request->post('password_new')) < 6) {
+                return new JsonContent([
+                    'error' => [
+                        'errorText' => 'The given new password is too short. Please choose a password that is at least 6 characters long!'
+                    ]
+                ]);
+            }
+
+            if ($this->request->post('password_new') !== $this->request->post('password_new_confirm')) {
+                return new JsonContent([
+                    'error' => [
+                        'errorText' => 'The given new passwords do not match.'
+                    ]
+                ]);
+            }
+
+            $user->setPlainPassword($this->request->post('password_new'));
+        }
+
+        $this->pdm->saveToDb($user);
+
+        $this->request->session()->delete('authenticated_with_google_until');
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function deleteAccount(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = $this->request->user();
+
+        if (!$this->confirmUserIdentity(
+            $user,
+            $this->request->session()->get('authenticated_with_google_until'),
+            $this->request->post('password'),
+            $error
+        )) {
+            return new JsonContent(['error' => ['errorText' => $error]]);
+        }
+
+        \Container::$dbConnection->startTransaction();
+
+        $userConfirmation = $this->userConfirmationRepository->getByUser($user);
+        if ($userConfirmation !== null) {
+            $this->pdm->deleteFromDb($userConfirmation);
+        }
+
+        $userPasswordResetter = $this->userPasswordResetterRepository->getByUser($user);
+        if ($userPasswordResetter !== null) {
+            $this->pdm->deleteFromDb($userPasswordResetter);
+        }
+
+        $this->pdm->deleteFromDb($user);
+
+        \Container::$dbConnection->commit();
+
+        $this->request->session()->delete('authenticated_with_google_until');
+
+        return new JsonContent(['success' => true]);
+    }
+
+    private function confirmUserIdentity(User $user, ?DateTime $authenticatedWithGoogleUntil, ?string $password, string &$error): bool
+    {
+        if ($authenticatedWithGoogleUntil !== null && $authenticatedWithGoogleUntil > new DateTime()) {
+            return true;
+        }
+
+        if ($password !== null) {
+            if ($user->checkPassword($password)) {
+                return true;
+            }
+
+            $error = 'The given current password is wrong.';
+            return false;
+        }
+
+        $error = 'Could not confirm your identity. Please try again!';
+        return false;
+    }
+}

src/Database/Mysql/Connection.php

@@ -12,11 +12,11 @@ class Connection implements IConnection
     public function __construct(string $host, string $user, string $password, string $db, int $port = -1, string $socket = null)
     {
         if ($port < 0) {
-            $port = ini_get('mysqli.default_port');
+            $port = (int) ini_get('mysqli.default_port');
         }
 
         if ($socket === null) {
-            $socket = ini_get('mysqli.default_socket');
+            $socket = (string) ini_get('mysqli.default_socket');
         }
 
         $this->connection = new mysqli($host, $user, $password, $db, $port, $socket);

src/Database/Query/Modify.php

@@ -1,7 +1,6 @@
 <?php namespace MapGuesser\Database\Query;
 
 use MapGuesser\Interfaces\Database\IConnection;
-use MapGuesser\Interfaces\Database\IResultSet;
 use MapGuesser\Database\Utils;
 
 class Modify
@@ -14,9 +13,9 @@ class Modify
 
     private array $attributes = [];
 
-    private array $original = [];
+    private ?string $externalId = null;
 
-    private bool $autoIncrement = false;
+    private bool $autoIncrement = true;
 
     public function __construct(IConnection $connection, string $table)
     {
@@ -31,6 +30,13 @@ class Modify
         return $this;
     }
 
+    public function setExternalId($id): Modify
+    {
+        $this->externalId = $id;
+
+        return $this;
+    }
+
     public function setAutoIncrement(bool $autoIncrement = true): Modify
     {
         $this->autoIncrement = $autoIncrement;
@@ -59,6 +65,11 @@ class Modify
         return $this;
     }
 
+    public function getId()
+    {
+        return $this->attributes[$this->idName];
+    }
+
     public function save(): void
     {
         if (isset($this->attributes[$this->idName])) {
@@ -82,7 +93,9 @@ class Modify
 
     private function insert(): void
     {
-        if (!$this->autoIncrement) {
+        if ($this->externalId !== null) {
+            $this->attributes[$this->idName] = $this->externalId;
+        } elseif (!$this->autoIncrement) {
             $this->attributes[$this->idName] = $this->generateKey();
         }
 
@@ -100,45 +113,15 @@ class Modify
 
     private function update(): void
     {
-        $diff = $this->generateDiff();
+        $attributes = $this->attributes;
+        unset($attributes[$this->idName]);
 
-        if (count($diff) === 0) {
-            return;
-        }
-
-        $set = $this->generateColumnsWithBinding(array_keys($diff));
+        $set = $this->generateColumnsWithBinding(array_keys($attributes));
 
         $query = 'UPDATE ' . Utils::backtick($this->table) . ' SET ' . $set . ' WHERE ' . Utils::backtick($this->idName) . '=?';
 
         $stmt = $this->connection->prepare($query);
-        $stmt->execute(array_merge($diff, [$this->idName => $this->attributes[$this->idName]]));
-    }
-
-    private function readFromDB(array $columns): void
-    {
-        $select = (new Select($this->connection, $this->table))
-            ->setIdName($this->idName)
-            ->whereId($this->attributes[$this->idName])
-            ->columns($columns);
-
-        $this->original = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-    }
-
-    private function generateDiff(): array
-    {
-        $this->readFromDB(array_keys($this->attributes));
-
-        $diff = [];
-
-        foreach ($this->attributes as $name => $value) {
-            $original = $this->original[$name];
-
-            if ($original != $value) {
-                $diff[$name] = $value;
-            }
-        }
-
-        return $diff;
+        $stmt->execute(array_merge($attributes, [$this->idName => $this->attributes[$this->idName]]));
     }
 
     public static function generateColumnsWithBinding(array $columns): string
@@ -152,6 +135,6 @@ class Modify
 
     private function generateKey(): string
     {
-        return substr(hash('sha256', serialize($this->attributes) . random_bytes(10) . microtime()), 0, 7);
+        return substr(hash('sha256', serialize($this->attributes) . random_bytes(5) . microtime()), 0, 7);
     }
 }

src/Database/Query/Select.php

@@ -30,12 +30,15 @@ class Select
 
     private array $orders = [];
 
-    private array $limit;
+    private ?array $limit;
 
-    public function __construct(IConnection $connection, string $table)
+    public function __construct(IConnection $connection, ?string $table = null)
     {
         $this->connection = $connection;
-        $this->table = $table;
+
+        if ($table !== null) {
+            $this->table = $table;
+        }
     }
 
     public function setIdName(string $idName): Select
@@ -52,6 +55,13 @@ class Select
         return $this;
     }
 
+    public function from(string $table): Select
+    {
+        $this->table = $table;
+
+        return $this;
+    }
+
     public function columns(array $columns): Select
     {
         $this->columns = array_merge($this->columns, $columns);
@@ -134,7 +144,7 @@ class Select
         $this->limit = null;
     }
 
-    public function paginate(int $page, int $itemsPerPage)
+    public function paginate(int $page, int $itemsPerPage): Select
     {
         $this->limit($itemsPerPage, ($page - 1) * $itemsPerPage);
 
@@ -298,7 +308,7 @@ class Select
         return implode(' ', $joins);
     }
 
-    private function generateConditions(string $type): array
+    private function generateConditions(int $type): array
     {
         $conditions = '';
         $params = [];
@@ -366,9 +376,9 @@ class Select
         return [$conditionsString, $params];
     }
 
-    private function generateComplexConditionFragment(string $type, Closure $conditionCallback): array
+    private function generateComplexConditionFragment(int $type, Closure $conditionCallback): array
     {
-        $instance = new static($this->connection, $this->table);
+        $instance = new self($this->connection, $this->table);
         $instance->tableAliases = $this->tableAliases;
 
         $conditionCallback($instance);

src/Database/Utils.php

@@ -1,7 +1,8 @@
 <?php namespace MapGuesser\Database;
 
 class Utils {
-    public static function backtick(string $name) {
+    public static function backtick(string $name): string
+    {
         return '`' . $name . '`';
     }
 }

src/Http/Request.php

@@ -1,11 +1,10 @@
 <?php namespace MapGuesser\Http;
 
-class Request
+use MapGuesser\Interfaces\Http\IRequest;
+use MapGuesser\Interfaces\Http\IResponse;
+
+class Request implements IRequest
 {
-    const HTTP_GET = 0;
-
-    const HTTP_POST = 1;
-
     private string $url;
 
     private int $method;
@@ -14,13 +13,23 @@ class Request
 
     private array $headers = [];
 
-    public function __construct(string $url, int $method = self::HTTP_GET)
+    public function __construct(string $url = '', int $method = self::HTTP_GET)
     {
         $this->url = $url;
         $this->method = $method;
     }
 
-    public function setQuery($query)
+    public function setUrl(string $url): void
+    {
+        $this->url = $url;
+    }
+
+    public function setMethod(int $method): void
+    {
+        $this->method = $method;
+    }
+
+    public function setQuery($query): void
     {
         if (is_string($query)) {
             $this->query = $query;
@@ -29,22 +38,22 @@ class Request
         }
     }
 
-    public function setHeaders(array $headers)
+    public function setHeaders(array $headers): void
     {
         $this->headers = array_merge($this->headers, $headers);
     }
 
-    public function send(): Response
+    public function send(): IResponse
     {
         $ch = curl_init();
 
-        if ($this->method === self::HTTP_GET) {
-            $url = $this->url . '?' . $this->query;
-        } elseif ($this->method === self::HTTP_POST) {
-            $url  = $this->url;
+        if ($this->method === self::HTTP_POST) {
+            $url = $this->url;
 
             curl_setopt($ch, CURLOPT_POST, 1);
             curl_setopt($ch, CURLOPT_POSTFIELDS, $this->query);
+        } else {
+            $url = $this->url . '?' . $this->query;
         }
 
         curl_setopt($ch, CURLOPT_URL, $url);

src/Http/Response.php

@@ -1,6 +1,8 @@
 <?php namespace MapGuesser\Http;
 
-class Response
+use MapGuesser\Interfaces\Http\IResponse;
+
+class Response implements IResponse
 {
     private string $body;
 
@@ -12,12 +14,12 @@ class Response
         $this->headers = $headers;
     }
 
-    public function getBody()
+    public function getBody(): string
     {
         return $this->body;
     }
 
-    public function getHeaders()
+    public function getHeaders(): array
     {
         return $this->headers;
     }

src/Interfaces/Authentication/IUser.php

@@ -0,0 +1,16 @@
+<?php namespace MapGuesser\Interfaces\Authentication;
+
+interface IUser
+{
+    const PERMISSION_NORMAL = 0;
+
+    const PERMISSION_ADMIN = 1;
+
+    public function hasPermission(int $permission): bool;
+
+    public function getUniqueId();
+
+    public function getDisplayName(): string;
+
+    public function checkPassword(string $password): bool;
+}

src/Interfaces/Authorization/ISecured.php

@@ -0,0 +1,6 @@
+<?php namespace MapGuesser\Interfaces\Authorization;
+
+interface ISecured
+{
+    public function authorize(): bool;
+}

src/Interfaces/Http/IRequest.php

@@ -0,0 +1,18 @@
+<?php namespace MapGuesser\Interfaces\Http;
+
+interface IRequest
+{
+    const HTTP_GET = 0;
+
+    const HTTP_POST = 1;
+
+    public function setUrl(string $url): void;
+
+    public function setMethod(int $method): void;
+
+    public function setQuery($query): void;
+
+    public function setHeaders(array $headers): void;
+
+    public function send(): IResponse;
+}

src/Interfaces/Http/IResponse.php

@@ -0,0 +1,8 @@
+<?php namespace MapGuesser\Interfaces\Http;
+
+interface IResponse
+{
+    public function getBody(): string;
+
+    public function getHeaders(): array;
+}

src/Interfaces/Request/IRequest.php

@@ -0,0 +1,20 @@
+<?php namespace MapGuesser\Interfaces\Request;
+
+use MapGuesser\Interfaces\Authentication\IUser;
+
+interface IRequest
+{
+    public function setParsedRouteParams(array &$routeParams): void;
+
+    public function getBase(): string;
+
+    public function query(string $key);
+
+    public function post(string $key);
+
+    public function session(): ISession;
+
+    public function setUser(?IUser $user): void;
+
+    public function user(): ?IUser;
+}

src/Interfaces/Request/ISession.php

@@ -0,0 +1,12 @@
+<?php namespace MapGuesser\Interfaces\Request;
+
+interface ISession
+{
+    public function has(string $key): bool;
+
+    public function get(string $key);
+
+    public function set(string $key, $value): void;
+
+    public function delete(string $key): void;
+}

src/Interfaces/Response/IContent.php

@@ -2,9 +2,11 @@
 
 interface IContent
 {
-    public function &getData(): array;
+    public function setData(array $data): void;
 
-    public function &render(): string;
+    public function getData(): array;
+
+    public function render(): void;
 
     public function getContentType(): string;
 }