diff --git a/tmp_map/map.css b/tmp_map/map.css index 6ce9a19b..536b6012 100644 --- a/tmp_map/map.css +++ b/tmp_map/map.css @@ -272,4 +272,10 @@ height:24px; left:4px; top:3px; +} + +.city_base .city_state{ + position: absolute; + top:5px; /*TODO:도시 레벨 별로 다르게 위치 설정해볼 것*/ + left:0; } \ No newline at end of file diff --git a/tmp_map/map.html b/tmp_map/map.html index 973e5e51..59a757ee 100644 --- a/tmp_map/map.html +++ b/tmp_map/map.html @@ -15,7 +15,6 @@
- 217年 2月
diff --git a/tmp_map/map.js b/tmp_map/map.js index f2279850..03687eae 100644 --- a/tmp_map/map.js +++ b/tmp_map/map.js @@ -6,7 +6,11 @@ String.prototype.format = function() { }); }; -function reloadWorldMap(isDetailMap, clickableAll, selectCallback){ +function reloadWorldMap(isDetailMap, clickableAll, selectCallback, hrefTemplate){ + + if(!hrefTemplate){ + hrefTemplate = '#'; + } var cityPosition = getCityPosition(); @@ -202,31 +206,13 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback){ var myCity = obj.myCity; cityList.forEach(function(city){ - console.log(city); var id = city.id; $('.city_base_{0}'.format(id)).detach(); - var flagTemplate = '
'; - var stateTemplate = '
'; - var backgroundTemplate = '
'; + //이전 도시는 지운다. - - - - - //TODO: 도시를 그린다......... - // - //도시 선택 크기는 동일하게 가고 도시 이미지는 div로 설정. var $cityObj = $('
'.format(id)); $cityObj.addClass('city_level_{0}'.format(city.level)); - - $cityObj.css({'left':city.x-20,'top':city.y-15}); - - var $linkObj = $(''); - $linkObj.data({'text':city.text,'nation':city.nation}); - var $imgObj = $('
'.format(city.level)); - $cityObj.data('obj', city); - //$cityObj.append($bgObj); - //$cityObj.append($linkObj); + $cityObj.data('obj', city).css({'left':city.x-20,'top':city.y-15}); if('color' in city && city.color !== null){ var $bgObj = $('
'); @@ -234,21 +220,23 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback){ $bgObj.css({'background-image':'url(/images/b{0}.png)'.format(convColorValue(city.color))}); } - if(city.state > 0){ - var $imgObj = $(''.format(city.state)); - } - + var $linkObj = $(''); + $linkObj.data({'text':city.text,'nation':city.nation,'id':city.id}); $cityObj.append($linkObj); + var $imgObj = $('
'.format(city.level)); $linkObj.append($imgObj); - $map_body.append($cityObj); + + - if(selectCallback){ - $linkObj.click(function(){ - selectCallback($cityObj); - return false; - }); + if(city.state > 0){ + var $stateObj = $('
'.format(city.state)); + $linkObj.append($stateObj); } + + + + $map_body.append($cityObj); }); @@ -257,9 +245,6 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback){ } function drawBasicWorldMap(obj){ - - - return obj; } @@ -294,6 +279,21 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback){ } function setCityClickable(obj){ + + obj.cityList.forEach(function(city){ + var $cityLink = $world_map.find('.city_base_{0} .city_link'.format(city.id)); + + if('clickable' in city && city.clickable > 0){ + $cityLink.attr('href',hrefTemplate.format(city.id)); + } + + if(selectCallback){ + $cityLink.click(function(){ + return selectCallback(city); + }); + } + }); + return obj; } @@ -324,6 +324,10 @@ $(function(){ var isDetailMap = true; var clickableAll = false; - reloadWorldMap(isDetailMap, clickableAll, console.log); + function tmp(a){ + console.log(a); + return false; + } + reloadWorldMap(isDetailMap, clickableAll, tmp, 'goCity.php?id={0}'); }); \ No newline at end of file diff --git a/tmp_map/result.json b/tmp_map/result.json index a9a35df9..cc6ddd78 100644 --- a/tmp_map/result.json +++ b/tmp_map/result.json @@ -4,9 +4,9 @@ "year":217, "month":10, "cityList":[ - [1, 8, 0, 1, 1, 1], + [1, 8, 41, 1, 1, 1], [2, 8, 0, 2, 2, 1], - [3, 8, 0, 3, 2, 1], + [3, 8, 42, 3, 2, 1], [4, 8, 0, 0, 3, 1], [5, 8, 0, 0, 4, 1], [6, 8, 0, 0, 6, 1], @@ -25,8 +25,8 @@ [19, 6, 0, 1, 2, 1], [20, 6, 0, 2, 2, 1], [21, 6, 0, 3, 2, 1], - [22, 6, 0, 0, 3, 1], - [23, 6, 0, 0, 3, 1], + [22, 6, 41, 0, 3, 1], + [23, 6, 42, 0, 3, 1], [24, 6, 0, 0, 4, 1], [25, 6, 0, 0, 4, 1], [26, 6, 0, 0, 4, 1], @@ -42,8 +42,8 @@ [36, 5, 0, 0, 1, 1], [37, 5, 0, 1, 1, 1], [38, 5, 0, 2, 2, 1], - [39, 5, 0, 3, 2, 1], - [40, 5, 0, 0, 3, 1], + [39, 5, 8, 3, 2, 1], + [40, 5, 34, 0, 3, 1], [41, 5, 0, 0, 3, 1], [42, 5, 0, 0, 3, 1], [43, 5, 0, 0, 4, 1], @@ -57,8 +57,8 @@ [51, 5, 0, 0, 6, 1], [52, 5, 0, 0, 6, 1], [53, 5, 0, 0, 6, 1], - [54, 5, 0, 0, 6, 1], - [55, 5, 0, 0, 6, 1], + [54, 5, 8, 0, 6, 1], + [55, 5, 34, 0, 6, 1], [56, 5, 0, 0, 7, 1], [57, 5, 0, 0, 7, 1], [58, 5, 0, 0, 7, 1], @@ -66,15 +66,15 @@ [60, 5, 0, 0, 8, 1], [61, 5, 0, 0, 8, 1], [62, 5, 0, 0, 8, 1], - [63, 4, 0, 0, 3, 1], - [64, 4, 0, 0, 3, 1], + [63, 4, 8, 0, 3, 1], + [64, 4, 34, 0, 3, 1], [65, 4, 0, 1, 3, 1], [66, 4, 0, 2, 5, 1], [67, 4, 0, 3, 7, 1], [68, 4, 0, 0, 8, 1], [69, 4, 0, 0, 8, 1], - [70, 3, 0, 0, 1, 1], - [71, 3, 0, 1, 2, 1], + [70, 3, 8, 0, 1, 1], + [71, 3, 34, 1, 2, 1], [72, 3, 0, 2, 3, 1], [73, 3, 0, 3, 3, 1], [74, 3, 0, 0, 2, 1], @@ -91,12 +91,12 @@ [85, 2, 0, 0, 3, 1], [86, 2, 0, 3, 4, 1], [87, 3, 0, 3, 4, 1], - [88, 2, 0, 3, 6, 1], - [89, 2, 0, 3, 6, 1], + [88, 2, 8, 3, 6, 1], + [89, 2, 34, 3, 6, 1], [90, 2, 0, 0, 8, 1], [91, 1, 0, 0, 7, 1], - [92, 1, 0, 1, 7, 1], - [93, 1, 0, 2, 8, 1], + [92, 1, 8, 1, 7, 1], + [93, 1, 34, 2, 8, 1], [94, 1, 0, 3, 8, 1] ], "nationList":[