From 7540df01f068ea6018f7fdff1be768793e4a2d04 Mon Sep 17 00:00:00 2001
From: Mark Friedrich <exodus4d@users.noreply.github.com>
Date: Sat, 7 Apr 2018 13:56:55 +0200
Subject: [PATCH] - fixed broken map sync in "long polling" mode, closed #608

---
 app/main/controller/api/map.php | 19 ++++++++-----------
 js/app/mappage.js               |  1 -
 public/js/v1.3.4/app/mappage.js |  1 -
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/main/controller/api/map.php b/app/main/controller/api/map.php
index 32019f6d..a5f21068 100644
--- a/app/main/controller/api/map.php
+++ b/app/main/controller/api/map.php
@@ -670,22 +670,19 @@ class Map extends Controller\AccessController {
      */
     public function updateData(\Base $f3){
         $postData = (array)$f3->get('POST');
-
-        $forceUpdate = (bool)$postData['forceUpdate'];
         $mapData = (array)$postData['mapData'];
         $userDataRequired = (bool)$postData['getUserData'];
 
         $return = (object) [];
+        $return->error = [];
 
         $activeCharacter = $this->getCharacter();
 
-        // if there is any system/connection change data submitted -> save new data
-        if( $forceUpdate || !empty($mapData) ){
-            $return = (object) [];
-            $return->error = [];
+        // get current map data
+        $maps = $activeCharacter->getMaps();
 
-            // get current map data ===================================================================================
-            $maps = $activeCharacter->getMaps();
+        // if there is any system/connection change data submitted -> save new data
+        if( !empty($maps) && !empty($mapData) ){
 
             // loop all submitted map data that should be saved
             // -> currently there will only be ONE map data change submitted -> single loop
@@ -792,11 +789,11 @@ class Map extends Controller\AccessController {
                     }
                 }
             }
-
-            // format map Data for return
-            $return->mapData = $this->getFormattedMapsData($maps);
         }
 
+        // format map Data for return
+        $return->mapData = $this->getFormattedMapsData($maps);
+
         // if userData is requested -> add it as well
         // -> Only first trigger call should request this data!
         if($userDataRequired) {
diff --git a/js/app/mappage.js b/js/app/mappage.js
index 15c0d80e..586f6459 100644
--- a/js/app/mappage.js
+++ b/js/app/mappage.js
@@ -209,7 +209,6 @@ define([
 
                 // get updated map data
                 let updatedMapData = {
-                    forceUpdate: forceUpdateMapData ? 1 : 0,
                     mapData: mapModule.getMapModuleDataForUpdate(),
                     getUserData: Util.getCurrentUserData() ? 0 : 1
                 };
diff --git a/public/js/v1.3.4/app/mappage.js b/public/js/v1.3.4/app/mappage.js
index 15c0d80e..586f6459 100644
--- a/public/js/v1.3.4/app/mappage.js
+++ b/public/js/v1.3.4/app/mappage.js
@@ -209,7 +209,6 @@ define([
 
                 // get updated map data
                 let updatedMapData = {
-                    forceUpdate: forceUpdateMapData ? 1 : 0,
                     mapData: mapModule.getMapModuleDataForUpdate(),
                     getUserData: Util.getCurrentUserData() ? 0 : 1
                 };