From eb70e51ac11ca1917fe17a4d78a0ed4956c64083 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Jul 2018 01:21:00 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=A4=EC=8B=9C=EA=B0=84=20=EB=A7=B5?=
 =?UTF-8?q?=EC=9D=80=20=EC=BA=90=EC=8B=B1=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/a_history.php     |  5 ++++-
 hwe/a_status.php      |  5 ++++-
 hwe/b_diplomacy.php   |  5 ++++-
 hwe/index.php         |  5 ++++-
 hwe/js/map.js         | 39 +++++++++++++++++++++++++++++++++++++++
 hwe/processing.php    |  3 +++
 hwe/templates/map.php |  2 +-
 7 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/hwe/a_history.php b/hwe/a_history.php
index 626543a2..4c719bbe 100644
--- a/hwe/a_history.php
+++ b/hwe/a_history.php
@@ -167,10 +167,13 @@ $history = $db->queryFirstRow('SELECT log,genlog,nation,power,gen,city FROM hist
     <tr><td><?=banner()?> </td></tr>
 </table>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 reloadWorldMap({
     targetJson:'j_map_history.php?year=<?=$year?>&month=<?=$month?>&serverID=<?=$serverID?>',
     showMe:false,
-    neutralView:true
+    neutralView:true,
+    useCachedMap:false
 });
 </script>
 </body>
diff --git a/hwe/a_status.php b/hwe/a_status.php
index 8b06edcb..4e5f3b35 100644
--- a/hwe/a_status.php
+++ b/hwe/a_status.php
@@ -37,11 +37,14 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 <?=WebUtil::printJS('d_shared/base_map.js')?>
 <?=WebUtil::printJS('js/map.js')?>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 $(function(){
 
     reloadWorldMap({
         neutralView:true,
-        showMe:true
+        showMe:true,
+        useCachedMap:true
     });
 
 });
diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php
index 8e865c37..de96758b 100644
--- a/hwe/b_diplomacy.php
+++ b/hwe/b_diplomacy.php
@@ -86,11 +86,14 @@ foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE confl
 <?=WebUtil::printJS('d_shared/base_map.js')?>
 <?=WebUtil::printJS('js/map.js')?>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 $(function(){
 
     reloadWorldMap({
         neutralView:true,
-        showMe:true
+        showMe:true,
+        useCachedMap:true
     });
 
 });
diff --git a/hwe/index.php b/hwe/index.php
index ec9984fe..efb40222 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -95,9 +95,12 @@ $mapTheme = $admin['map_theme'];
 <?=WebUtil::printJS('js/map.js')?>
 <?=WebUtil::printJS('js/msg.js')?>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 $(function(){
     reloadWorldMap({
-        hrefTemplate:'b_currentCity.php?citylist={0}'
+        hrefTemplate:'b_currentCity.php?citylist={0}',
+        useCachedMap:true
     });
 
     setInterval(function(){
diff --git a/hwe/js/map.js b/hwe/js/map.js
index 675257d7..7f9cc6c0 100644
--- a/hwe/js/map.js
+++ b/hwe/js/map.js
@@ -13,6 +13,7 @@ function reloadWorldMap(option){
         clickableAll:false, //어떤 경우든 클릭을 가능하게 함. 해당 동작의 동작 가능성 여부와는 별도.
         selectCallback:null, //callback을 지정시 clickable과 관계 없이 해당 함수를 실행. 
         hrefTemplate:'#', //도시가 클릭가능할 경우 지정할 href값. {0}은 도시 id로 변환됨
+        useCachedMap:false, //맵 캐시를 사용
 
         //아래부터는 post query에 들어갈 녀석
         year:null, //year값, 연감등에 사용
@@ -25,6 +26,7 @@ function reloadWorldMap(option){
     
     option = $.extend(defaultOption, option);
 
+    var useCachedMap = option.useCachedMap;
     var isDetailMap = option.isDetailMap;
     var clickableAll = option.clickableAll;
     var selectCallback = option.selectCallback;
@@ -32,6 +34,7 @@ function reloadWorldMap(option){
 
     var cityPosition = getCityPosition();
 
+    var storedOldMapKey = 'sam.{0}.map'.format(serverNick);
     //OBJ : startYear, year, month, cityList, nationList, spyList, shownByGeneralList, myCity
 
     function checkReturnObject(obj){
@@ -50,6 +53,12 @@ function reloadWorldMap(option){
             return obj.promise();
         }
 
+        if(useCachedMap){
+            localStorage.setItem(storedOldMapKey, JSON.stringify([serverID, obj]));
+        }
+        
+        $world_map.removeClass('draw_required');
+
         return obj;
     }
     
@@ -90,6 +99,7 @@ function reloadWorldMap(option){
         else{
             $world_map.addClass('map_winter');
         }
+        console.log('haha?');
 
         $map_title.html('{0}年 {1}月'.format(year, month));
 
@@ -470,5 +480,34 @@ function reloadWorldMap(option){
         .then(setMouseWork)
         .then(setCityClickable)
         .then(saveCityInfo);    
+
+    if(useCachedMap && $world_map.hasClass('draw_required')){
+        //일단 불러옴
+        do{
+            var storedMap = localStorage.getItem(storedOldMapKey);
+            if(!storedMap){
+                break;
+            }
+            storedMap = JSON.parse(storedMap);
+            var storedServerID = storedMap[0];
+            if(storedServerID != serverID){
+                break;
+            }
+
+            storedMap = storedMap[1];
+            storedMap = setMapBackground(storedMap);
+            storedMap = convertCityObjs(storedMap);
+            if(isDetailMap){
+                storedMap = drawDetailWorldMap(storedMap);
+            }
+            else{
+                storedMap = drawBasicWorldMap(storedMap);
+            }
+            storedMap = setMouseWork(storedMap);
+            storedMap = setCityClickable(storedMap);
+            storedMap = saveCityInfo(storedMap);
+        }while(false);
+        
+    }
 }
 
diff --git a/hwe/processing.php b/hwe/processing.php
index de4dc6d5..ea4c795b 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -131,6 +131,8 @@ function starter($name, $type=0) {
 <?=WebUtil::printJS('d_shared/base_map.js')?>
 <?=WebUtil::printJS('js/map.js')?>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 $(function(){
     var $target = $("form[name=form1] select[name=double]");
     console.log($target);
@@ -138,6 +140,7 @@ $(function(){
         isDetailMap:false,
         clickableAll:true,
         neutralView:true,
+        useCachedMap:true,
         selectCallback:function(city){
             $target.val(city.id);
             return false;
diff --git a/hwe/templates/map.php b/hwe/templates/map.php
index fc70f88e..12c2527c 100644
--- a/hwe/templates/map.php
+++ b/hwe/templates/map.php
@@ -1,4 +1,4 @@
-<div class="world_map map_theme_<?=$mapTheme?>">
+<div class="world_map map_theme_<?=$mapTheme?> draw_required">
     <div class="map_title">
         <span class="map_title_text">
         </span>