Distanz: {{ Math.round(targetDistance) }} m
console.log("success"), () => console.log("error"));
}
initGame() {
@@ -394,6 +402,7 @@ export class PlayingGamePage implements OnInit {
}
initTask() {
+ this.vibration.vibrate([100, 100, 100]);
console.log("Current task: ", this.task);
this._initMapFeatures();
this.trackerService.addEvent({
@@ -444,14 +453,16 @@ export class PlayingGamePage implements OnInit {
this.uploadDone = true;
}
});
- navigator.vibrate([300, 300, 300]);
+ this.vibration.vibrate([300, 300, 300]);
+ this.insomnia
+ .allowSleepAgain()
+ .then(() => console.log("success"), () => console.log("error"));
return;
}
this.task = this.game.tasks[this.taskIndex];
this.initTask();
console.log(this.taskIndex, this.task);
- navigator.vibrate([100, 100, 100]);
}
async onOkClicked() {
@@ -623,11 +634,10 @@ export class PlayingGamePage implements OnInit {
_initMapFeatures() {
const mapFeatures = this.task.settings.mapFeatures;
- console.log(mapFeatures);
+ console.log("MapFeatures: ", mapFeatures);
if (mapFeatures != undefined) {
for (let key in mapFeatures) {
if (mapFeatures.hasOwnProperty(key)) {
- console.log(key + " -> " + mapFeatures[key]);
switch (key) {
case "zoombar":
if (mapFeatures[key]) {
diff --git a/src/app/services/game-factory.service.ts b/src/app/services/game-factory.service.ts
index edfe052b..a11c581a 100644
--- a/src/app/services/game-factory.service.ts
+++ b/src/app/services/game-factory.service.ts
@@ -8,7 +8,7 @@ import { Game } from "./../models/game";
export class GameFactoryService {
public game: Game;
- constructor() { }
+ constructor() {}
addGameInformation(data: any) {
this.game = {
@@ -40,13 +40,12 @@ export class GameFactoryService {
getGame() {
if (!this.game) {
- this.game = new Game(
- Math.floor(Date.now() / 1000),
- "",
- true,
- [],
- );
+ this.game = new Game(Math.floor(Date.now() / 1000), "", true, []);
}
return this.game;
}
+
+ flushGame() {
+ this.game = undefined;
+ }
}
diff --git a/yarn.lock b/yarn.lock
index 8490a763..1baf1bbf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -960,6 +960,13 @@
dependencies:
"@types/cordova" latest
+"@ionic-native/insomnia@^5.16.0":
+ version "5.16.0"
+ resolved "https://registry.yarnpkg.com/@ionic-native/insomnia/-/insomnia-5.16.0.tgz#383acc88ead0c0d93360fae0d633ee014aeb2faf"
+ integrity sha512-oRexR6UaVMEMBZOlCAGJmWPzepaTytLknz1bKUe6Z5zZ7zbLfj4mKeOPnKHtu/iZF2cLYCydCogIO+XF0jzbfA==
+ dependencies:
+ "@types/cordova" latest
+
"@ionic-native/splash-screen@^5.0.0":
version "5.15.0"
resolved "https://registry.yarnpkg.com/@ionic-native/splash-screen/-/splash-screen-5.15.0.tgz#34624f272cc7654977883a427aa3f5653e26032e"
@@ -974,6 +981,13 @@
dependencies:
"@types/cordova" latest
+"@ionic-native/vibration@^5.16.0":
+ version "5.16.0"
+ resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.16.0.tgz#9d627c5a989e55bdcfdde7d4fa0bf5d8ec8c0839"
+ integrity sha512-+gI1aXvSUz4IuDoS0ISNLiasuk0SuHo3jj2Lek6ddAJI1IhUlikr8VCcLxHWRkuW1gqXBPWbLAJNvHF5WQEkaA==
+ dependencies:
+ "@types/cordova" latest
+
"@ionic/angular-toolkit@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@ionic/angular-toolkit/-/angular-toolkit-2.0.0.tgz#2095f3b0ed731600fe590aa024682fdd532a4833"
@@ -2951,6 +2965,11 @@ cordova-plugin-statusbar@^2.4.2:
resolved "https://registry.yarnpkg.com/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.3.tgz#cc557aef66c27484e0f7f045004040d03321f82d"
integrity sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg==
+cordova-plugin-vibration@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/cordova-plugin-vibration/-/cordova-plugin-vibration-3.1.1.tgz#38fcdd9a7675cfb44d86339c1b2cb129017e9e00"
+ integrity sha512-qgv67Rueo4Pydfant3TwnXeFiN9dl+6lKMM6h5jYg9XewiGAGOr8vfWsTvQssC3m3xMKGS1ap3xPNH+BzZ4RMA==
+
cordova-plugin-whitelist@^1.3.3:
version "1.3.4"
resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz#31938545c7c3e7de35c20ab08c2c3afa06e8a3f9"