diff --git a/tmp_map/map.css b/tmp_map/map.css index 536b6012..b55aac85 100644 --- a/tmp_map/map.css +++ b/tmp_map/map.css @@ -278,4 +278,55 @@ position: absolute; top:5px; /*TODO:도시 레벨 별로 다르게 위치 설정해볼 것*/ left:0; +} + +.city_base .city_flag{ + position: absolute; + width:12px; + height:12px; +} + +.city_base .city_flag img{ + width:12px; + height:12px; +} + +.city_base.city_level_1 .city_flag{ + right:-8px; + top:-4px; +} + +.city_base.city_level_2 .city_flag{ + right:-8px; + top:-4px; +} + +.city_base.city_level_3 .city_flag{ + right:-8px; + top:-4px; +} + +.city_base.city_level_4 .city_flag{ + right:-6px; + top:-3px; +} + +.city_base.city_level_5 .city_flag{ + right:-6px; + top:-4px; +} + +.city_base.city_level_6 .city_flag{ + right:-6px; + top:-4px; +} + +.city_base.city_level_7 .city_flag{ + right:-6px; + top:-4px; +} + +.city_base.city_level_8 .city_flag{ + right:-6px; + top:-3px; } \ No newline at end of file diff --git a/tmp_map/map.html b/tmp_map/map.html index 59a757ee..6d447853 100644 --- a/tmp_map/map.html +++ b/tmp_map/map.html @@ -11,7 +11,7 @@ - +
diff --git a/tmp_map/map.js b/tmp_map/map.js index 03687eae..f2696064 100644 --- a/tmp_map/map.js +++ b/tmp_map/map.js @@ -64,7 +64,7 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback, hrefTemplate) "state":arr[2], "nationId":(arr[3]>0)?arr[3]:null, "region":arr[4], - "supply":arr[5] + "supply":(arr[5]!=0) }; } @@ -234,6 +234,12 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback, hrefTemplate) $linkObj.append($stateObj); } + if(city.nationId && city.nationId > 0){ + var flagType = city.supply?'f':'d'; + var $flagObj = $('
'.format(flagType, convColorValue(city.color))); + $imgObj.append($flagObj); + } + $map_body.append($cityObj); diff --git a/tmp_map/result.json b/tmp_map/result.json index cc6ddd78..52365a8b 100644 --- a/tmp_map/result.json +++ b/tmp_map/result.json @@ -4,7 +4,7 @@ "year":217, "month":10, "cityList":[ - [1, 8, 41, 1, 1, 1], + [1, 8, 41, 1, 1, 0], [2, 8, 0, 2, 2, 1], [3, 8, 42, 3, 2, 1], [4, 8, 0, 0, 3, 1], @@ -17,13 +17,13 @@ [11, 7, 0, 0, 2, 1], [12, 7, 0, 0, 2, 1], [13, 7, 0, 1, 6, 1], - [14, 7, 0, 1, 6, 1], + [14, 7, 0, 1, 6, 0], [15, 7, 0, 1, 7, 1], [16, 7, 0, 1, 8, 1], [17, 6, 0, 0, 1, 1], [18, 6, 0, 0, 2, 1], [19, 6, 0, 1, 2, 1], - [20, 6, 0, 2, 2, 1], + [20, 6, 0, 2, 2, 0], [21, 6, 0, 3, 2, 1], [22, 6, 41, 0, 3, 1], [23, 6, 42, 0, 3, 1], @@ -68,7 +68,7 @@ [62, 5, 0, 0, 8, 1], [63, 4, 8, 0, 3, 1], [64, 4, 34, 0, 3, 1], - [65, 4, 0, 1, 3, 1], + [65, 4, 0, 1, 3, 0], [66, 4, 0, 2, 5, 1], [67, 4, 0, 3, 7, 1], [68, 4, 0, 0, 8, 1], @@ -84,7 +84,7 @@ [78, 2, 0, 0, 1, 1], [79, 2, 0, 0, 1, 1], [80, 2, 0, 2, 2, 1], - [81, 2, 0, 2, 2, 1], + [81, 2, 0, 2, 2, 0], [82, 2, 0, 2, 2, 1], [83, 2, 0, 2, 2, 1], [84, 2, 0, 0, 3, 1],