sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2501 from MapQuest/grid_markers_fix

Browse source 
Grid markers fix for issue #2500
This commit is contained in:
Dane Springmeyer 2014-10-06 12:30:19 -07:00
commit 8be50220e0
14 changed files with 457 additions and 351 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/mapnik/grid/grid_marker_helpers.hpp
View file

@ -192,17 +192,18 @@ struct vector_markers_rasterizer_dispatch_grid : mapnik::noncopyable
double opacity = get<double>(sym_,keys::opacity, feature_, vars_, 1.0); double opacity = get<double>(sym_,keys::opacity, feature_, vars_, 1.0);
bool allow_overlap = get<bool>(sym_, keys::allow_overlap, feature_, vars_, false); bool allow_overlap = get<bool>(sym_, keys::allow_overlap, feature_, vars_, false);
bool avoid_edges = get<bool>(sym_, keys::avoid_edges, 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 spacing = get<double>(sym_, keys::spacing, feature_, vars_, 100.0);
double max_error = get<double>(sym_, keys::max_error, feature_, vars_, 0.2); 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( markers_placement_finder<T, Detector> placement_finder(
placement_method, path, detector_, params); placement_method, path, detector_, params);
double x, y, angle = .0; double x, y, angle = .0;
while (placement_finder.get_point(x, y, angle, ignore_placement)) 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.rotate(angle);
matrix.translate(x, y); matrix.translate(x, y);
svg_renderer_.render_id(ras_, sl_, renb_, feature_.id(), matrix, opacity, bbox_); svg_renderer_.render_id(ras_, sl_, renb_, feature_.id(), matrix, opacity, bbox_);

203
tests/visual_tests/grids/functional-expressions-length-512-512-2.0-grid-reference.json
View file

@ -2,10 +2,7 @@
"keys": [ "keys": [
"", "",
"1", "1",
"5", "2"
"4",
"2",
"3"
], ],
"data": {}, "data": {},
"grid": [ "grid": [
@ -23,105 +20,105 @@
" !!!! ", " !!!! ",
" !!!! ", " !!!! ",
" !!!! ", " !!!! ",
" ######### !!!! ", " !!!! ",
" ######### !!!! ", " !!!! ",
" ########## !!!! $ $ ", " !!!! ",
" ########### !!!! $$$$$$ ", " !!!! ",
" ########### !!!! $$$$$$$$ ", " !!!! ",
" ########### !!!! $$$$$$$$ ", " !!!! ",
" ### ########### ## !!!! $$$$$$$$ ", " !!!! ",
" ######### !!!! $$$$$$ ", " !!!! ",
" # ###### !!!! $ $$ ", " !!!! ",
" # ##### !!!! $$$$$ ", " !!!! ",
" ####### !!!! $$$$ ", " !!!! ",
" ##### %%%% %%%%% !!!! $$$$$$$ ", " #### ##### !!!! ",
" ###### %%%%%%% %%%%%%%!!!! $$$$$$ ", " ####### #######!!!! ",
" ########## %%%%%%%%% %%%%%%%%%!!! ", " ######### #########!!! ",
" ########## %%%%%%%%%%% %%%%%%%%%%%% %%%%%%%%%%%!! ", " ########### ############ ###########!! ",
" ####### %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ############################################## ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ############################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ############################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ############################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ############################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ############################################# ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ############################################# ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ############################################## ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ################################################ ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ################################################ ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ################################################## ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " #################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " #################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " #################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ###################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " #################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " #################################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ############################################################################# ",
" %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%% ", " ### ################################################### #### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ############################################################### ",
" %%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%% ", " #### ################################################# #### ",
" %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% ", " ### ################################################ ### ",
" % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ", " # ############################################### # ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ############################################# ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ########################################### ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " ####################################### ",
" !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !#################################### ",
" %%%% !!!!%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " #### !!!!############################### ",
" %%%%% !!!! %%%%%%%%%%%%%%%%%%%%%%% ", " ##### !!!! ####################### ",
" %%%%% !!!! %%%%%%%%%%%%%%%%% ", " ##### !!!! ################# ",
" % %%%%!!!! %%%%%%%%%%%%%%%%%% ", " # ####!!!! ################## ",
" % %%%%%!! %%%%%%%%%%%%%%%%%%% ", " # #####!! ################### ",
" %% %%%%% %%%%%%%%%%%%%%%%%%%%% ", " ## ##### ##################### ",
" !%%%%% %%%%%%%%%%%%%%%%%%%%% ", " !##### ##################### ",
" !!%%%%%% %%%%%%%%%%%%%%%%%%%%%% ", " !!###### ###################### ",
" !!!!%%%%%%%%%%%%%%%%% %%%%% %%%%%%%%%% ", " !!!!################# ##### ########## ",
" !!!! %%%%%%%%%%%%%%%%% %%%%% %%%%%%%%%% ", " !!!! ################# ##### ########## ",
" !!!! %%%%%%%%%%%%%%%% %%%%% %%%%% %%%% ", " !!!! ################ ##### ##### #### ",
" !!!! %%%%%%%%%%%%%%% %%%%% %%%%% %%%% ", " !!!! ############### ##### ##### #### ",
" !!!! %%%%%%%%%%%%%% %%%%% %%%%% %%%% ", " !!!! ############## ##### ##### #### ",
" !!!! %%%%% %%%%% %%%%% %%%%% %%%% ", " !!!! ##### ##### ##### ##### #### ",
" !!!! %%%%% %%%%% %%%%% %%%% ", " !!!! ##### ##### ##### #### ",
" !!!! %%%%% %%%%% %%%%% %%%% ", " !!!! ##### ##### ##### #### ",
" !!!! %%%%% %%%%% %%%%% %%%% ", " !!!! ##### ##### ##### #### ",
" !!!! %%%%% %%%%% %%%%% %%%% ", " !!!! ##### ##### ##### #### ",
" !!!! %%%%% %%%%% %%%%% %%%% ", " !!!! ##### ##### ##### #### ",
" !!!! %%%%% %%%%% %%%%% %%%% ", " !!!! ##### ##### ##### #### ",
" !!!! %%%%%%%%%%%%%%%%%%%%%% ", " !!!! ###################### ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ############################## ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ##################################### ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ########################################## ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ############################################# ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ################################################ ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ################################################## ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ################################################### ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ################################################### ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ################################################### ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ################################################## ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ################################################# ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ############################################### ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ############################################ ",
" !!!! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ######################################## ",
" !!!! &&&&&&& %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ################################### ",
" !!!! &&&&&&& %%%%%%%%%%%%%%%%%%%%%%%%%%% ", " !!!! ########################### ",
" !!!! &&&&&&& %%%%%%%%%%%%%% ", " !!!! ############## ",
" !!!! &&&&&&& ", " !!!! ",
" !!!! &&&&&&&&&&& ", " !!!! ",
" !!!! &&&&&& ", " !!!! ",
" !!!! &&&&& ", " !!!! ",
" !!!! &&& ", " !!!! ",
" !!!! &&&&&& ", " !!!! ",
" !!!! &&&&&&& ", " !!!! ",
"!!!! &&& ", "!!!! ",
"!!! ", "!!! ",
"!! ", "!! ",
"! ", "! ",

42
tests/visual_tests/grids/marker-recenter-collide-256-128-1.0-grid-reference.json Normal file
View file

@ -0,0 +1,42 @@
{
"keys": [
"",
"1",
"2"
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" !! # ",
" !!!!!!! # ",
" ! # ",
" ",
" ! ",
" ! ",
" ! ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
]
}

42
tests/visual_tests/grids/marker-recenter-collide-256-128-2.0-grid-reference.json Normal file
View file

@ -0,0 +1,42 @@
{
"keys": [
"",
"1",
"2"
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ! # ",
" !!! # ",
" !!! # ",
" !!!!!!!!!!!!!! # ",
" !!! # ",
" !! # ",
" ! ",
" ",
" ! ",
" ! ",
" ! ",
" ! ",
" ! ",
" ! ",
" ",
" ",
" ",
" ",
" "
]
}

42
tests/visual_tests/grids/text-displacement-512-512-1.0-grid-reference.json
View file

@ -14,8 +14,8 @@
"1", "1",
"5", "5",
"12", "12",
"6",
"9", "9",
"6",
"11", "11",
"21", "21",
"8", "8",
@ -30,8 +30,8 @@
], ],
"data": {}, "data": {},
"grid": [ "grid": [
" !!!!!!!!!!!!## $$%%%%%%%%%%%% &&&&&&&&&&& ' ((((((((((((", " !!!!!!!!!!!!## $%%%%%%%%%%%% &&&&&&&&&&& ' ((((((((((((",
" ) ) ! ## ## $$ %% % & '' ", " ) ) ! ## ## $ %% % & '' ",
" )) ) ### $ %%%%%%% ' ", " )) ) ### $ %%%%%%% ' ",
" )) ) ### $ %%%%%%% & ", " )) ) ### $ %%%%%%% & ",
" )))) ) ### $ $ ** & & ", " )))) ) ### $ $ ** & & ",
@ -39,30 +39,30 @@
" ) ) ## $ $$ *** & ", " ) ) ## $ $$ *** & ",
" ) $$$$$$ *** ", " ) $$$$$$ *** ",
" ) + $ $$$$ **** & ", " ) + $ $$$$ **** & ",
")) +$ $ ** ** &&& & ", ")) +$ $ ** &&& & ",
")) + *** & & '''''''''' ", ")) + & & '''''''''' ",
", -- +++ ** & ", ", -- +++ & ",
", ----- ++++ .. * ", ", ----- ++++ .. ",
", --- ++++ .. ", ", --- ++++ .. ",
", -- +++ .. ", ", -- +++ .. ",
", -- +++ .. ", ", -- +++ .. ",
", -- +++ .. ", ", -- +++ .. ",
", -- +++ .. ", ", -- +++ .. ",
", --- ++++ .. ", ", --- ++++ .. ",
", / 00+ .. ", ", //+ .. ",
", / 0+ ", ", /+ ",
", // 00 0 1 1 2 2 ", ", 0 // / 1 1 2 2 ",
", // 0 000 11 1 2 ", ", 0 / /// 11 1 2 ",
" / 000 111 1 ", " 0 /// 111 1 ",
" 3 // 000 111 1 2 ", " 3 00 /// 111 1 2 ",
" 333 / // 0000 1111 1 2 2 ", " 333 0 00 //// 1111 1 2 2 ",
" 333 / /// 000 11 1 2 2 ", " 333 0 000 /// 11 1 2 2 ",
" 333 / /// 0 1 2 ", " 333 0 000 / 1 2 ",
" 3333 ///// 4444444 1 ", " 3333 00000 4444444 1 ",
" 333 3 / // 4444444 11 22 2 55 ", " 333 0 00 4444444 1 22 2 55 ",
" 3 33 6 / 4 1 22 2 77 5 ", " 3 6 0 4 1 22 2 77 5 ",
" 33 6 44 1 2 7 5 ", " 6 44 2 7 5 ",
" 33666666 1 2 5 ", " 6666666 2 5 ",
" 6666666 2 5 ", " 6666666 2 5 ",
" 6 66666 ", " 6 66666 ",
" ", " ",

236
tests/visual_tests/grids/text-displacement-512-512-2.0-grid-reference.json
View file

@ -10,7 +10,6 @@
"23", "23",
"25", "25",
"13", "13",
"5",
"16", "16",
"1", "1",
"12", "12",
@ -20,7 +19,6 @@
"21", "21",
"26", "26",
"8", "8",
"7",
"10", "10",
"24", "24",
"17", "17",
@ -30,133 +28,133 @@
], ],
"data": {}, "data": {},
"grid": [ "grid": [
" !!!!##############$$ $$$$$$$ %%%&&&&&&&&&&&&&&& ''''''''''' ( )))))))))))))))", " !!!!!! ##########$$ $$$$$$$ %%%&&&&&&&&&&&&&&& ''''''''''' ( )))))))))))))))",
" !!!!! ! ## $$$ $$$$$ %%% && ** ' ' ( )) ", " !!!!! ! $$$ $$$$$ %%% && ** ' ' ( )) ",
"!!!!!! ! # $$$ $$$$$$ %%%%% ** ' (((( ", "!!!!!! ! $$$ $$$$$$ %%%%% ** ' (((( ",
"!!!!! ! $$$ $$$$$$ %%%%%% *** ** ' ((( ", "!!!!! ! $$$ $$$$$$ %%%%%% *** ** ' ((( ",
"!!!! ! $$ $$$$$$$ % %%%% **** ** ' ' (( ", "!!!! ! $$ $$$$$$$ % %%%% **** ** ' ' (( ",
"!!! ! $$ $$$$$$$ % %%%% ***** ** ' ' ( ", "!!! ! $$ $$$$$$$ % %%%% ***** ** ' ' ( ",
"!! ! $$ ++$$ , % %%%%%% ****** ** '' ' ( ", "!! ! $$ $$$$ + % %%%%%% ****** ** '' ' ( ",
"!!!! $$ ++$ , % %%%%% ***** *** ''' ' ( ", "!!!! $$ $$$ + % %%%%% ***** *** ''' ' ( ",
"!!!! $$++ , % %%%%%% ***** *** ''''' ( ", "!!!! $$ + % %%%%%% ***** *** ''''' ( ",
" !!! $++ ,% %%%%%%% ****** *** ' ' ' ( ", " !!! $$ +% %%%%%%% ****** *** ' ' ' ( ",
"! ! ++ , %%%%%%% ******* ** ' ' ((((((((((( ", "! ! $ + %%%%%%% ******* ** ' ' ((((((((((( ",
"- ++ , %%%%%%% ******* ** '' ", ", + %%%%%%% ******* ** '' ",
"- ++++ ,,,,,%%%%% **** ** '' ", ", +++++%%%%% **** ** '' ",
"- +++ ,,, %%% *** ** ' ", ", +++ %%% *** ** ' ",
"- ++ ,, % * ' ", ", ++ % * ' ",
"- , ' ", ", + ' ",
"- , .. ", ", + -- ",
"-- // 0 , 00 11 .. ", ",, .. / + // 00 -- ",
"-- // 00 , 0000 111 .... ", ",, .. // + //// 000 ---- ",
"- // 00, 00000 11111 .. ", ", .. //+ ///// 00000 -- ",
"- / // 0, 000000 111111 .. 22222222222 3333333333", ", . .. /+ ////// 000000 -- 11111111111 2222222222",
"44 /// 000 00000 111111 .. 2 2 3 ", "33 ... /// ///// 000000 -- 1 1 2 ",
"-44 /// 0000000000 111111 1.. 2 2 3 ", ",33 ... ////////// 000000 0-- 1 1 2 ",
"4 44 ///// 0000 000000 111111 1 .. 2 3 ", "3 33 ..... //// ////// 000000 0 -- 1 2 ",
"44 44 / /// 00 00000 1111111 1 .. 2 3 ", "33 33 . ... // ///// 0000000 0 -- 1 2 ",
"44 44 / //// 00 00000000 1111111 1 .. 2 2 3 ", "33 33 . .... // //////// 0000000 0 -- 1 1 2 ",
"444 44 / ////// 00 000000 111111 1 2 2 3 ", "333 33 . ...... // ////// 000000 0 1 1 2 ",
"444 44 / ////// 00 0000 111 1 22 2 33 ", "333 33 . ...... // //// 000 0 11 1 22 ",
"44444 4444 / ////// 00 00 11111 2222 3333 ", "33333 3333 . ...... // // 00000 1111 2222 ",
"44444 444 5 / ////// 00 6 111 222 2 77 3 333 ", "33333 333 . ...... // 4 000 111 1 55 2 222 ",
" 4444 444 5555555555//// 666666666 1111 2 2 777777777 3 ", " 3333 333 . ...... 444444444 0000 1 1 555555555 2 ",
" 44444444 44 5555555555//// 666666666 11 1 2 777777777 3 ", " 33333333 33 ....... 444444444 00 0 1 555555555 2 ",
" 444444 44 5 ////// 66 11 2 77 3 ", " 333333 33 ...... 44 00 1 55 2 ",
" 4444 44 /// 11 2 3 ", " 3333 33 ... 00 1 2 ",
" 44 4 // 1 22 3 ", " 33 3 .. 0 11 2 ",
" 2 3 ", " 1 2 ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" 888888888888 ", " 666666666666 ",
" 8 88 ", " 6 66 ",
" 8 88 ", " 6 66 ",
" 8 88 ", " 6 66 ",
" 8 88 ", " 6 66 ",
" 8 88 ", " 6 66 ",
" 8 8 ", " 6 6 ",
" 8 8 ", " 6 6 ",
" 8 8 ", " 6 6 ",
" 8 8 ", " 6 6 ",
" 8 8 ", " 6 6 ",
" 8 8 ", " 6 6 ",
" 88 8 ", " 66 6 ",
"8888 8 ", "6666 6 ",
" 888 8 ", " 666 6 ",
"888 8 ", "666 6 ",
"8 ", "6 ",
" ", " ",
" ", " ",
" ", " ",
"9 ", "7 ",
"999 9 ", "777 7 ",
" 999 9 ", " 777 7 ",
"9999 9 ", "7777 7 ",
" 99 9 ", " 77 7 ",
" 99 9 ", " 77 7 ",
" 99 9 ", " 77 7 ",
" 99 9 ", " 77 7 ",
" 99 9 ", " 77 7 ",
" 99 9 ", " 77 7 ",
" 99 9 ", " 77 7 ",
" 9 9 ", " 7 7 ",
" 9 9 ", " 7 7 ",
" 9 : ;; 9 ", " 7 8 99 7 ",
" 9 : ;; 9 ", " 7 8 99 7 ",
" 9 : ;; 9 ", " 7 8 99 7 ",
" : :999999999;; ; ", " 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 "
] ]
} }

86
tests/visual_tests/grids/text-vertical-alignment-800-800-1.0-grid-reference.json
View file

@ -10,8 +10,8 @@
"6", "6",
"12", "12",
"2", "2",
"13",
"10", "10",
"13",
"14", "14",
"11", "11",
"3", "3",
@ -120,48 +120,48 @@
" %%%%% (( ((((( (((((( ((((( (((((((( (((((((((((((( ((((((((((((( $$$$$$ ", " %%%%% (( ((((( (((((( ((((( (((((((( (((((((((((((( ((((((((((((( $$$$$$ ",
" %%%% (((((( (((((( ) ( ((((((((((((( (((((((((((( ((((((((( $$$$ ", " %%%% (((((( (((((( ) ( ((((((((((((( (((((((((((( ((((((((( $$$$ ",
" %%% ((((((((((( * ) ((((((((((((( (((((((( (((((( $$$$ ", " %%% ((((((((((( * ) ((((((((((((( (((((((( (((((( $$$$ ",
" % %%% (((((((( **** ) (((((((((+( ((( $$$$$ ", " % %%% (((((((( **** ) ((((((((( ( ((( $$$$$ ",
" %%%%%% (((( ***** ))) ((( (+( $$$$$ ", " %%%%%% (((( ***** ))) ((( ( ( $$$$$ ",
" %%%%% ***** ))) (( (+ ,,,,,,,,,,,, , , $$$$$ ", " %%%%% ***** ))) (( ( ++++++++++++ + + $$$$$ ",
" %%%% ****** ))) + ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, ,,, $$$$ ", " %%%% ****** ))) +++++++++++++++++++++++++++++++++++++ +++ $$$$ ",
" %%%% ******* )))) +++ ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, , $$$$$ ", " %%%% ******* )))) ,,, ++++++++++++++++++++++++++++++++++++++ + $$$$$ ",
" %%%% ****** )))) +++ ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, , $$$$$ ", " %%%% ****** )))) ,,, +++++++++++++++++++++++++++++++++ + $$$$$ ",
" %%%%% ****** ))) +++ ------ ,,,,,,,,,,,,,,,,, $$$$$ ", " %%%%% ****** ))) ,,, ------ +++++++++++++++++ $$$$$ ",
" %%%% ******* ))) ++++ --------------------------------- ,,,,,,,,, $$$$$ ", " %%%% ******* ))) ,,,, --------------------------------- +++++++++ $$$$$ ",
" %%%% ****** ))) ++++ ----------------------------- ,,,,,,,, $$$$$ ", " %%%% ****** ))) ,,,, ----------------------------- ++++++++ $$$$$ ",
" %%%%% ******* ))) +++ ----------------------------- ,,,,, , $$$$$$ ", " %%%%% ******* ))) ,,, ----------------------------- +++++ + $$$$$$ ",
" %%%%% ****** )))) +++ ,,,,, $$$$ ", " %%%%% ****** )))) ,,, +++++ $$$$ ",
" %%%%% ****** )))) +++ ,,,,,, $$$$ ", " %%%%% ****** )))) ,,, ++++++ $$$$ ",
" %%%% ******* ))) +++ ,,,,, $$$$$ ", " %%%% ******* ))) ,,, +++++ $$$$$ ",
" %%%% ******* ))) +++ .. . ,,,, $$$$ ", " %%%% ******* ))) ,,, .. . ++++ $$$$ ",
" %%%%% ****** ))) ++++ . . . ................................. ,,,, $$$$$ ", " %%%%% ****** ))) ,,,, . . . ................................. ++++ $$$$$ ",
" %%%% ******* ))) ++++ ............................................ ,,,, $$$$$ ", " %%%% ******* ))) ,,,, ............................................ ++++ $$$$$ ",
" %%%% ******** )))) +++ ........................................... ,,,, $$$$$$ ", " %%%% ******** )))) ,,, ........................................... ++++ $$$$$$ ",
" %%%% ***** )))) +++ ................. ,,,,, $$$$ ", " %%%% ***** )))) ,,, ................. +++++ $$$$ ",
" %%%% ******* ))) +++ ...... . .. . ,,,, $$$$$ ", " %%%% ******* ))) ,,, ...... . .. . ++++ $$$$$ ",
" %%%%% * ****** ))) +++ ....... . ,,,, $$$$ ", " %%%%% * ****** ))) ,,, ....... . ++++ $$$$ ",
" %%%%% ***** ))) ++++ ...... ,,,, $$$$ ", " %%%%% ***** ))) ,,,, ...... ++++ $$$$ ",
" %%%%%% ******* //////// ))) ++++ ... ,,,, $$$$ ", " %%%%%% ******* //////// ))) ,,,, ... ++++ $$$$ ",
" %%%% ******* /////////////// ))) ++++ ...... ,,,, $$$$ ", " %%%% ******* /////////////// ))) ,,,, ...... ++++ $$$$ ",
" %%%%% ****** ////////////////////// )))) +++ ...... ,,,, $$$$ ", " %%%%% ****** ////////////////////// )))) ,,, ...... ++++ $$$$ ",
" %%%%% ******* ////// ////////////// )))) +++ ...... ,,,, $$$$ ", " %%%%% ******* ////// ////////////// )))) ,,, ...... ++++ $$$$ ",
" %%%% ******* /////// ///////// ))) +++ .... ,,,,, $$$$ ", " %%%% ******* /////// ///////// ))) ,,, .... +++++ $$$$ ",
" %%%% ****** // ///// //// ))) +++ .... ,,,,,, $$$$ ", " %%%% ****** // ///// //// ))) ,,, .... ++++++ $$$$ ",
" %%%% ****** / ////// ///// ))) ++++ ..... 00000000000000000000000000000 ,,,,, $$$$ ", " %%%% ****** / ////// ///// ))) ,,,, ..... 00000000000000000000000000000 +++++ $$$$ ",
" %%%% ******* / ////// //// ))) ++++ .... 000000000000000000000000000000000 ,,,, ,, $$$$ ", " %%%% ******* / ////// //// ))) ,,,, .... 000000000000000000000000000000000 ++++ ++ $$$$ ",
" %%%% ***** ////// //// +++ .... 00000000000000000000000000000 ,,, $$$$ ", " %%%% ***** ////// //// ,,, .... 00000000000000000000000000000 +++ $$$$ ",
" %%%% ***** /////// //// +++ ..... ,,, $$$$ ", " %%%% ***** /////// //// ,,, ..... +++ $$$$ ",
" %%%% *** /////// ///// +++ ...... ,,,,, $$$$ ", " %%%% *** /////// ///// ,,, ...... +++++ $$$$ ",
" %%% * ///// //// +++ ..... ,,,,, $$$$ ", " %%% * ///// //// ,,, ..... +++++ $$$$ ",
" %%% ///// //// +++ ... ,,,,,, $$$$ ", " %%% ///// //// ,,, ... ++++++ $$$$ ",
" %%% ///// //// +++ ..... ,,,,, $$$$ ", " %%% ///// //// ,,, ..... +++++ $$$$ ",
" %%% ////// ///// .... ,,,,,,, $$$$ ", " %%% ////// ///// .... +++++++ $$$$ ",
" %%% //// //// ..... ,,,,,,,,,,,,,,,, , ,,, ,, ,,,, , $$$$ ", " %%% //// //// ..... ++++++++++++++++ + +++ ++ ++++ + $$$$ ",
" %%% //// /// .... ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, $$$$ ", " %%% //// /// .... +++++++++++++++++++++++++++++++++++++++++++++ $$$$ ",
" %%% //// /// .... ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, $$$$ ", " %%% //// /// .... +++++++++++++++++++++++++++++++++++++++++++++ $$$$ ",
" %%% ////// //// ..... ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, , $$$$ ", " %%% ////// //// ..... +++++++++++++++++++++++++++++++++ + $$$$ ",
" %%% //// //// .... ,,, , , $$$$ ", " %%% //// //// .... +++ + + $$$$ ",
" %%% ///// //// ..... , $$$$ ", " %%% ///// //// ..... + $$$$ ",
" %%% / ///// /// ...... $$$$ ", " %%% / ///// /// ...... $$$$ ",
" %%% ////// /// ..... . $$$$ ", " %%% ////// /// ..... . $$$$ ",
" %%% ////// /// ...... $$$$ ", " %%% ////// /// ...... $$$$ ",

122
tests/visual_tests/grids/text-vertical-alignment-800-800-2.0-grid-reference.json
View file

@ -8,9 +8,9 @@
"7", "7",
"16", "16",
"6", "6",
"12",
"2", "2",
"10", "10",
"12",
"13", "13",
"14", "14",
"11", "11",
@ -58,11 +58,11 @@
" !!!!!!!!!!!!!!!! !!!! ! !!!!!!!!!!!!!!!!! !!!!!!!!!!!!! ", " !!!!!!!!!!!!!!!! !!!! ! !!!!!!!!!!!!!!!!! !!!!!!!!!!!!! ",
" ## !!!!!!!!!!!!! ! ## ! !!!!!!!!!!!!! !!!!!!!!!!! ", " ## !!!!!!!!!!!!! ! ## ! !!!!!!!!!!!!! !!!!!!!!!!! ",
" ##### !!!!!!!!!!!!! !! # ##### # ! !!!!!!!!!!! !!!!!!! ", " ##### !!!!!!!!!!!!! !! # ##### # ! !!!!!!!!!!! !!!!!!! ",
" ######## !!!!!!!!!!! !!! # ###### ## ! !!!!!!!!! !!! ### !!!!! ##$$$$$$ ", " ######## !!!!!!!!!!! !!! # ###### ## ! !!!!!!!!! !!! ### !!!!! $$$$$$ ",
" ########## !!! !!!!!! ########### # ! !!!!! ! ######## !! ###$$$$$$ ", " ########## !!! !!!!!! ########### # ! !!!!! ! ######## !! $$$$$$ ",
" ############## !!!! ! ############## # ! !! ! ######### # ### $$$$$$ ", " ############## !!!! ! ############## # ! !! ! ######### # $$$$$$ ",
" ################ ! ! # ############## ! !! # # ########## ####### $$$$$$ ", " ################ ! ! # ############## ! !! # # ########## #### $$$$$$ ",
" ################### !! # #################### # ############ ####### $$$$$$ ", " ################### !! # #################### # ############ ##### $$$$$$ ",
" ##################### # ###################### ################ ####### $$$$$$$ ", " ##################### # ###################### ################ ####### $$$$$$$ ",
" % ############ ########### # ####################### ################### ########## $$$$$$ ", " % ############ ########### # ####################### ################### ########## $$$$$$ ",
" % ############ ########## ############ # ############# ##################### ########### $$$$$$$ ", " % ############ ########## ############ # ############# ##################### ########### $$$$$$$ ",
@ -100,8 +100,8 @@
" % %%%%%& &&&&&&&&& &&& & &&&&&&&&&& && & & &&&&&& & & $$$$$$ ", " % %%%%%& &&&&&&&&& &&& & &&&&&&&&&& && & & &&&&&& & & $$$$$$ ",
" %% %%%%%% &&&&& &&&& & & && &&& && '''''''''' $$$$$$$ $ ", " %% %%%%%% &&&&& &&&& & & && &&& && '''''''''' $$$$$$$ $ ",
" % %%%%%%% & & & & ''''''''''$$$$$$$$$ $ ", " % %%%%%%% & & & & ''''''''''$$$$$$$$$ $ ",
" % %%%%%%% &&& & '''''''''' $$$$$$$ $ ", " % %%%%%%% &&& & ''''''''''''''''' $$$$$$$ $ ",
" %%%%%%%%% '''''''''' $$$$$$$$$$ ", " %%%%%%%%% ''''''''''''''''' $$$$$$$$$$ ",
" %%%%%% '''''''''' $$$$$$$$ ", " %%%%%% '''''''''' $$$$$$$$ ",
" %%%%%%%%% ''''''''''''''''''''''''''' $$$$$$$$$ ", " %%%%%%%%% ''''''''''''''''''''''''''' $$$$$$$$$ ",
" %%%%%% ( (( ''''''''''''''''''''''''''' $$$$$$$ ", " %%%%%% ( (( ''''''''''''''''''''''''''' $$$$$$$ ",
@ -114,62 +114,62 @@
" %%%%%%%%% ((((((((((((((((((((( ((((((((((((((((((((((( ( ((((((((((((((((((((((( ((((((((((((((( ((((((((( ((( $$$$$$$$$$ ", " %%%%%%%%% ((((((((((((((((((((( ((((((((((((((((((((((( ( ((((((((((((((((((((((( ((((((((((((((( ((((((((( ((( $$$$$$$$$$ ",
" %%%%%% (((((((((((((((((((((( ( (((((((((((( ((((((((( ( ( ((((((((((((( (((((((((( (((((((((( ( ( (((((((( ((( $$$$$$$ ", " %%%%%% (((((((((((((((((((((( ( (((((((((((( ((((((((( ( ( ((((((((((((( (((((((((( (((((((((( ( ( (((((((( ((( $$$$$$$ ",
" %%%%%%%%% ((((((((((( (((((((( (((((((((((( (( ( (((((((( ( ((((((((((((((( ( ( ((((((((( ( ( ((((((((((( ( ( (((((((( (( ((( $$$$$$ ", " %%%%%%%%% ((((((((((( (((((((( (((((((((((( (( ( (((((((( ( ((((((((((((((( ( ( ((((((((( ( ( ((((((((((( ( ( (((((((( (( ((( $$$$$$ ",
" %%%%%% (((((((((( (((((((( ((((((((((( ( )) (((((((( (( ( (((((((((( ( (( ((((((((((((((( (((((((((((( (( (((((((( ((((((( $$$$$$$$$$ ", " %%%%%% (((((((((( (((((((( ((((((((((( ( (( (((((((( (( ( (((((((((( ( (( ((((((((((((((( (((((((((((( (( (((((((( ((((((( $$$$$$$$$$ ",
" %%%%%% ((((((((( ((((((( ( (((((((((( (( ((((()((((((((((( (((((((((((((( (( ( (((((((((( ((((((((((( ( ( ((((((((((((((((( $ $$$$$$ ", " %%%%%% ((((((((( ((((((( ( (((((((((( (( ((((( ((((((((((( (((((((((((((( (( ( (((((((((( ((((((((((( ( ( ((((((((((((((((( $ $$$$$$ ",
" %%%%%%%%% (((((( ((((((((( ((((((((((( ( ((* ) (((((((((((((((((((((( (( (( (((((((((((((((((((( ( (((((((((((((((( $$$$$$$$$$ ", " %%%%%%%%% (((((( ((((((((( ((((((((((( ( (() (((((((((((((((((((((( (( (( (((((((((((((((((((( ( (((((((((((((((( $$$$$$$$$$ ",
" %%%%%% (((( (((((((((((((((((((( ( ** )) (((((((((((((((((( (( ( ((((((((((((((((( ((( ((((((((((((((((( $$$$$$$ $$$ ", " %%%%%% (((( (((((((((((((((((((( ( )) (((((((((((((((((( (( ( ((((((((((((((((( ((( ((((((((((((((((( $$$$$$$ $$$ ",
" % %%%%%%%%% (( (((((((((((((((((((( (*** ))(((((((((((((((((((( (( (((((((((((((((((( + + ++ ((((((((((((((( $$$$$$ $ $ ", " % %%%%%%%%% (( (((((((((((((((((((( ())) (((((((((((((((((((( (( (((((((((((((((((( * * ** ((((((((((((((( $$$$$$ $ $ ",
" % % %%%%%% (((((((((((((((((**((*** ))( ((((((((((((((( (( ((((((((((((((( (( + + + ++ + ++(++((+++((+++ $$$$$$$ $$ $ ", " % % %%%%%% ((((((((((((((((())(())) ( ((((((((((((((( (( ((((((((((((((( (( * * * ** * **(**((***((*** $$$$$$$ $$ $ ",
" %%% %%%%%% ((((((((((((( (****** )) ((( (((((((((((((( ( ( (((((((((((( + + + + + + + +((+(+((+(+ + $ $$$$$$$ ", " %%% %%%%%% ((((((((((((( ()))))) ((( (((((((((((((( ( ( (((((((((((( * * * * * * *((*(*((*(* * $ $$$$$$$ ",
" %%%%%%%%%% ((((((((((((*((*** ))))) ((((((((((( ( (((((((( ( ((++++++++++++++++++++++ +(+( + + + $$$$$$$$$ ", " %%%%%%%%%% (((((((((((()(())) +++++ ((((((((((( ( (((((((( ( ((********************** *(*( * * * $$$$$$$$$ ",
" %%%%%% (((((((((**(***** ))))))) ( ( (((( ( ( (((+++( +++++++++++++++++++++++++++++++++++++++ $$$$$$$ ", " %%%%%% ((((((((())())))) +++++++ ( ( (((( ( ( (((( ( *************************************** $$$$$$$ ",
" %%%%%%%%% ((( ((*(******* )))))) ( ( ((,(( ( (( ( ++++++++++++++++++++++++++++++++++++++++++++++++ $$$$$$ ", " %%%%%%%%% ((( (()())))))) ++++++ ( ( ((,(( ( (( ( ((( ***************************************** $$$$$$ ",
" %%%%%% (( ********** )))))) ( ,,,,,,, ++++++++++++++++++++++++++++++++++++++++ + $$$$$$$$$$ ", " %%%%%% (( )))))))))) ++++++ ( ,,,,,,, **************************************** * $$$$$$$$$$ ",
" %%%%%% ((*********** )))))) ,,,,,,, ------------------------ ++++++++++++++++++++++++++++++++++++++++++ + $$$$$$$ ", " %%%%%% (())))))))))) ++++++ ,,,,,,, ------------------------ ****************************************** * $$$$$$$ ",
" %%%%%%%%% *********** )))))) ,,,,,, ----------------------------- +++++++++++++++++++++++++++++++++++++++++++++ $ $$$$$$$$$ ", " %%%%%%%%% ))))))))))) ++++++ ,,,,,, ----------------------------- ********************************************* $ $$$$$$$$$ ",
" %%%%%% ********** ))))))) ,,,,,, ----------------------------- + ++ + + +++++++++++++++++++++++++++ + $$$$$$$$ $ ", " %%%%%% )))))))))) +++++++ ,,,,,, ----------------------------- * ** * * *************************** * $$$$$$$$ $ ",
" %%%%%%%%% *********** ))))))) ,,,,,, ----------------------------- ++ +++ + + + + +++++++++++++ $$$$$$$ $ ", " %%%%%%%%% ))))))))))) +++++++ ,,,,,, ----------------------------- ** *** * * * * ************* $$$$$$$ $ ",
" %%%%%% *********** )))))) ,,,,,, ----------------------------- + + + + + +++++++++ $ $$$$$$$$$$ ", " %%%%%% ))))))))))) ++++++ ,,,,,, ----------------------------- * * * * * ********* $ $$$$$$$$$$ ",
" %%%%%% ********** )))))) ,,,,,,, -----------------------------.... .. + ++ ++++++++ ++ $$$$$$$ ", " %%%%%% )))))))))) ++++++ ,,,,,,, -----------------------------.... .. * ** ******** ** $$$$$$$ ",
" %%%%%%%%% *********** )))))) ,,,,,,, . . .-------------- . ... ++++++++++ $$$$$$$ ", " %%%%%%%%% ))))))))))) ++++++ ,,,,,,, . . .-------------- . ... ********** $$$$$$$ ",
" %%%%%% *********** )))))) ,,,,,,, ... . ... . . . . ................. + +++++++ $$$$$$$$$$ ", " %%%%%% ))))))))))) ++++++ ,,,,,,, ... . ... . . . . ................. * ******* $$$$$$$$$$ ",
" %%%%%% ********** ))))))) ,,,,,, .. . ........................................ + +++++++ + $$$$$$ ", " %%%%%% )))))))))) +++++++ ,,,,,, .. . ........................................ * ******* * $$$$$$ ",
" %%%%%%%%% *********** ))))))) ,,,,,, ............................................. + +++++++ + $$$$$$$$$$ ", " %%%%%%%%% ))))))))))) +++++++ ,,,,,, ............................................. * ******* * $$$$$$$$$$ ",
" %%%%%% *********** )))))) ,,,,,, ............................................ +++++++++ + $ $$$$$$ ", " %%%%%% ))))))))))) ++++++ ,,,,,, ............................................ ********* * $ $$$$$$ ",
" %%%%%%%%% ********** )))))) ,,,,,, ............................................... ++++++++++ $ $$$$$$$$$ ", " %%%%%%%%% )))))))))) ++++++ ,,,,,, ............................................... ********** $ $$$$$$$$$ ",
" % %%%%%%% *********** / // / )))))) ,,,,,,, .............................................. ++++++++ $$$$$$$ $ ", " % %%%%%%% ))))))))))) / // / ++++++ ,,,,,,, .............................................. ******** $$$$$$$ $ ",
" % %%%%%%% *********** // / / / //// )))))) ,,,,,,, ............................................... ++++++++++ $$$$$$$ $ ", " % %%%%%%% ))))))))))) // / / / //// ++++++ ,,,,,,, ............................................... ********** $$$$$$$ $ ",
" % %%%%%%% ********** / / ///// / / // ))))))) ,,,,,, ............. . .. . ...... ... . . ++++++++ $$$$$$$$$ ", " % %%%%%%% )))))))))) / / ///// / / // +++++++ ,,,,,, ............. . .. . ...... ... . . ******** $$$$$$$$$ ",
" %%%%%% *********** /////////////// /// ))))))) ,,,,,, ........ . .. . ++++++++ $$$$$$ ", " %%%%%% ))))))))))) /////////////// /// +++++++ ,,,,,, ........ . .. . ******** $$$$$$ ",
" %%%%%%%%% ********** /// //////////////////// ))))))) ,,,,,, ... ....... . . . +++++++++ $$$$$$ $ ", " %%%%%%%%% )))))))))) /// //////////////////// +++++++ ,,,,,, ... ....... . . . ********* $$$$$$ $ ",
" %%%%%% ********** // / //////////////////////// )))))) ,,,,,, . ......... . +++++++ $$$$$$$$$ $ ", " %%%%%% )))))))))) // / //////////////////////// ++++++ ,,,,,, . ......... . ******* $$$$$$$$$ $ ",
" %%%%%% *********** ///////////////////////////// )))))) ,,,,,, ... ........ +++++++ $$$$$$$$$ ", " %%%%%% ))))))))))) ///////////////////////////// ++++++ ,,,,,, ... ........ ******* $$$$$$$$$ ",
" %%%%%%%%% ********** / //////////////////////////// )))))) ,,,,,,, ........ +++++++++ $$$$$$$ ", " %%%%%%%%% )))))))))) / //////////////////////////// ++++++ ,,,,,,, ........ ********* $$$$$$$ ",
" %%%%%% ********** ///////////////////////////////)))))) ,,,,,,, ......... 00000000000000000000000000000 +++++++ $ $$$$$$$$$ ", " %%%%%% )))))))))) ///////////////////////////////++++++ ,,,,,,, ......... 00000000000000000000000000000 ******* $ $$$$$$$$$ ",
" %%%%%%%%% *********** //////////// / / //////////////))))))),,,,,, ......... 00000000000000000000000000000 +++++++++ $ $$$$$$ ", " %%%%%%%%% ))))))))))) //////////// / / //////////////+++++++,,,,,, ......... 00000000000000000000000000000 ********* $ $$$$$$ ",
" % %%%%%% ********** // /////////// / //// / /////////))))))),,,,,, ........ . 000000000000000000000000000000000000 +++++++++ $$$$$$ $ ", " % %%%%%% )))))))))) // /////////// / //// / /////////+++++++,,,,,, ........ . 000000000000000000000000000000000000 ********* $$$$$$ $ ",
" %%%%%% ********** / //////////// // / / / /////////)))) ,,,,,, ....... 000000000000000000000000000000000000 ++++++ $$$$$$$$$$ ", " %%%%%% )))))))))) / //////////// // / / / /////////++++ ,,,,,, ....... 000000000000000000000000000000000000 ****** $$$$$$$$$$ ",
" %%%%%%% ********** // //////////// //////// ,,,,,, .......... 00000000000000000000000000000 ++++++++++++ $ $$$$$$ ", " %%%%%%% )))))))))) // //////////// //////// ,,,,,, .......... 00000000000000000000000000000 ************ $ $$$$$$ ",
" %%%%%%% ******* ////////////// ///////// ,,,,,,, ...... . 00000000000000000000000000000 +++++++ $ $$$$$$ ", " %%%%%%% ))))))) ////////////// ///////// ,,,,,,, ...... . 00000000000000000000000000000 ******* $ $$$$$$ ",
" %%%%%%% ***** ///////// /////// /,,,,,,, ......... . 000000000000000000 +++++++++ $$$$$$$ ", " %%%%%%% ))))) ///////// /////// /,,,,,,, ......... . 000000000000000000 ********* $$$$$$$ ",
" %%%%%%% **** //////////// /////////,,,,,,, ........ + + ++++++++ ++ $$$$$$$$$ ", " %%%%%%% )))) //////////// /////////,,,,,,, ........ * * ******** ** $$$$$$$$$ ",
" %%%%%%% * /////// / ////////,,,,,, ...... + + + + + + +++++++ + $ $$$$$$$ ", " %%%%%%% ) /////// / ////////,,,,,, ...... * * * * * * ******* * $ $$$$$$$ ",
" %%%%%% / /////// / //////// ,,,, .......... +++ + + ++ + ++++++ + +++ ++++ + +++++++++ + $$$$$$$ $ ", " %%%%%% / /////// / //////// ,,,, .......... *** * * ** * ****** * *** **** * ********* * $$$$$$$ $ ",
" %%%%%% //////// //////// ...... . +++++++++++++++++++++++++++++ +++++++++++++++ $ $$$$$$$ $ ", " %%%%%% //////// //////// ...... . ***************************** *************** $ $$$$$$$ $ ",
" %%%%%%%%% ////// / //////// ...... . +++++++++++++++++++++++++++++++++++++++++++++++ $$$$$$$$$$ $ ", " %%%%%%%%% ////// / //////// ...... . *********************************************** $$$$$$$$$$ $ ",
" % %%%%%% / ///////// / ///// .......... ++++++++++++++++++++++++++++++++++++++++++++++ ++ $ $$$$$$$$ ", " % %%%%%% / ///////// / ///// .......... ********************************************** ** $ $$$$$$$$ ",
" %%%%%%% / / /////// ////// ....... ++++++++++++++++++++++++++++++++++++++++++++++ $ $$$$$$ ", " %%%%%%% / / /////// ////// ....... ********************************************** $ $$$$$$ ",
" %%%%%%%%% /// ////// ////// .......... ++++++++++++++++++++++++++++++++++++++++++++ + $$$$$$$$$ ", " %%%%%%%%% /// ////// ////// .......... ******************************************** * $$$$$$$$$ ",
" % %%%%%% ////////// ////// . ....... . ++++++++++++++++++++++++++++++++++++++++++++ $$$$$$$$ $ ", " % %%%%%% ////////// ////// . ....... . ******************************************** $$$$$$$$ $ ",
" %% %%%%%% /////// / ////// . ....... . + + ++++ + + +++++++++++++++++ + ++ $$$$$$$$ ", " %% %%%%%% /////// / ////// . ....... . * * **** * * ***************** * ** $$$$$$$$ ",
" %%%%%%%% ///////// ////// . .......... ++ + + + + + + + ++ $$$$$$$ ", " %%%%%%%% ///////// ////// . .......... ** * * * * * * * ** $$$$$$$ ",
" %%%%%% ////// // /////// ........ . ++ +++ + ++++ + + ++ + $ $$$$$$ ", " %%%%%% ////// // /////// ........ . ** *** * **** * * ** * $ $$$$$$ ",
" %%%%%%%%%% / /////// /////// .......... . . . + + $$$$$$$ ", " %%%%%%%%%% / /////// /////// .......... . . . * * $$$$$$$ ",
" % %%%%%% ////////// ////// . .......... . .... ... ... ... .... $$$$$$ ", " % %%%%%% ////////// ////// . .......... . .... ... ... ... .... $$$$$$ ",
" %% %%%%%% /////// / ////// ........... .................................. $$$$$$$$ ", " %% %%%%%% /////// / ////// ........... .................................. $$$$$$$$ ",
" %%%%%%%% ////////// ////// .. ............................................ $$$$$$$ ", " %%%%%%%% ////////// ////// .. ............................................ $$$$$$$ ",
" %%%%%% ///////// /////// ............................................. $$$$$$ ", " %%%%%% ///////// /////// ............................................. ..... $$$$$$ ",
" %%%%%% ///////// //////// . ........................................... $$$$$$$ ", " %%%%%% ///////// //////// . .................................................. $$$$$$$ ",
" %%%%%% //////////// //////// . ......................................... $ $$$$$$ ", " %%%%%% //////////// //////// . ......................................... $ $$$$$$ ",
" %%%%%% ///////// /////// .. ....................................... $$$$$$ ", " %%%%%% ///////// /////// .. ....................................... $$$$$$ ",
" %%%%%% //////// / ////// .. .................................... $$$$$$ ", " %%%%%% //////// / ////// .. .................................... $$$$$$ ",

BIN
tests/visual_tests/images/marker-recenter-collide-256-128-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 310 B

BIN
tests/visual_tests/images/marker-recenter-collide-256-128-1.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 319 B

BIN
tests/visual_tests/images/marker-recenter-collide-256-128-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 593 B

BIN
tests/visual_tests/images/marker-recenter-collide-256-128-2.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 653 B

25
tests/visual_tests/styles/marker-recenter-collide.xml Normal file
View 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>

1
tests/visual_tests/test.py
View file

@ -286,6 +286,7 @@ files = {
'functional-expressions':{'sizes':[(256,256)], 'bbox':mapnik.Box2d(-10,-10,10,10)}, '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)}, 'functional-expressions-length':{'sizes':[(512,512)], 'bbox':mapnik.Box2d(-15,-15,15,15)},
'marker-collide':{'sizes':[(512,512)]}, '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)]}, 'postgis-inline':{'sizes':[(512,512)]},
'text-line-wrap':{'sizes':[(512,512)]}, 'text-line-wrap':{'sizes':[(512,512)]},
} }