From 2958b73b16385df8907dfc86f15f4dfb16a5e951 Mon Sep 17 00:00:00 2001 From: hide_d Date: Wed, 31 Jan 2018 03:25:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EB=8F=84=20=EA=B9=83=EB=B0=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tmp_map/map.css | 15 ++++++++++++++- tmp_map/map.js | 4 ++++ tmp_map/result.json | 4 ++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/tmp_map/map.css b/tmp_map/map.css index b55aac85..1dd280bb 100644 --- a/tmp_map/map.css +++ b/tmp_map/map.css @@ -286,7 +286,7 @@ height:12px; } -.city_base .city_flag img{ +.city_base .city_flag > img{ width:12px; height:12px; } @@ -329,4 +329,17 @@ .city_base.city_level_8 .city_flag{ right:-6px; top:-3px; +} + +.city_base .city_flag .city_capital{ + position: absolute; + width:10px; + height:10px; + top:0; + right:-1px; +} + +.city_base .city_flag .city_capital > img{ + width:10px; + height:10px; } \ No newline at end of file diff --git a/tmp_map/map.js b/tmp_map/map.js index f2696064..7ecb5364 100644 --- a/tmp_map/map.js +++ b/tmp_map/map.js @@ -237,6 +237,10 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback, hrefTemplate) if(city.nationId && city.nationId > 0){ var flagType = city.supply?'f':'d'; var $flagObj = $('
'.format(flagType, convColorValue(city.color))); + if(city.isCapital){ + var $capitalObj = $('
'); + $flagObj.append($capitalObj); + } $imgObj.append($flagObj); } diff --git a/tmp_map/result.json b/tmp_map/result.json index 52365a8b..d063bb43 100644 --- a/tmp_map/result.json +++ b/tmp_map/result.json @@ -4,8 +4,8 @@ "year":217, "month":10, "cityList":[ - [1, 8, 41, 1, 1, 0], - [2, 8, 0, 2, 2, 1], + [1, 8, 41, 1, 1, 1], + [2, 8, 0, 2, 2, 0], [3, 8, 42, 3, 2, 1], [4, 8, 0, 0, 3, 1], [5, 8, 0, 0, 4, 1],