Merge pull request #2501 from MapQuest/grid_markers_fix
Grid markers fix for issue #2500
This commit is contained in:
Dane Springmeyer
commit
8be50220e0
14 changed files with 457 additions and 351 deletions
|
|
@ -192,17 +192,18 @@ struct vector_markers_rasterizer_dispatch_grid : mapnik::noncopyable
|
|||
double opacity = get<double>(sym_,keys::opacity, feature_, vars_, 1.0);
|
||||
bool allow_overlap = get<bool>(sym_, keys::allow_overlap, feature_, vars_, false);
|
||||
bool avoid_edges = get<bool>(sym_, keys::avoid_edges, feature_, vars_, false);
|
||||
coord2d center = bbox_.center();
|
||||
agg::trans_affine_translation recenter(-center.x, -center.y);
|
||||
double spacing = get<double>(sym_, keys::spacing, feature_, vars_, 100.0);
|
||||
double max_error = get<double>(sym_, keys::max_error, feature_, vars_, 0.2);
|
||||
markers_placement_params params { bbox_, marker_trans_, spacing * scale_factor_, max_error, allow_overlap, avoid_edges };
|
||||
coord2d center = bbox_.center();
|
||||
agg::trans_affine_translation recenter(-center.x, -center.y);
|
||||
agg::trans_affine tr = recenter * marker_trans_;
|
||||
markers_placement_params params { bbox_, tr, spacing * scale_factor_, max_error, allow_overlap, avoid_edges };
|
||||
markers_placement_finder<T, Detector> placement_finder(
|
||||
placement_method, path, detector_, params);
|
||||
double x, y, angle = .0;
|
||||
while (placement_finder.get_point(x, y, angle, ignore_placement))
|
||||
{
|
||||
agg::trans_affine matrix = recenter * marker_trans_;
|
||||
agg::trans_affine matrix = tr;
|
||||
matrix.rotate(angle);
|
||||
matrix.translate(x, y);
|
||||
svg_renderer_.render_id(ras_, sl_, renb_, feature_.id(), matrix, opacity, bbox_);
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@
|
|||
"keys": [
|
||||
"",
|
||||
"1",
|
||||
"5",
|
||||
"4",
|
||||
"2",
|
||||
"3"
|
||||
"2"
|
||||
],
|
||||
"data": {},
|
||||
"grid": [
|
||||
|
|
@ -23,105 +20,105 @@
|
|||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" #### ##### !!!! ",
|
||||
" ######### !!!! ",
|
||||
" ########## !!!! $ $ ",
|
||||
" ########### !!!! $$$$$$ ",
|
||||
" ########### !!!! $$$$$$$$ ",
|
||||
" ########### !!!! $$$$$$$$ ",
|
||||
" ### ########### ## !!!! $$$$$$$$ ",
|
||||
" ######### !!!! $$$$$$ ",
|
||||
" # ###### !!!! $ $$ ",
|
||||
" # ##### !!!! $$$$$ ",
|
||||
" ####### !!!! $$$$ ",
|
||||
" ##### %%%% %%%%% !!!! $$$$$$$ ",
|
||||
" ###### %%%%%%% %%%%%%%!!!! $$$$$$ ",
|
||||
" ########## %%%%%%%%% %%%%%%%%%!!! ",
|
||||
" ########## %%%%%%%%%%% %%%%%%%%%%%% %%%%%%%%%%%!! ",
|
||||
" ####### %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%% ",
|
||||
" %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% ",
|
||||
" % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%% !!!!%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%% !!!! %%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" %%%%% !!!! %%%%%%%%%%%%%%%%% ",
|
||||
" % %%%%!!!! %%%%%%%%%%%%%%%%%% ",
|
||||
" % %%%%%!! %%%%%%%%%%%%%%%%%%% ",
|
||||
" %% %%%%% %%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !%%%%% %%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!%%%%%% %%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!!%%%%%%%%%%%%%%%%% %%%%% %%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%% %%%%% %%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%% %%%%% %%%%% %%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%% %%%%% %%%%% %%%% ",
|
||||
" !!!! %%%%%%%%%%%%%% %%%%% %%%%% %%%% ",
|
||||
" !!!! %%%%% %%%%% %%%%% %%%%% %%%% ",
|
||||
" !!!! %%%%% %%%%% %%%%% %%%% ",
|
||||
" !!!! %%%%% %%%%% %%%%% %%%% ",
|
||||
" !!!! %%%%% %%%%% %%%%% %%%% ",
|
||||
" !!!! %%%%% %%%%% %%%%% %%%% ",
|
||||
" !!!! %%%%% %%%%% %%%%% %%%% ",
|
||||
" !!!! %%%%% %%%%% %%%%% %%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! &&&&&&& %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! &&&&&&& %%%%%%%%%%%%%%%%%%%%%%%%%%% ",
|
||||
" !!!! &&&&&&& %%%%%%%%%%%%%% ",
|
||||
" !!!! &&&&&&& ",
|
||||
" !!!! &&&&&&&&&&& ",
|
||||
" !!!! &&&&&& ",
|
||||
" !!!! &&&&& ",
|
||||
" !!!! &&& ",
|
||||
" !!!! &&&&&& ",
|
||||
" !!!! &&&&&&& ",
|
||||
"!!!! &&& ",
|
||||
" ####### #######!!!! ",
|
||||
" ######### #########!!! ",
|
||||
" ########### ############ ###########!! ",
|
||||
" ############################################## ",
|
||||
" ############################################### ",
|
||||
" ############################################### ",
|
||||
" ############################################### ",
|
||||
" ############################################### ",
|
||||
" ############################################# ",
|
||||
" ############################################# ",
|
||||
" ############################################## ",
|
||||
" ################################################ ",
|
||||
" ################################################ ",
|
||||
" ################################################## ",
|
||||
" #################################################### ",
|
||||
" #################################################### ",
|
||||
" #################################################### ",
|
||||
" ###################################################### ",
|
||||
" ###################################################### ",
|
||||
" ###################################################### ",
|
||||
" ###################################################### ",
|
||||
" ###################################################### ",
|
||||
" ###################################################### ",
|
||||
" ###################################################### ",
|
||||
" ###################################################### ",
|
||||
" ###################################################### ",
|
||||
" ###################################################### ",
|
||||
" ###################################################### ",
|
||||
" ###################################################### ",
|
||||
" #################################################### ",
|
||||
" #################################################### ",
|
||||
" ############################################################################# ",
|
||||
" ### ################################################### #### ",
|
||||
" ############################################################### ",
|
||||
" #### ################################################# #### ",
|
||||
" ### ################################################ ### ",
|
||||
" # ############################################### # ",
|
||||
" ############################################# ",
|
||||
" ########################################### ",
|
||||
" ####################################### ",
|
||||
" !#################################### ",
|
||||
" #### !!!!############################### ",
|
||||
" ##### !!!! ####################### ",
|
||||
" ##### !!!! ################# ",
|
||||
" # ####!!!! ################## ",
|
||||
" # #####!! ################### ",
|
||||
" ## ##### ##################### ",
|
||||
" !##### ##################### ",
|
||||
" !!###### ###################### ",
|
||||
" !!!!################# ##### ########## ",
|
||||
" !!!! ################# ##### ########## ",
|
||||
" !!!! ################ ##### ##### #### ",
|
||||
" !!!! ############### ##### ##### #### ",
|
||||
" !!!! ############## ##### ##### #### ",
|
||||
" !!!! ##### ##### ##### ##### #### ",
|
||||
" !!!! ##### ##### ##### #### ",
|
||||
" !!!! ##### ##### ##### #### ",
|
||||
" !!!! ##### ##### ##### #### ",
|
||||
" !!!! ##### ##### ##### #### ",
|
||||
" !!!! ##### ##### ##### #### ",
|
||||
" !!!! ##### ##### ##### #### ",
|
||||
" !!!! ###################### ",
|
||||
" !!!! ############################## ",
|
||||
" !!!! ##################################### ",
|
||||
" !!!! ########################################## ",
|
||||
" !!!! ############################################# ",
|
||||
" !!!! ################################################ ",
|
||||
" !!!! ################################################## ",
|
||||
" !!!! ################################################### ",
|
||||
" !!!! ################################################### ",
|
||||
" !!!! ################################################### ",
|
||||
" !!!! ################################################## ",
|
||||
" !!!! ################################################# ",
|
||||
" !!!! ############################################### ",
|
||||
" !!!! ############################################ ",
|
||||
" !!!! ######################################## ",
|
||||
" !!!! ################################### ",
|
||||
" !!!! ########################### ",
|
||||
" !!!! ############## ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
" !!!! ",
|
||||
"!!!! ",
|
||||
"!!! ",
|
||||
"!! ",
|
||||
"! ",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
"keys": [
|
||||
"",
|
||||
"1",
|
||||
"2"
|
||||
],
|
||||
"data": {},
|
||||
"grid": [
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" !! # ",
|
||||
" !!!!!!! # ",
|
||||
" ! # ",
|
||||
" ",
|
||||
" ! ",
|
||||
" ! ",
|
||||
" ! ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
"keys": [
|
||||
"",
|
||||
"1",
|
||||
"2"
|
||||
],
|
||||
"data": {},
|
||||
"grid": [
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ! # ",
|
||||
" !!! # ",
|
||||
" !!! # ",
|
||||
" !!!!!!!!!!!!!! # ",
|
||||
" !!! # ",
|
||||
" !! # ",
|
||||
" ! ",
|
||||
" ",
|
||||
" ! ",
|
||||
" ! ",
|
||||
" ! ",
|
||||
" ! ",
|
||||
" ! ",
|
||||
" ! ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "
|
||||
]
|
||||
}
|
||||
|
|
@ -14,8 +14,8 @@
|
|||
"1",
|
||||
"5",
|
||||
"12",
|
||||
"6",
|
||||
"9",
|
||||
"6",
|
||||
"11",
|
||||
"21",
|
||||
"8",
|
||||
|
|
@ -30,8 +30,8 @@
|
|||
],
|
||||
"data": {},
|
||||
"grid": [
|
||||
" !!!!!!!!!!!!## $$%%%%%%%%%%%% &&&&&&&&&&& ' ((((((((((((",
|
||||
" ) ) ! ## ## $$ %% % & '' ",
|
||||
" !!!!!!!!!!!!## $%%%%%%%%%%%% &&&&&&&&&&& ' ((((((((((((",
|
||||
" ) ) ! ## ## $ %% % & '' ",
|
||||
" )) ) ### $ %%%%%%% ' ",
|
||||
" )) ) ### $ %%%%%%% & ",
|
||||
" )))) ) ### $ $ ** & & ",
|
||||
|
|
@ -39,30 +39,30 @@
|
|||
" ) ) ## $ $$ *** & ",
|
||||
" ) $$$$$$ *** ",
|
||||
" ) + $ $$$$ **** & ",
|
||||
")) +$ $ ** ** &&& & ",
|
||||
")) + *** & & '''''''''' ",
|
||||
", -- +++ ** & ",
|
||||
", ----- ++++ .. * ",
|
||||
")) +$ $ ** &&& & ",
|
||||
")) + & & '''''''''' ",
|
||||
", -- +++ & ",
|
||||
", ----- ++++ .. ",
|
||||
", --- ++++ .. ",
|
||||
", -- +++ .. ",
|
||||
", -- +++ .. ",
|
||||
", -- +++ .. ",
|
||||
", -- +++ .. ",
|
||||
", --- ++++ .. ",
|
||||
", / 00+ .. ",
|
||||
", / 0+ ",
|
||||
", // 00 0 1 1 2 2 ",
|
||||
", // 0 000 11 1 2 ",
|
||||
" / 000 111 1 ",
|
||||
" 3 // 000 111 1 2 ",
|
||||
" 333 / // 0000 1111 1 2 2 ",
|
||||
" 333 / /// 000 11 1 2 2 ",
|
||||
" 333 / /// 0 1 2 ",
|
||||
" 3333 ///// 4444444 1 ",
|
||||
" 333 3 / // 4444444 11 22 2 55 ",
|
||||
" 3 33 6 / 4 1 22 2 77 5 ",
|
||||
" 33 6 44 1 2 7 5 ",
|
||||
" 33666666 1 2 5 ",
|
||||
", //+ .. ",
|
||||
", /+ ",
|
||||
", 0 // / 1 1 2 2 ",
|
||||
", 0 / /// 11 1 2 ",
|
||||
" 0 /// 111 1 ",
|
||||
" 3 00 /// 111 1 2 ",
|
||||
" 333 0 00 //// 1111 1 2 2 ",
|
||||
" 333 0 000 /// 11 1 2 2 ",
|
||||
" 333 0 000 / 1 2 ",
|
||||
" 3333 00000 4444444 1 ",
|
||||
" 333 0 00 4444444 1 22 2 55 ",
|
||||
" 3 6 0 4 1 22 2 77 5 ",
|
||||
" 6 44 2 7 5 ",
|
||||
" 6666666 2 5 ",
|
||||
" 6666666 2 5 ",
|
||||
" 6 66666 ",
|
||||
" ",
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
"23",
|
||||
"25",
|
||||
"13",
|
||||
"5",
|
||||
"16",
|
||||
"1",
|
||||
"12",
|
||||
|
|
@ -20,7 +19,6 @@
|
|||
"21",
|
||||
"26",
|
||||
"8",
|
||||
"7",
|
||||
"10",
|
||||
"24",
|
||||
"17",
|
||||
|
|
@ -30,133 +28,133 @@
|
|||
],
|
||||
"data": {},
|
||||
"grid": [
|
||||
" !!!!##############$$ $$$$$$$ %%%&&&&&&&&&&&&&&& ''''''''''' ( )))))))))))))))",
|
||||
" !!!!! ! ## $$$ $$$$$ %%% && ** ' ' ( )) ",
|
||||
"!!!!!! ! # $$$ $$$$$$ %%%%% ** ' (((( ",
|
||||
" !!!!!! ##########$$ $$$$$$$ %%%&&&&&&&&&&&&&&& ''''''''''' ( )))))))))))))))",
|
||||
" !!!!! ! $$$ $$$$$ %%% && ** ' ' ( )) ",
|
||||
"!!!!!! ! $$$ $$$$$$ %%%%% ** ' (((( ",
|
||||
"!!!!! ! $$$ $$$$$$ %%%%%% *** ** ' ((( ",
|
||||
"!!!! ! $$ $$$$$$$ % %%%% **** ** ' ' (( ",
|
||||
"!!! ! $$ $$$$$$$ % %%%% ***** ** ' ' ( ",
|
||||
"!! ! $$ ++$$ , % %%%%%% ****** ** '' ' ( ",
|
||||
"!!!! $$ ++$ , % %%%%% ***** *** ''' ' ( ",
|
||||
"!!!! $$++ , % %%%%%% ***** *** ''''' ( ",
|
||||
" !!! $++ ,% %%%%%%% ****** *** ' ' ' ( ",
|
||||
"! ! ++ , %%%%%%% ******* ** ' ' ((((((((((( ",
|
||||
"- ++ , %%%%%%% ******* ** '' ",
|
||||
"- ++++ ,,,,,%%%%% **** ** '' ",
|
||||
"- +++ ,,, %%% *** ** ' ",
|
||||
"- ++ ,, % * ' ",
|
||||
"- , ' ",
|
||||
"- , .. ",
|
||||
"-- // 0 , 00 11 .. ",
|
||||
"-- // 00 , 0000 111 .... ",
|
||||
"- // 00, 00000 11111 .. ",
|
||||
"- / // 0, 000000 111111 .. 22222222222 3333333333",
|
||||
"44 /// 000 00000 111111 .. 2 2 3 ",
|
||||
"-44 /// 0000000000 111111 1.. 2 2 3 ",
|
||||
"4 44 ///// 0000 000000 111111 1 .. 2 3 ",
|
||||
"44 44 / /// 00 00000 1111111 1 .. 2 3 ",
|
||||
"44 44 / //// 00 00000000 1111111 1 .. 2 2 3 ",
|
||||
"444 44 / ////// 00 000000 111111 1 2 2 3 ",
|
||||
"444 44 / ////// 00 0000 111 1 22 2 33 ",
|
||||
"44444 4444 / ////// 00 00 11111 2222 3333 ",
|
||||
"44444 444 5 / ////// 00 6 111 222 2 77 3 333 ",
|
||||
" 4444 444 5555555555//// 666666666 1111 2 2 777777777 3 ",
|
||||
" 44444444 44 5555555555//// 666666666 11 1 2 777777777 3 ",
|
||||
" 444444 44 5 ////// 66 11 2 77 3 ",
|
||||
" 4444 44 /// 11 2 3 ",
|
||||
" 44 4 // 1 22 3 ",
|
||||
" 2 3 ",
|
||||
"!! ! $$ $$$$ + % %%%%%% ****** ** '' ' ( ",
|
||||
"!!!! $$ $$$ + % %%%%% ***** *** ''' ' ( ",
|
||||
"!!!! $$ + % %%%%%% ***** *** ''''' ( ",
|
||||
" !!! $$ +% %%%%%%% ****** *** ' ' ' ( ",
|
||||
"! ! $ + %%%%%%% ******* ** ' ' ((((((((((( ",
|
||||
", + %%%%%%% ******* ** '' ",
|
||||
", +++++%%%%% **** ** '' ",
|
||||
", +++ %%% *** ** ' ",
|
||||
", ++ % * ' ",
|
||||
", + ' ",
|
||||
", + -- ",
|
||||
",, .. / + // 00 -- ",
|
||||
",, .. // + //// 000 ---- ",
|
||||
", .. //+ ///// 00000 -- ",
|
||||
", . .. /+ ////// 000000 -- 11111111111 2222222222",
|
||||
"33 ... /// ///// 000000 -- 1 1 2 ",
|
||||
",33 ... ////////// 000000 0-- 1 1 2 ",
|
||||
"3 33 ..... //// ////// 000000 0 -- 1 2 ",
|
||||
"33 33 . ... // ///// 0000000 0 -- 1 2 ",
|
||||
"33 33 . .... // //////// 0000000 0 -- 1 1 2 ",
|
||||
"333 33 . ...... // ////// 000000 0 1 1 2 ",
|
||||
"333 33 . ...... // //// 000 0 11 1 22 ",
|
||||
"33333 3333 . ...... // // 00000 1111 2222 ",
|
||||
"33333 333 . ...... // 4 000 111 1 55 2 222 ",
|
||||
" 3333 333 . ...... 444444444 0000 1 1 555555555 2 ",
|
||||
" 33333333 33 ....... 444444444 00 0 1 555555555 2 ",
|
||||
" 333333 33 ...... 44 00 1 55 2 ",
|
||||
" 3333 33 ... 00 1 2 ",
|
||||
" 33 3 .. 0 11 2 ",
|
||||
" 1 2 ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" 888888888888 ",
|
||||
" 8 88 ",
|
||||
" 8 88 ",
|
||||
" 8 88 ",
|
||||
" 8 88 ",
|
||||
" 8 88 ",
|
||||
" 8 8 ",
|
||||
" 8 8 ",
|
||||
" 8 8 ",
|
||||
" 8 8 ",
|
||||
" 8 8 ",
|
||||
" 8 8 ",
|
||||
" 88 8 ",
|
||||
"8888 8 ",
|
||||
" 888 8 ",
|
||||
"888 8 ",
|
||||
"8 ",
|
||||
" 666666666666 ",
|
||||
" 6 66 ",
|
||||
" 6 66 ",
|
||||
" 6 66 ",
|
||||
" 6 66 ",
|
||||
" 6 66 ",
|
||||
" 6 6 ",
|
||||
" 6 6 ",
|
||||
" 6 6 ",
|
||||
" 6 6 ",
|
||||
" 6 6 ",
|
||||
" 6 6 ",
|
||||
" 66 6 ",
|
||||
"6666 6 ",
|
||||
" 666 6 ",
|
||||
"666 6 ",
|
||||
"6 ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
"9 ",
|
||||
"999 9 ",
|
||||
" 999 9 ",
|
||||
"9999 9 ",
|
||||
" 99 9 ",
|
||||
" 99 9 ",
|
||||
" 99 9 ",
|
||||
" 99 9 ",
|
||||
" 99 9 ",
|
||||
" 99 9 ",
|
||||
" 99 9 ",
|
||||
" 9 9 ",
|
||||
" 9 9 ",
|
||||
" 9 : ;; 9 ",
|
||||
" 9 : ;; 9 ",
|
||||
" 9 : ;; 9 ",
|
||||
" : :999999999;; ; ",
|
||||
" :: ;;; ",
|
||||
" :::: ;;;; ",
|
||||
" :: ;; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" : ; ",
|
||||
" :: ;; ",
|
||||
" :: ;; ",
|
||||
" :: ;; ",
|
||||
" :: ;; ",
|
||||
" :: ;; ",
|
||||
" :: ;; ",
|
||||
" :: ;; ",
|
||||
" :: ;; ",
|
||||
" :: ;; ",
|
||||
" :: ;; "
|
||||
"7 ",
|
||||
"777 7 ",
|
||||
" 777 7 ",
|
||||
"7777 7 ",
|
||||
" 77 7 ",
|
||||
" 77 7 ",
|
||||
" 77 7 ",
|
||||
" 77 7 ",
|
||||
" 77 7 ",
|
||||
" 77 7 ",
|
||||
" 77 7 ",
|
||||
" 7 7 ",
|
||||
" 7 7 ",
|
||||
" 7 8 99 7 ",
|
||||
" 7 8 99 7 ",
|
||||
" 7 8 99 7 ",
|
||||
" 8 877777777799 9 ",
|
||||
" 88 999 ",
|
||||
" 8888 9999 ",
|
||||
" 88 99 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 8 9 ",
|
||||
" 88 99 ",
|
||||
" 88 99 ",
|
||||
" 88 99 ",
|
||||
" 88 99 ",
|
||||
" 88 99 ",
|
||||
" 88 99 ",
|
||||
" 88 99 ",
|
||||
" 88 99 ",
|
||||
" 88 99 ",
|
||||
" 88 99 "
|
||||
]
|
||||
}
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
"6",
|
||||
"12",
|
||||
"2",
|
||||
"13",
|
||||
"10",
|
||||
"13",
|
||||
"14",
|
||||
"11",
|
||||
"3",
|
||||
|
|
@ -120,48 +120,48 @@
|
|||
" %%%%% (( ((((( (((((( ((((( (((((((( (((((((((((((( ((((((((((((( $$$$$$ ",
|
||||
" %%%% (((((( (((((( ) ( ((((((((((((( (((((((((((( ((((((((( $$$$ ",
|
||||
" %%% ((((((((((( * ) ((((((((((((( (((((((( (((((( $$$$ ",
|
||||
" % %%% (((((((( **** ) (((((((((+( ((( $$$$$ ",
|
||||
" %%%%%% (((( ***** ))) ((( (+( $$$$$ ",
|
||||
" %%%%% ***** ))) (( (+ ,,,,,,,,,,,, , , $$$$$ ",
|
||||
" %%%% ****** ))) + ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, ,,, $$$$ ",
|
||||
" %%%% ******* )))) +++ ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, , $$$$$ ",
|
||||
" %%%% ****** )))) +++ ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, , $$$$$ ",
|
||||
" %%%%% ****** ))) +++ ------ ,,,,,,,,,,,,,,,,, $$$$$ ",
|
||||
" %%%% ******* ))) ++++ --------------------------------- ,,,,,,,,, $$$$$ ",
|
||||
" %%%% ****** ))) ++++ ----------------------------- ,,,,,,,, $$$$$ ",
|
||||
" %%%%% ******* ))) +++ ----------------------------- ,,,,, , $$$$$$ ",
|
||||
" %%%%% ****** )))) +++ ,,,,, $$$$ ",
|
||||
" %%%%% ****** )))) +++ ,,,,,, $$$$ ",
|
||||
" %%%% ******* ))) +++ ,,,,, $$$$$ ",
|
||||
" %%%% ******* ))) +++ .. . ,,,, $$$$ ",
|
||||
" %%%%% ****** ))) ++++ . . . ................................. ,,,, $$$$$ ",
|
||||
" %%%% ******* ))) ++++ ............................................ ,,,, $$$$$ ",
|
||||
" %%%% ******** )))) +++ ........................................... ,,,, $$$$$$ ",
|
||||
" %%%% ***** )))) +++ ................. ,,,,, $$$$ ",
|
||||
" %%%% ******* ))) +++ ...... . .. . ,,,, $$$$$ ",
|
||||
" %%%%% * ****** ))) +++ ....... . ,,,, $$$$ ",
|
||||
" %%%%% ***** ))) ++++ ...... ,,,, $$$$ ",
|
||||
" %%%%%% ******* //////// ))) ++++ ... ,,,, $$$$ ",
|
||||
" %%%% ******* /////////////// ))) ++++ ...... ,,,, $$$$ ",
|
||||
" %%%%% ****** ////////////////////// )))) +++ ...... ,,,, $$$$ ",
|
||||
" %%%%% ******* ////// ////////////// )))) +++ ...... ,,,, $$$$ ",
|
||||
" %%%% ******* /////// ///////// ))) +++ .... ,,,,, $$$$ ",
|
||||
" %%%% ****** // ///// //// ))) +++ .... ,,,,,, $$$$ ",
|
||||
" %%%% ****** / ////// ///// ))) ++++ ..... 00000000000000000000000000000 ,,,,, $$$$ ",
|
||||
" %%%% ******* / ////// //// ))) ++++ .... 000000000000000000000000000000000 ,,,, ,, $$$$ ",
|
||||
" %%%% ***** ////// //// +++ .... 00000000000000000000000000000 ,,, $$$$ ",
|
||||
" %%%% ***** /////// //// +++ ..... ,,, $$$$ ",
|
||||
" %%%% *** /////// ///// +++ ...... ,,,,, $$$$ ",
|
||||
" %%% * ///// //// +++ ..... ,,,,, $$$$ ",
|
||||
" %%% ///// //// +++ ... ,,,,,, $$$$ ",
|
||||
" %%% ///// //// +++ ..... ,,,,, $$$$ ",
|
||||
" %%% ////// ///// .... ,,,,,,, $$$$ ",
|
||||
" %%% //// //// ..... ,,,,,,,,,,,,,,,, , ,,, ,, ,,,, , $$$$ ",
|
||||
" %%% //// /// .... ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, $$$$ ",
|
||||
" %%% //// /// .... ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, $$$$ ",
|
||||
" %%% ////// //// ..... ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, , $$$$ ",
|
||||
" %%% //// //// .... ,,, , , $$$$ ",
|
||||
" %%% ///// //// ..... , $$$$ ",
|
||||
" % %%% (((((((( **** ) ((((((((( ( ((( $$$$$ ",
|
||||
" %%%%%% (((( ***** ))) ((( ( ( $$$$$ ",
|
||||
" %%%%% ***** ))) (( ( ++++++++++++ + + $$$$$ ",
|
||||
" %%%% ****** ))) +++++++++++++++++++++++++++++++++++++ +++ $$$$ ",
|
||||
" %%%% ******* )))) ,,, ++++++++++++++++++++++++++++++++++++++ + $$$$$ ",
|
||||
" %%%% ****** )))) ,,, +++++++++++++++++++++++++++++++++ + $$$$$ ",
|
||||
" %%%%% ****** ))) ,,, ------ +++++++++++++++++ $$$$$ ",
|
||||
" %%%% ******* ))) ,,,, --------------------------------- +++++++++ $$$$$ ",
|
||||
" %%%% ****** ))) ,,,, ----------------------------- ++++++++ $$$$$ ",
|
||||
" %%%%% ******* ))) ,,, ----------------------------- +++++ + $$$$$$ ",
|
||||
" %%%%% ****** )))) ,,, +++++ $$$$ ",
|
||||
" %%%%% ****** )))) ,,, ++++++ $$$$ ",
|
||||
" %%%% ******* ))) ,,, +++++ $$$$$ ",
|
||||
" %%%% ******* ))) ,,, .. . ++++ $$$$ ",
|
||||
" %%%%% ****** ))) ,,,, . . . ................................. ++++ $$$$$ ",
|
||||
" %%%% ******* ))) ,,,, ............................................ ++++ $$$$$ ",
|
||||
" %%%% ******** )))) ,,, ........................................... ++++ $$$$$$ ",
|
||||
" %%%% ***** )))) ,,, ................. +++++ $$$$ ",
|
||||
" %%%% ******* ))) ,,, ...... . .. . ++++ $$$$$ ",
|
||||
" %%%%% * ****** ))) ,,, ....... . ++++ $$$$ ",
|
||||
" %%%%% ***** ))) ,,,, ...... ++++ $$$$ ",
|
||||
" %%%%%% ******* //////// ))) ,,,, ... ++++ $$$$ ",
|
||||
" %%%% ******* /////////////// ))) ,,,, ...... ++++ $$$$ ",
|
||||
" %%%%% ****** ////////////////////// )))) ,,, ...... ++++ $$$$ ",
|
||||
" %%%%% ******* ////// ////////////// )))) ,,, ...... ++++ $$$$ ",
|
||||
" %%%% ******* /////// ///////// ))) ,,, .... +++++ $$$$ ",
|
||||
" %%%% ****** // ///// //// ))) ,,, .... ++++++ $$$$ ",
|
||||
" %%%% ****** / ////// ///// ))) ,,,, ..... 00000000000000000000000000000 +++++ $$$$ ",
|
||||
" %%%% ******* / ////// //// ))) ,,,, .... 000000000000000000000000000000000 ++++ ++ $$$$ ",
|
||||
" %%%% ***** ////// //// ,,, .... 00000000000000000000000000000 +++ $$$$ ",
|
||||
" %%%% ***** /////// //// ,,, ..... +++ $$$$ ",
|
||||
" %%%% *** /////// ///// ,,, ...... +++++ $$$$ ",
|
||||
" %%% * ///// //// ,,, ..... +++++ $$$$ ",
|
||||
" %%% ///// //// ,,, ... ++++++ $$$$ ",
|
||||
" %%% ///// //// ,,, ..... +++++ $$$$ ",
|
||||
" %%% ////// ///// .... +++++++ $$$$ ",
|
||||
" %%% //// //// ..... ++++++++++++++++ + +++ ++ ++++ + $$$$ ",
|
||||
" %%% //// /// .... +++++++++++++++++++++++++++++++++++++++++++++ $$$$ ",
|
||||
" %%% //// /// .... +++++++++++++++++++++++++++++++++++++++++++++ $$$$ ",
|
||||
" %%% ////// //// ..... +++++++++++++++++++++++++++++++++ + $$$$ ",
|
||||
" %%% //// //// .... +++ + + $$$$ ",
|
||||
" %%% ///// //// ..... + $$$$ ",
|
||||
" %%% / ///// /// ...... $$$$ ",
|
||||
" %%% ////// /// ..... . $$$$ ",
|
||||
" %%% ////// /// ...... $$$$ ",
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
"7",
|
||||
"16",
|
||||
"6",
|
||||
"12",
|
||||
"2",
|
||||
"10",
|
||||
"12",
|
||||
"13",
|
||||
"14",
|
||||
"11",
|
||||
|
|
@ -58,11 +58,11 @@
|
|||
" !!!!!!!!!!!!!!!! !!!! ! !!!!!!!!!!!!!!!!! !!!!!!!!!!!!! ",
|
||||
" ## !!!!!!!!!!!!! ! ## ! !!!!!!!!!!!!! !!!!!!!!!!! ",
|
||||
" ##### !!!!!!!!!!!!! !! # ##### # ! !!!!!!!!!!! !!!!!!! ",
|
||||
" ######## !!!!!!!!!!! !!! # ###### ## ! !!!!!!!!! !!! ### !!!!! ##$$$$$$ ",
|
||||
" ########## !!! !!!!!! ########### # ! !!!!! ! ######## !! ###$$$$$$ ",
|
||||
" ############## !!!! ! ############## # ! !! ! ######### # ### $$$$$$ ",
|
||||
" ################ ! ! # ############## ! !! # # ########## ####### $$$$$$ ",
|
||||
" ################### !! # #################### # ############ ####### $$$$$$ ",
|
||||
" ######## !!!!!!!!!!! !!! # ###### ## ! !!!!!!!!! !!! ### !!!!! $$$$$$ ",
|
||||
" ########## !!! !!!!!! ########### # ! !!!!! ! ######## !! $$$$$$ ",
|
||||
" ############## !!!! ! ############## # ! !! ! ######### # $$$$$$ ",
|
||||
" ################ ! ! # ############## ! !! # # ########## #### $$$$$$ ",
|
||||
" ################### !! # #################### # ############ ##### $$$$$$ ",
|
||||
" ##################### # ###################### ################ ####### $$$$$$$ ",
|
||||
" % ############ ########### # ####################### ################### ########## $$$$$$ ",
|
||||
" % ############ ########## ############ # ############# ##################### ########### $$$$$$$ ",
|
||||
|
|
@ -100,8 +100,8 @@
|
|||
" % %%%%%& &&&&&&&&& &&& & &&&&&&&&&& && & & &&&&&& & & $$$$$$ ",
|
||||
" %% %%%%%% &&&&& &&&& & & && &&& && '''''''''' $$$$$$$ $ ",
|
||||
" % %%%%%%% & & & & ''''''''''$$$$$$$$$ $ ",
|
||||
" % %%%%%%% &&& & '''''''''' $$$$$$$ $ ",
|
||||
" %%%%%%%%% '''''''''' $$$$$$$$$$ ",
|
||||
" % %%%%%%% &&& & ''''''''''''''''' $$$$$$$ $ ",
|
||||
" %%%%%%%%% ''''''''''''''''' $$$$$$$$$$ ",
|
||||
" %%%%%% '''''''''' $$$$$$$$ ",
|
||||
" %%%%%%%%% ''''''''''''''''''''''''''' $$$$$$$$$ ",
|
||||
" %%%%%% ( (( ''''''''''''''''''''''''''' $$$$$$$ ",
|
||||
|
|
@ -114,62 +114,62 @@
|
|||
" %%%%%%%%% ((((((((((((((((((((( ((((((((((((((((((((((( ( ((((((((((((((((((((((( ((((((((((((((( ((((((((( ((( $$$$$$$$$$ ",
|
||||
" %%%%%% (((((((((((((((((((((( ( (((((((((((( ((((((((( ( ( ((((((((((((( (((((((((( (((((((((( ( ( (((((((( ((( $$$$$$$ ",
|
||||
" %%%%%%%%% ((((((((((( (((((((( (((((((((((( (( ( (((((((( ( ((((((((((((((( ( ( ((((((((( ( ( ((((((((((( ( ( (((((((( (( ((( $$$$$$ ",
|
||||
" %%%%%% (((((((((( (((((((( ((((((((((( ( )) (((((((( (( ( (((((((((( ( (( ((((((((((((((( (((((((((((( (( (((((((( ((((((( $$$$$$$$$$ ",
|
||||
" %%%%%% ((((((((( ((((((( ( (((((((((( (( ((((()((((((((((( (((((((((((((( (( ( (((((((((( ((((((((((( ( ( ((((((((((((((((( $ $$$$$$ ",
|
||||
" %%%%%%%%% (((((( ((((((((( ((((((((((( ( ((* ) (((((((((((((((((((((( (( (( (((((((((((((((((((( ( (((((((((((((((( $$$$$$$$$$ ",
|
||||
" %%%%%% (((( (((((((((((((((((((( ( ** )) (((((((((((((((((( (( ( ((((((((((((((((( ((( ((((((((((((((((( $$$$$$$ $$$ ",
|
||||
" % %%%%%%%%% (( (((((((((((((((((((( (*** ))(((((((((((((((((((( (( (((((((((((((((((( + + ++ ((((((((((((((( $$$$$$ $ $ ",
|
||||
" % % %%%%%% (((((((((((((((((**((*** ))( ((((((((((((((( (( ((((((((((((((( (( + + + ++ + ++(++((+++((+++ $$$$$$$ $$ $ ",
|
||||
" %%% %%%%%% ((((((((((((( (****** )) ((( (((((((((((((( ( ( (((((((((((( + + + + + + + +((+(+((+(+ + $ $$$$$$$ ",
|
||||
" %%%%%%%%%% ((((((((((((*((*** ))))) ((((((((((( ( (((((((( ( ((++++++++++++++++++++++ +(+( + + + $$$$$$$$$ ",
|
||||
" %%%%%% (((((((((**(***** ))))))) ( ( (((( ( ( (((+++( +++++++++++++++++++++++++++++++++++++++ $$$$$$$ ",
|
||||
" %%%%%%%%% ((( ((*(******* )))))) ( ( ((,(( ( (( ( ++++++++++++++++++++++++++++++++++++++++++++++++ $$$$$$ ",
|
||||
" %%%%%% (( ********** )))))) ( ,,,,,,, ++++++++++++++++++++++++++++++++++++++++ + $$$$$$$$$$ ",
|
||||
" %%%%%% ((*********** )))))) ,,,,,,, ------------------------ ++++++++++++++++++++++++++++++++++++++++++ + $$$$$$$ ",
|
||||
" %%%%%%%%% *********** )))))) ,,,,,, ----------------------------- +++++++++++++++++++++++++++++++++++++++++++++ $ $$$$$$$$$ ",
|
||||
" %%%%%% ********** ))))))) ,,,,,, ----------------------------- + ++ + + +++++++++++++++++++++++++++ + $$$$$$$$ $ ",
|
||||
" %%%%%%%%% *********** ))))))) ,,,,,, ----------------------------- ++ +++ + + + + +++++++++++++ $$$$$$$ $ ",
|
||||
" %%%%%% *********** )))))) ,,,,,, ----------------------------- + + + + + +++++++++ $ $$$$$$$$$$ ",
|
||||
" %%%%%% ********** )))))) ,,,,,,, -----------------------------.... .. + ++ ++++++++ ++ $$$$$$$ ",
|
||||
" %%%%%%%%% *********** )))))) ,,,,,,, . . .-------------- . ... ++++++++++ $$$$$$$ ",
|
||||
" %%%%%% *********** )))))) ,,,,,,, ... . ... . . . . ................. + +++++++ $$$$$$$$$$ ",
|
||||
" %%%%%% ********** ))))))) ,,,,,, .. . ........................................ + +++++++ + $$$$$$ ",
|
||||
" %%%%%%%%% *********** ))))))) ,,,,,, ............................................. + +++++++ + $$$$$$$$$$ ",
|
||||
" %%%%%% *********** )))))) ,,,,,, ............................................ +++++++++ + $ $$$$$$ ",
|
||||
" %%%%%%%%% ********** )))))) ,,,,,, ............................................... ++++++++++ $ $$$$$$$$$ ",
|
||||
" % %%%%%%% *********** / // / )))))) ,,,,,,, .............................................. ++++++++ $$$$$$$ $ ",
|
||||
" % %%%%%%% *********** // / / / //// )))))) ,,,,,,, ............................................... ++++++++++ $$$$$$$ $ ",
|
||||
" % %%%%%%% ********** / / ///// / / // ))))))) ,,,,,, ............. . .. . ...... ... . . ++++++++ $$$$$$$$$ ",
|
||||
" %%%%%% *********** /////////////// /// ))))))) ,,,,,, ........ . .. . ++++++++ $$$$$$ ",
|
||||
" %%%%%%%%% ********** /// //////////////////// ))))))) ,,,,,, ... ....... . . . +++++++++ $$$$$$ $ ",
|
||||
" %%%%%% ********** // / //////////////////////// )))))) ,,,,,, . ......... . +++++++ $$$$$$$$$ $ ",
|
||||
" %%%%%% *********** ///////////////////////////// )))))) ,,,,,, ... ........ +++++++ $$$$$$$$$ ",
|
||||
" %%%%%%%%% ********** / //////////////////////////// )))))) ,,,,,,, ........ +++++++++ $$$$$$$ ",
|
||||
" %%%%%% ********** ///////////////////////////////)))))) ,,,,,,, ......... 00000000000000000000000000000 +++++++ $ $$$$$$$$$ ",
|
||||
" %%%%%%%%% *********** //////////// / / //////////////))))))),,,,,, ......... 00000000000000000000000000000 +++++++++ $ $$$$$$ ",
|
||||
" % %%%%%% ********** // /////////// / //// / /////////))))))),,,,,, ........ . 000000000000000000000000000000000000 +++++++++ $$$$$$ $ ",
|
||||
" %%%%%% ********** / //////////// // / / / /////////)))) ,,,,,, ....... 000000000000000000000000000000000000 ++++++ $$$$$$$$$$ ",
|
||||
" %%%%%%% ********** // //////////// //////// ,,,,,, .......... 00000000000000000000000000000 ++++++++++++ $ $$$$$$ ",
|
||||
" %%%%%%% ******* ////////////// ///////// ,,,,,,, ...... . 00000000000000000000000000000 +++++++ $ $$$$$$ ",
|
||||
" %%%%%%% ***** ///////// /////// /,,,,,,, ......... . 000000000000000000 +++++++++ $$$$$$$ ",
|
||||
" %%%%%%% **** //////////// /////////,,,,,,, ........ + + ++++++++ ++ $$$$$$$$$ ",
|
||||
" %%%%%%% * /////// / ////////,,,,,, ...... + + + + + + +++++++ + $ $$$$$$$ ",
|
||||
" %%%%%% / /////// / //////// ,,,, .......... +++ + + ++ + ++++++ + +++ ++++ + +++++++++ + $$$$$$$ $ ",
|
||||
" %%%%%% //////// //////// ...... . +++++++++++++++++++++++++++++ +++++++++++++++ $ $$$$$$$ $ ",
|
||||
" %%%%%%%%% ////// / //////// ...... . +++++++++++++++++++++++++++++++++++++++++++++++ $$$$$$$$$$ $ ",
|
||||
" % %%%%%% / ///////// / ///// .......... ++++++++++++++++++++++++++++++++++++++++++++++ ++ $ $$$$$$$$ ",
|
||||
" %%%%%%% / / /////// ////// ....... ++++++++++++++++++++++++++++++++++++++++++++++ $ $$$$$$ ",
|
||||
" %%%%%%%%% /// ////// ////// .......... ++++++++++++++++++++++++++++++++++++++++++++ + $$$$$$$$$ ",
|
||||
" % %%%%%% ////////// ////// . ....... . ++++++++++++++++++++++++++++++++++++++++++++ $$$$$$$$ $ ",
|
||||
" %% %%%%%% /////// / ////// . ....... . + + ++++ + + +++++++++++++++++ + ++ $$$$$$$$ ",
|
||||
" %%%%%%%% ///////// ////// . .......... ++ + + + + + + + ++ $$$$$$$ ",
|
||||
" %%%%%% ////// // /////// ........ . ++ +++ + ++++ + + ++ + $ $$$$$$ ",
|
||||
" %%%%%%%%%% / /////// /////// .......... . . . + + $$$$$$$ ",
|
||||
" %%%%%% (((((((((( (((((((( ((((((((((( ( (( (((((((( (( ( (((((((((( ( (( ((((((((((((((( (((((((((((( (( (((((((( ((((((( $$$$$$$$$$ ",
|
||||
" %%%%%% ((((((((( ((((((( ( (((((((((( (( ((((( ((((((((((( (((((((((((((( (( ( (((((((((( ((((((((((( ( ( ((((((((((((((((( $ $$$$$$ ",
|
||||
" %%%%%%%%% (((((( ((((((((( ((((((((((( ( (() (((((((((((((((((((((( (( (( (((((((((((((((((((( ( (((((((((((((((( $$$$$$$$$$ ",
|
||||
" %%%%%% (((( (((((((((((((((((((( ( )) (((((((((((((((((( (( ( ((((((((((((((((( ((( ((((((((((((((((( $$$$$$$ $$$ ",
|
||||
" % %%%%%%%%% (( (((((((((((((((((((( ())) (((((((((((((((((((( (( (((((((((((((((((( * * ** ((((((((((((((( $$$$$$ $ $ ",
|
||||
" % % %%%%%% ((((((((((((((((())(())) ( ((((((((((((((( (( ((((((((((((((( (( * * * ** * **(**((***((*** $$$$$$$ $$ $ ",
|
||||
" %%% %%%%%% ((((((((((((( ()))))) ((( (((((((((((((( ( ( (((((((((((( * * * * * * *((*(*((*(* * $ $$$$$$$ ",
|
||||
" %%%%%%%%%% (((((((((((()(())) +++++ ((((((((((( ( (((((((( ( ((********************** *(*( * * * $$$$$$$$$ ",
|
||||
" %%%%%% ((((((((())())))) +++++++ ( ( (((( ( ( (((( ( *************************************** $$$$$$$ ",
|
||||
" %%%%%%%%% ((( (()())))))) ++++++ ( ( ((,(( ( (( ( ((( ***************************************** $$$$$$ ",
|
||||
" %%%%%% (( )))))))))) ++++++ ( ,,,,,,, **************************************** * $$$$$$$$$$ ",
|
||||
" %%%%%% (())))))))))) ++++++ ,,,,,,, ------------------------ ****************************************** * $$$$$$$ ",
|
||||
" %%%%%%%%% ))))))))))) ++++++ ,,,,,, ----------------------------- ********************************************* $ $$$$$$$$$ ",
|
||||
" %%%%%% )))))))))) +++++++ ,,,,,, ----------------------------- * ** * * *************************** * $$$$$$$$ $ ",
|
||||
" %%%%%%%%% ))))))))))) +++++++ ,,,,,, ----------------------------- ** *** * * * * ************* $$$$$$$ $ ",
|
||||
" %%%%%% ))))))))))) ++++++ ,,,,,, ----------------------------- * * * * * ********* $ $$$$$$$$$$ ",
|
||||
" %%%%%% )))))))))) ++++++ ,,,,,,, -----------------------------.... .. * ** ******** ** $$$$$$$ ",
|
||||
" %%%%%%%%% ))))))))))) ++++++ ,,,,,,, . . .-------------- . ... ********** $$$$$$$ ",
|
||||
" %%%%%% ))))))))))) ++++++ ,,,,,,, ... . ... . . . . ................. * ******* $$$$$$$$$$ ",
|
||||
" %%%%%% )))))))))) +++++++ ,,,,,, .. . ........................................ * ******* * $$$$$$ ",
|
||||
" %%%%%%%%% ))))))))))) +++++++ ,,,,,, ............................................. * ******* * $$$$$$$$$$ ",
|
||||
" %%%%%% ))))))))))) ++++++ ,,,,,, ............................................ ********* * $ $$$$$$ ",
|
||||
" %%%%%%%%% )))))))))) ++++++ ,,,,,, ............................................... ********** $ $$$$$$$$$ ",
|
||||
" % %%%%%%% ))))))))))) / // / ++++++ ,,,,,,, .............................................. ******** $$$$$$$ $ ",
|
||||
" % %%%%%%% ))))))))))) // / / / //// ++++++ ,,,,,,, ............................................... ********** $$$$$$$ $ ",
|
||||
" % %%%%%%% )))))))))) / / ///// / / // +++++++ ,,,,,, ............. . .. . ...... ... . . ******** $$$$$$$$$ ",
|
||||
" %%%%%% ))))))))))) /////////////// /// +++++++ ,,,,,, ........ . .. . ******** $$$$$$ ",
|
||||
" %%%%%%%%% )))))))))) /// //////////////////// +++++++ ,,,,,, ... ....... . . . ********* $$$$$$ $ ",
|
||||
" %%%%%% )))))))))) // / //////////////////////// ++++++ ,,,,,, . ......... . ******* $$$$$$$$$ $ ",
|
||||
" %%%%%% ))))))))))) ///////////////////////////// ++++++ ,,,,,, ... ........ ******* $$$$$$$$$ ",
|
||||
" %%%%%%%%% )))))))))) / //////////////////////////// ++++++ ,,,,,,, ........ ********* $$$$$$$ ",
|
||||
" %%%%%% )))))))))) ///////////////////////////////++++++ ,,,,,,, ......... 00000000000000000000000000000 ******* $ $$$$$$$$$ ",
|
||||
" %%%%%%%%% ))))))))))) //////////// / / //////////////+++++++,,,,,, ......... 00000000000000000000000000000 ********* $ $$$$$$ ",
|
||||
" % %%%%%% )))))))))) // /////////// / //// / /////////+++++++,,,,,, ........ . 000000000000000000000000000000000000 ********* $$$$$$ $ ",
|
||||
" %%%%%% )))))))))) / //////////// // / / / /////////++++ ,,,,,, ....... 000000000000000000000000000000000000 ****** $$$$$$$$$$ ",
|
||||
" %%%%%%% )))))))))) // //////////// //////// ,,,,,, .......... 00000000000000000000000000000 ************ $ $$$$$$ ",
|
||||
" %%%%%%% ))))))) ////////////// ///////// ,,,,,,, ...... . 00000000000000000000000000000 ******* $ $$$$$$ ",
|
||||
" %%%%%%% ))))) ///////// /////// /,,,,,,, ......... . 000000000000000000 ********* $$$$$$$ ",
|
||||
" %%%%%%% )))) //////////// /////////,,,,,,, ........ * * ******** ** $$$$$$$$$ ",
|
||||
" %%%%%%% ) /////// / ////////,,,,,, ...... * * * * * * ******* * $ $$$$$$$ ",
|
||||
" %%%%%% / /////// / //////// ,,,, .......... *** * * ** * ****** * *** **** * ********* * $$$$$$$ $ ",
|
||||
" %%%%%% //////// //////// ...... . ***************************** *************** $ $$$$$$$ $ ",
|
||||
" %%%%%%%%% ////// / //////// ...... . *********************************************** $$$$$$$$$$ $ ",
|
||||
" % %%%%%% / ///////// / ///// .......... ********************************************** ** $ $$$$$$$$ ",
|
||||
" %%%%%%% / / /////// ////// ....... ********************************************** $ $$$$$$ ",
|
||||
" %%%%%%%%% /// ////// ////// .......... ******************************************** * $$$$$$$$$ ",
|
||||
" % %%%%%% ////////// ////// . ....... . ******************************************** $$$$$$$$ $ ",
|
||||
" %% %%%%%% /////// / ////// . ....... . * * **** * * ***************** * ** $$$$$$$$ ",
|
||||
" %%%%%%%% ///////// ////// . .......... ** * * * * * * * ** $$$$$$$ ",
|
||||
" %%%%%% ////// // /////// ........ . ** *** * **** * * ** * $ $$$$$$ ",
|
||||
" %%%%%%%%%% / /////// /////// .......... . . . * * $$$$$$$ ",
|
||||
" % %%%%%% ////////// ////// . .......... . .... ... ... ... .... $$$$$$ ",
|
||||
" %% %%%%%% /////// / ////// ........... .................................. $$$$$$$$ ",
|
||||
" %%%%%%%% ////////// ////// .. ............................................ $$$$$$$ ",
|
||||
" %%%%%% ///////// /////// ............................................. $$$$$$ ",
|
||||
" %%%%%% ///////// //////// . ........................................... $$$$$$$ ",
|
||||
" %%%%%% ///////// /////// ............................................. ..... $$$$$$ ",
|
||||
" %%%%%% ///////// //////// . .................................................. $$$$$$$ ",
|
||||
" %%%%%% //////////// //////// . ......................................... $ $$$$$$ ",
|
||||
" %%%%%% ///////// /////// .. ....................................... $$$$$$ ",
|
||||
" %%%%%% //////// / ////// .. .................................... $$$$$$ ",
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 310 B |
Binary file not shown.
|
After Width: | Height: | Size: 319 B |
Binary file not shown.
|
After Width: | Height: | Size: 593 B |
Binary file not shown.
|
After Width: | Height: | Size: 653 B |
25
tests/visual_tests/styles/marker-recenter-collide.xml
Normal file
25
tests/visual_tests/styles/marker-recenter-collide.xml
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE Map>
|
||||
<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
|
||||
|
||||
<Style name="point">
|
||||
<Rule>
|
||||
<TextSymbolizer face-name="DejaVu Sans Book" size="16" dx="[offset]" dy="[offset]">"I"</TextSymbolizer>
|
||||
<MarkersSymbolizer file="shape://arrow"/>
|
||||
<DebugSymbolizer/>
|
||||
</Rule>
|
||||
</Style>
|
||||
|
||||
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
|
||||
<StyleName>point</StyleName>
|
||||
<Datasource>
|
||||
<Parameter name="type">csv</Parameter>
|
||||
<Parameter name="inline">
|
||||
lat,lon,offset
|
||||
0,-0.35,10
|
||||
0,0.35,0
|
||||
</Parameter>
|
||||
</Datasource>
|
||||
</Layer>
|
||||
|
||||
</Map>
|
||||
|
|
@ -286,6 +286,7 @@ files = {
|
|||
'functional-expressions':{'sizes':[(256,256)], 'bbox':mapnik.Box2d(-10,-10,10,10)},
|
||||
'functional-expressions-length':{'sizes':[(512,512)], 'bbox':mapnik.Box2d(-15,-15,15,15)},
|
||||
'marker-collide':{'sizes':[(512,512)]},
|
||||
'marker-recenter-collide':{'sizes':[(256,128)], 'bbox':mapnik.Box2d(-1,-0.5,1,0.5)},
|
||||
'postgis-inline':{'sizes':[(512,512)]},
|
||||
'text-line-wrap':{'sizes':[(512,512)]},
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue