diff --git a/tests/visual_tests/grids/lines-multi-layout-1-800-800-1.0-grid-reference.json b/tests/visual_tests/grids/lines-multi-layout-1-800-800-1.0-grid-reference.json new file mode 100644 index 000000000..a34444598 --- /dev/null +++ b/tests/visual_tests/grids/lines-multi-layout-1-800-800-1.0-grid-reference.json @@ -0,0 +1,224 @@ +{ + "keys": [ + "", + "9", + "8", + "4", + "5", + "7", + "16", + "6", + "10", + "2", + "12", + "13", + "14", + "11", + "3", + "15", + "1" + ], + "data": {}, + "grid": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " !! ", + " !!! !!!! !!!!! ", + " !! !! ! !!!! ! ! !!!!! ", + " !!!! !! !!!!!! !! ! !! !!! !!!!! ! ", + " !!!! !! !!!!!!! !!!! !! !!!!!!! !!!!!! ! ", + " !!!!! !! !!!! !!!! !!!! !! !! !!!! !!!! !!!!!!! ! !! ", + " !!!!! !! !!!! ! !!!! !!!!!! !!!!!! !!!!! !!!!!! !! !!! !! ", + " !!!!! !! !! !!! !!!!!! !! ! !! !!!!!!!!! !!!!!!!!!!! !! !!!! ! ", + " !!!!! !!!!!! !!!!!!!!!!! !!!!!! !! !!!!!! !!!! !!!!!!!! ! !! ! !!!! ", + " !!! !! !!!! !!! !!!!!!! !!!!!!! !!! !!! ! !!! ! !!!!!!! !! !!! !!!! !! ", + " !!!!!!!! !! !!!!! ! !!!! !!!!!! !!!!!!!!!!! !! !! !!!! !!!!!! !!!! ! ! ", + " !! !!!!!!!! !! !! !!!!!!!!!!! !!! !!!!!!!! !! !!!!!!! !!!! !!!!!! ", + " !! ! !!! !! !!!!!!!!!!! !!!!!!! !! !! !! !! !!!! !!!! !!!!!! ", + " !! ! !! !! !! !! !!! !!! ! !! ! !!!! !! !!!!!!!!!! !!!!!!!!! !! ", + " !! !!! !! !! !! ! !! !!!! !!!! !! !!!!!!!!!! !!!!!!!!!!! ", + " !!!!!! !!!!! !! !!!!!!! ! !!!! !!!!!! !!!! !! !!!!!!! ", + " !!!!!!!!!!!!! ! !!!!!! !! !!!!!! !!!!! !! !!! ", + " ! !!!!! !! !!!!!! ! !! !!! !!! !! ! !! ", + " !!!! ! !! !! !!!!!! !!!!!! !! ! ", + " !!! !! !! !!!!!!!! !!! ! ", + " !!!!!!! !!!!!!!! ", + " ## !!!!!!!! !!!!!!!!! # $ ", + " ### # # !!!!!!!! # !!!!!! ### $ ", + " ##### ## # ### !!!!!!! ## ### ### !! #### $ ", + " ###### ## ## #### !!! #### ## ## ##### #### # $$ $ ", + " ######### ## ## #### ! #### ## ## ##### ######## #### ## # $$ $ ", + " ######### ## ### ###### ###### # # ## ####### ####### ## ## #### ## $$ $ ", + " ### ## #### ### # ######## ########### ## ### ##### ## ## ##### ### # ## #### ## $$ $$$ ", + " ## ##### #### ######## ###### ###### ####### ### # #### ##### ## #### #### ## ## $$ $$$ $$ ", + " ## ##### #### ## ## #### #### #### # # ######### ## #### ######## ## # $$ $$$ $$ ", + " ## ##### ### # ## #### #### ## # #### ## ##### ## ###### ### $$ $$$ $$ ", + " ## #### ### ## ## #### ####### ## #### # ## ######## ## ## #### $$ $$$$$$ ", + " ## ##### #### ## ## ##### #### ## # ####### ###### ####### ## # ## $$ $$$$ $ ", + " # ### ### ## ## ## #### ### ## ### ## ## #### ##### ##### # ## #### $$ $$$ $ ", + " % # ### # ### ### ## #### ### ## ######## ## # #### #### ## #### $$ $$$ ", + " % ## ## ####### ## ## ## ## ###### ## ####### # #### $$ $ ", + " % ## ##### ## # ## ## ##### ## ## #### $$ $ ", + " %%%% ## ## ## ## ## ## # # ## ## ## ### $$ $ ", + " %%%% ## ##### ## ## ####### #### #### $ ", + " %%%% ####### # ## # ## ### ### # $ ", + " %%%%%%% ## ## ### # ####### # $ ", + " %%%%%%%%% # # ####### # ## #### $ ", + " %%%%%% %% ### # ##### ### ### $ ", + " %%%%%%%%% #### ### ######## $ ", + " %%%%%%%%% ####### &&&&& #### &&&&& $$ $ ", + " %%%%%%% % &&&&& ### &&&&&& &&&&&&& &&& &&&& $$ $ ", + " %%% %%%%% &&&&&& &&&&&&&&& &&&& & &&&&&& &&&&& $$ $$$ ", + " %%%%%%% &&&&&&&& &&&&& &&&& &&&&& &&&&&&& &&&&&&&&& & $$ $$$ ", + " %%%% &&&&&& &&&&&& &&&&& &&& && &&&&& &&& & & &&&&&&&&&&&& && $ $$$ $$ ", + " %%%% &&&&&&&&&&& && &&&& && &&& && &&&&&& &&&&& & && && &&&&& & && $$ $$$ $$ ", + " % % &&& &&&&&&& && &&&&& &&&&&& && && & &&&&&&&& & &&& &&&&&&&& & &&& $$ $$$ $$ ", + " % &&&&&&&&&& && && &&&&&&&& & &&& &&&&&&& && &&&&& && &&&&&&&& &&&& $$ $$$$$$ ", + " % &&&&&&& && & &&& & &&&& &&& &&&& && &&&&&&& &&&& && && &&&&& &&&&& & $$ $$$$$$ ", + " % & &&&&&&&& &&&& & &&&&&&& &&&& & && &&&& & &&&& && && && & &&& &&&& & $$ $$$ ", + " % & &&& &&&&&& && && &&& &&&&&& &&&&& && & &&&&&&&&&&& && &&&&&&&&& && $$ $$$ ", + " % & && & &&&&&&&&& && & &&&&&&&& & & &&& &&&&& &&&&&&& && && $$ $ ", + " % & &&&&&&& && &&&&&&& &&&& &&&&& & &&& &&&&&&& && $$ $ ", + " % &&&& & & && &&&&&& &&& &&&&&&&&&& &&&&& && $ ", + " % %% &&&&&&&&&& &&&& &&&& &&&&& & &&&&&&& $ ", + " % %% &&&&& &&&&&&& &&&&&&& & && &&& $ ", + " %%% %% &&&&&&& &&&&&&& &&& &&& &&&& $ ", + " %%% %% &&& &&& &&&&& & &&&&& &&& $ ", + " %%%%%% %% &&&&& &&& && $ ", + " %%%%%% %% &&& & ''''''''' $$ $ ", + " %% %%% %% '''''''' ''''''' $$ $ ", + " %% %%% %% ''''''''' ' $$ $ ", + " %% %%% % (( ((( ''''' ' $$ $$$ ", + " %%% %% ( ( (( ((((( (((((( ''''' ' $ $$$ $$ ", + " % %% ((( ((((( ((((((( (((((( '''''''''''''''''''''''' $$ $$$ $$ ", + " % %% ((((((( ((((((( ((((( ( (((( ((( $$ $$$ $$ ", + " % %% (((((( ( (((( (( (((((((( ((((((( ''''''''''''' $$ $$$$$$ ", + " % ((((((( (((((((( ( (((( ((((( ((( (((((((( '''''''' '''' $$ $$$$$$ ", + " % ( ((((( ((((( ((( ((((((( ((((( (( (( ( (( '''''''' '''' $$ $$$ ", + " % (( ((( (( ( ((( (( (( (( ((((( (( ( (( (((((( (( ((( $$ $$$ ", + " % (( (((( (( ((( (( ((((((( ( (( (( ((( (((( (( (( (( (((((((( (( ((( ( $$ $ ", + " % (( (((((((( (( ((( (( ((( (((( (( (((( ( (((((( (( (( ((( (( (( (((( ( ((((((( $$ $ ", + " % (( ((((( (( (((( ((( (( ((((( (( ((((((( (( ((((( ( (((((( (( (((( ( ((((((( $ ", + " % ( ((((( (((((( ((((((( ( ((((( ( (((((( (( (((( ( ((((((( (( (((( ( (((((( $ ", + " % %% ( (((( ((( ( ((((((( ( (((( ( ((((( (( ((( (( ((( (( ((( (((((((((( (( $ ", + " % %% ( ((( ((( ((((( (( (( ((( (((( (( (((((((((( ( ((( (( ((( (( $ ", + " %%% %% ( (((((((( (( (( (( (((( ( ((( (( ((( (( ((( (( ( ((( $ ", + " %%% %% ((( ((( (( ((( (( (( (( ((( ((( (( ((((( ((((( $ ", + " %%%%%% %% (((( (( ((( ((( ((((( ((((( (( (((((( $$ $ ", + " %%%%%% %% ( (( ((( ((((( ((((((((( ))) ((( (((( $$ $ ", + " %% %%% %% ((((( ** + (((((((( ((( (((( ))))))))))))) (((((( $$ $ ", + " %% %% %% ((( * ** + ((((((( ((( )))))))) )))) ))))))) $$ $$$ ", + " %% %%% % **** ** + ))))))))) ) ))))))))) $$ $$$ $ ", + " %%% %% **** ** + , ) )))))))))))))))))))) ))) )) $$ $$$ $$ ", + " %%% %% ****** * + , ------ --- )))))))) )))))))) )))) $$ $$$ $$ ", + " % %% **** ****** ** + , -------- ---- )))))))) ))))))))))) $$ $$$$$$ ", + " % %% ****** ****** + , -- ------ ---- )) )))))))))))) $ $$$$ $ ", + " % * ** * **** ++++ , ---------------------------- ))))) )) )))) ) $$ $$$$$ ", + " % ** **** + ++ , ---- - - ))))) ))) )) )) $$ $$$ ", + " % ** **** + ++ , -------- ))))) ) $$ $ ", + " % * ***** +++++++ , -------- ) ) $$ $ ", + " % ** **** ++++++ , . ----- .. . .. ..... )) $$ $ ", + " % ** **** ++++ ++++ , . ..........----- ....... ..... ) $ ", + " % * ** +++++++++ , ,, ........ .... ............. ) $ ", + " % %% ** ++++++ ++ , , ,,, ...... ................................ ) $ ", + " % %% ** ++ +++ ++ ,, , ,, ......... .... . . ) $ ", + " %%%% * * ++ +++++++,, ,,, ,, .. ......... ........ ) )) $ ", + " %% %%% **** ** ++ +++,,,,,,, , . . ....... ........ ) )) $ ", + " % %%%%%% **** ** ///// +++,,,,, ,,,, .. .... ..... )) ) )) $$ $ ", + " %%%%% %%% ******* * ////////// ++++,,,, , ,, . ...... ..... )) ))) )) $$ $ ", + " %%%%% %%%% **** *** ** ** /////////// + ,,,,,,,,,, . ...... ))))))) $$ $$$ ", + " %%%%% %%% ******* ** *** //// ////// / + ,, , ,, . 0 0 0 0 )))) )))) $$ $$$ ", + " %%%%%%%%% * *** * ***** // ////// ////// /// ++ ,, , ,, . 00000000 ))))) ) )) $ $$$ $$ ", + " %% %% %%%% ** **** ///////// ///////// + ,,,, . 00000000 ))))) )))) $$ $$$ $$ ", + " %% %%%% ** *** ////////// ///// + ,,,, . . 00000 ))))) )))) $$ $$$$$$ ", + " %%% * ***** / /////// // /// + ,,,, ... 00000 ))) )))) $$$ $$$$$$ ", + " %%% ** **** // /////// //// // + , ... 00000 ) ))) $$ $$$$$$ ", + " %%% ******* // // /// //// + , ..... . 00000000000000000000000000000 ) )) $$ $$$ ", + " % * *** // /////// / , .. .... 0 0 00 ) )) $$$ $$$ ", + " % ** * // /////// /// , . ... .. 00000000 0000 ) $$ $ ", + " % * // // ////// / // , .. ... .. 00000000 0000 ) $$ $ ", + " % /// ////// //// , .. ... .. )))))))) )) )) $ ", + " % //// // / //// , .. ...... ))))))))) )))))))) ) $ ", + " % /////// / , .. ...... ))))))) )))))))) ) $ ", + " % / /// / .. ... ))))) )))) )) $ ", + " %%%% // /// // // .. ... ))))) )))))) ) $ ", + " %%%% // /// // // .... ))))))))))))) ))))) ) $ ", + " %%%%%% /// ///// / .... ))))))))))))))))))))))))))))) $$$ ", + " %%%%%%% ///////// / . )))))))))) )) $$$ ", + " %%%%%%%% ///////// // . )))))))) )))) )))))))) )))) $$$ ", + " %%%% %%%% /////// / . )))) )))) )))))))) )))) $$$ $$ ", + " %%%% %%% // / / .. .. $$$ $$ $$ ", + " %%%%%%%%% // / / . ... . $$$$$$$$$ ", + " %%%% % % / / . ....... ........ $$$ $$$$$ ", + " %%%%%%% / / . ...... ........ $$$$ $$$$$ ", + " %%% / / .. .. ..... $$$$$$$$$ ", + " %%% / / .. ..... ..... $$$ $$ ", + " %%% / / .. ... ..... $$$ $$ ", + " % // / .. ..................................... $$$$ ", + " % // / ..... . . .. $$$ ", + " % / / ............ ............. $ ", + " % / / ..... .... ............. $ ", + " // // $ ", + " / / $ ", + " / / ", + " / // ", + " // // 1 1 1 ", + " / // 11111111 111111111 ", + " / // 11111111 111111111 ", + " / // 1 11 11111 ", + " /// // 11111 11111 ", + " /////// // 11111 111 1 ", + " /////// // 11111111111111111111111111111111111111111111111 ", + " /// 111 1 1 1111 ", + " 1111111111111 11111111 1111 ", + " 11111111 1111 11111111 1111 ", + " 1 1 ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ] +} \ No newline at end of file diff --git a/tests/visual_tests/grids/lines-multi-layout-2-800-800-1.0-grid-reference.json b/tests/visual_tests/grids/lines-multi-layout-2-800-800-1.0-grid-reference.json new file mode 100644 index 000000000..96a1f2fbe --- /dev/null +++ b/tests/visual_tests/grids/lines-multi-layout-2-800-800-1.0-grid-reference.json @@ -0,0 +1,209 @@ +{ + "keys": [ + "", + "1" + ], + "data": {}, + "grid": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ! ", + " ! ", + " ! !!!!! ", + " !!! ! ", + " !!!!!!!! ! ! ! ", + " ! !! ! ! ", + " !! ! !! ! ", + " !! !!! !! ! ", + " ! ! !!! ! ! ", + " ! ! ! ! !! ", + " ! ! ! ! ", + " !! ! ! ! ", + " ! ! ! !! ! !! ", + " ! !!! !! ! ! ! ", + " ! ! !! ! ! !!! ", + " ! !! !!! !! ! ", + " ! !!! ! ! ! ! ", + " ! ! ! !!!! ! ! !! ", + " ! !! ! ! !! ! ", + " ! ! ! ! ! !! ", + " ! !! ! ! !! ", + " !! ! ! ! ! ! !!! ", + " ! !! !!! !! ! !!! ", + " ! ! ! ! ! ! ! !! ", + " !! ! ! !!! ! ! ! ", + " ! !! !! ! !!! ! ", + " !!! ! !!! !! ! ! ! ", + " !! ! ! ! !!! ", + " ! ! ! ! ! ", + " !! ! ! !! ", + " !! ! ! ", + " ! ! ! !! ! ", + " ! ! ! ! ", + " !!! !! !! ! ", + " !!!! ! !! !!! ", + " !! ! ! ! !! ! ", + " ! !!! !!!! !!!! ", + " !! ! ! ! !! ! ", + " !!! ! !!! !! ! ", + " ! ! ! !! ! ", + " !! ! !! ! ", + " ! ! ! ! ", + " ! ! ! ", + " ! !!!!! ! ", + " ! ! ! ! ", + " ! ! !! ! ", + " ! ! !! ! ", + " ! ! ! ", + " ! ! ! ", + " ! !!! ! ! ", + " ! ! ! !!!!! ", + " ! ! !!!!! ! !! ", + " ! ! !! ! ! !!! ", + " ! ! ! ! ! ! !! ", + " ! !!! !!! ! ! !! ", + " ! ! ! ! !! ", + " !!!! ! ! ! ! ", + " ! !!! !! ! !!!! ", + " ! !! !! ! ! ", + " ! ! ! ! ! ", + " ! !! !! ! ! !! ", + " ! ! !!!! ! ! ! ! ", + " ! !! !! !! ! ! ", + " ! !! !!! ! !! ! ", + " ! !!! !!! ! ! ! ", + " ! ! !! ! ! ", + " !!!! ! !!!! ! ", + " !!!! !! ! !! ! ", + " !! ! !! ! ! ", + " ! ! ! !! ! ", + " !! ! ! ! ! ", + " ! ! !! !!!! ", + " !!! ! ! ", + " ! ! !! ! ! ", + " ! ! !! ! ! ! ", + " !! ! ! !!! ! !! ", + " !!! ! ! !!!!! ", + " !!!! !!! ! !! ! ", + " !! ! ! !! !!! ", + " !!! ! ! !! ! ", + " !! ! ! !! ", + " ! ! !! ! ", + " ! ! ! ! ", + " ! !!!! ! ", + " ! ! !! !! ", + " ! ! ! ! ! ", + " ! !! ! ", + " ! ! ! ", + " ! ! ! ", + " ! !! ! ! ", + " ! ! ! ! ! ", + " ! !!! ! ! ! ! ", + " ! ! ! !! ! ! ! ", + " ! !! !!! ! ! ! ", + " !!! !!! ! ! !! ", + " ! !! !! ! ! ! ! ", + " ! !! ! ! ! !!! ", + " ! !!! ! ! ! !!! ", + " ! !!! ! ! ! ! !! ", + " ! ! !! ! ! ", + " ! ! ! ! ! !! ", + " !! !! !!!! ! !! ! ", + " ! ! ! ! !! ", + " ! !! !!! ! ! !! ", + " ! ! ! ! !!! ", + " ! !!! ! ! ! ", + " ! ! ! !!!! ", + " !!!! ! !!!! ! ", + " !! !! ! !! ! ", + " ! ! ! ! ! ", + " !! ! ! !! ! ", + " ! ! ! ! ! ", + " ! ! !!! !!! ", + " !!! ! ! !! ! ", + " ! ! !!! ! ! ", + " !!! ! !! ! ! ", + " !!!! ! ! !!! ", + " !!!! !!!! ! ! ", + " !! ! !!! ! !! ! ", + " !! ! ! ! !! ! ", + " ! ! !! ! ! ", + " ! ! !! !!! ", + " !! ! !! ! ", + " ! ! !! ! ", + " ! ! !!! ! ", + " ! ! ! !! ", + " ! !! ! ", + " ! ! ! ", + " ! !!! ! ! ", + " ! ! !! !! ", + " ! !!! ! ! ", + " ! !!! ! ! ", + " ! ! ! ! ! ! ", + " ! ! !!! ! ! !! ", + " ! !! ! !! ! ", + " ! ! ! ! ! ", + " ! ! ! ! ! ! ! ", + " ! ! ! ! ! ! !!!! ", + " ! !!!! !! ! ! ! ! ", + " ! ! ! !! !! ! ! ", + " ! !! !!!! ! !! ", + " ! ! ! ! ! ! ! ", + " ! ! ! ! ! ! ", + " ! ! ! ! ! !! ", + " ! ! ! ! ! ", + " ! ! ! ! !! ", + " ! ! ! !! ! !! ", + " ! !!! ! !! !! ! ! ", + " ! !! !! ! ! ! ", + " ! ! !! ! !! ! ", + " !!! ! ! !!!!! !!! ", + " !! ! ! !! ! ! ", + " ! !!!!!! !!! ", + " !! ! ! !! ! ! ", + " !! !!! ! ! ", + " !! !! ! ! !! ", + " ! !! ! !!!! ", + " ! ! ! ! ! ! ! ", + " ! ! ! ! ! ", + " ! !! !!!!! !! ! ", + " ! !!! ! !!! ! ! ", + " !!! ! ! ! ! ! ", + " !!!! !! ! ", + " !! ! ! ! ", + " !! ! ! ", + " ! ! !! ", + " ! !! ! ! ", + " ! !!! !! ! ", + " ! !!! !! !! ", + " ! !! ! !! !! ", + " ! !!!! !!!!!! ", + " ! !!! ", + " !!!! !!! ", + " !! ! ", + " !! ! ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ] +} \ No newline at end of file diff --git a/tests/visual_tests/grids/lines-multi-layout-shield-800-800-1.0-grid-reference.json b/tests/visual_tests/grids/lines-multi-layout-shield-800-800-1.0-grid-reference.json new file mode 100644 index 000000000..e4ae90b58 --- /dev/null +++ b/tests/visual_tests/grids/lines-multi-layout-shield-800-800-1.0-grid-reference.json @@ -0,0 +1,217 @@ +{ + "keys": [ + "", + "8", + "7", + "6", + "5", + "9", + "4", + "2", + "1", + "3" + ], + "data": {}, + "grid": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! ", + " !!!!!!!!! !!!!!!!!! !!!!!!!!! !!!!!!!!! !!!!!!!!! !!!!!!!!! !!!!!!!!! !!!!!!!!! !!!!!!!!! !!!!!!!!! !!!!!!!!! !!!!!!!!! ", + " !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! ", + " !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! ", + " !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", + " !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! ", + " ", + " !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! !!!!! ", + " !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! ", + " ", + " ", + " ", + " ", + " ", + " ", + " ######### ######### ######### ######### ######### ######### ######### ######### ######### ######### ######### ######### ", + " ######### ######### ######### ######### ######### ######### ######### ######### ######### ######### ######### ######### ", + " ######### ######### ######### ######### ######### ######### ######### ######### ######### ######### ######### ######### ", + " ##### ##### ##### ##### ##### ##### ##### ##### ##### ##### ##### ##### ", + " #################################################################################################################################################################################### ", + " ##### ##### ##### ##### ##### ##### ##### ##### ##### ##### ##### ##### ", + " ##### ##### ##### ##### ##### ##### ##### ##### ##### ##### ##### ##### ", + " #### #### #### #### #### #### #### #### #### #### #### #### ", + " #### #### #### #### #### #### #### #### #### #### #### #### ", + " # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " $$$$$$$$$ $$$$$$$$$ $$$$$$$$$ $$$$$$$$$ $$$$$$$$$ $$$$$$$$$ $$$$$$$$$ $$$$$$$$$ $$$$$$$$$ $$$$$$$$$ $$$$$$$$$ $$$$$$$$$ ", + " $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ ", + " $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ $$$$$$ $$ ", + " $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ ", + " $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ ", + " $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ ", + " $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ $$$$$ ", + " $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ ", + " $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ ", + " $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ $$$$ ", + " ", + " ", + " ", + " ", + " ", + " %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% ", + " %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% %%%%%%%% ", + " %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% ", + " %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% ", + " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", + " %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% %%%%%% ", + " ", + " %%%% %%%% %%%% %%%% %%%% %%%% %%%% %%%% %%%% %%%% %%%% %%%% ", + " %%%% %%%% %%%% %%%% %%%% %%%% %%%% %%%% %%%% %%%% %%%% %%%% ", + " ", + " ", + " ", + " ", + " ", + " &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ''''''' ' '''''''' (((((((( ", + " '' '''''' '' ''''' (((((((( ( ((((((((( ", + " )))) )))) ''''''' ' '''''''' (((((((( ((( ((( (((((( (( ", + " )))) )))) ) ))))))))) '''''' '''''' ((((((((( (((((((( (( ", + " ))))))))) )))))) ))))))))) '''''''''''''''''''''''''''''''''''''' (((((( ((((((( ", + " )))))))) )))))))))) '''''' '''''' (((((( ((((( ", + " )))))) ))))))) '''''' '''''' (((((( ((((( ", + " ))))) )))))) ''''' ''''' (((( ((((( ", + " ))))) )))))) '''' '' ' (( ( (((( ", + " )))) )))))) '''' '''' ((((( (((( ", + " )))) )))) ( ((((( ", + " )))) )) ) (( ( ", + " ) ) ))) ( ( ", + " ) ) ( ( ", + " )) ) ( ( ", + " ) ) ( (( ", + " ) ) ( ( ", + " ) ) ( ( ", + " ) )) ((((((((( (((( (((( ", + " ) ) ((((((( ( (((( (((( ", + " ))))))))) )))))))) (((((( ((((((((( ", + " ))))))))) )))))))) (((((( ((((( ", + " ))))) )))))))) (((((( ((((( ", + " ))))) )))))) ((((((( ((((( ", + " ))))) )))))) ******** ******** (( (((((((( ", + " )))))) )))))) ******* ******** ((((( (( ((( (((( ", + " ))) )))))))) ****** ****** (((( (( (((( ", + " )))) ))) ))) )))) ****** ****** (((( ", + " )))) )) )) ) ************************************** ", + " )))) ****** ****** ", + " ****** ****** ", + " ***** **** ", + " **** **** ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ] +} \ No newline at end of file diff --git a/tests/visual_tests/grids/text-multi-layout-1-512-512-1.0-grid-reference.json b/tests/visual_tests/grids/text-multi-layout-1-512-512-1.0-grid-reference.json new file mode 100644 index 000000000..5bdb416b7 --- /dev/null +++ b/tests/visual_tests/grids/text-multi-layout-1-512-512-1.0-grid-reference.json @@ -0,0 +1,142 @@ +{ + "keys": [ + "", + "2", + "3", + "5", + "6", + "4", + "1" + ], + "data": {}, + "grid": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ! # ", + " !! ## ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " $ ", + " $ ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " % ", + " %% ", + " % ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " & ' ", + " && '' ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ] +} \ No newline at end of file diff --git a/tests/visual_tests/grids/text-multi-layout-2-512-512-1.0-grid-reference.json b/tests/visual_tests/grids/text-multi-layout-2-512-512-1.0-grid-reference.json new file mode 100644 index 000000000..fa899d3ad --- /dev/null +++ b/tests/visual_tests/grids/text-multi-layout-2-512-512-1.0-grid-reference.json @@ -0,0 +1,137 @@ +{ + "keys": [ + "", + "1" + ], + "data": {}, + "grid": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ! ", + " !!! ", + " ! !! ", + " ! ! !!! ", + " !! ! ! ", + " !!! !!! ", + " ! ! !!! ", + " ! ! !! ! ", + " ! ! !! !!! ", + " !! !!! !!! ", + " ! ! !!! ! ! ", + " !! ! ! !!!! !! ! ", + " ! ! !! !!! !!! !! ", + " !! !!! ! ! !! ", + " !! !! !! ! ! ", + " !! !!!! !!! !! ", + " !! ! !! !! !!! ! ! ! ", + " !! !!!!!!!!!!! !!!!! !!! ! !!!! ! ! !!! ", + " !! ! !! !!!!!! !!! ! !! !!! !! ! ", + " ! !!! !! !! ! ", + " ! !! ! ! !!! ", + " !! !!! ! !! !!! ! ", + " !! !!!!!!! !!!!! ! !! !!! !!! ", + " !!!!!!!!!! !!! !!!! ! ! ! !! ", + " !!! !!! ! ! ", + " ! !!! !! ", + " ! !!! !!! ", + " ! !!!! ", + " !!! ", + " ! ! ", + " ! ", + " ", + " ", + " ! !! ! !! ! ", + " !!!!!!!!!!!!!!!!!! !!!!!!!! !!!!!!!! !!!!!!!! ", + " !!!!!!!!!!!!!!!!!! !!!!!!!! !!!!!!!! !!!!!!!!! ", + " ! !!! ! ! ! !!! ! ! ! ! ! !! ", + " ! ! !!! !! ! !! ! ", + " ! !!!!!!!! !!!!!!!!!!!!!!!!! !!!!!!!!! ", + " !!!!!!!!!! !!!!!!!!!!!!!!!!! !!!!!!!!! ", + " !! ! ! ! ! ! ", + " !!!!!!!!!!!! !!!!!!! ", + " !!!!!!!!!!!! !!!!!!! ", + " ! ! ! ! ! !! ! ", + " ! ! ", + " !!!!!!!!! ", + " !!!!!!!!!! ", + " ! ! ! ", + " !!!!!!! ", + " !!!!!! ", + " !! ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ] +} \ No newline at end of file diff --git a/tests/visual_tests/images/lines-multi-layout-1-800-800-1.0-agg-reference.png b/tests/visual_tests/images/lines-multi-layout-1-800-800-1.0-agg-reference.png new file mode 100644 index 000000000..b404d18ee Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-1-800-800-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-1-800-800-1.0-cairo-reference.png b/tests/visual_tests/images/lines-multi-layout-1-800-800-1.0-cairo-reference.png new file mode 100644 index 000000000..f67aff893 Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-1-800-800-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-1-800-800-2.0-agg-reference.png b/tests/visual_tests/images/lines-multi-layout-1-800-800-2.0-agg-reference.png new file mode 100644 index 000000000..f11fa790d Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-1-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-1-800-800-2.0-cairo-reference.png b/tests/visual_tests/images/lines-multi-layout-1-800-800-2.0-cairo-reference.png new file mode 100644 index 000000000..4972c4031 Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-1-800-800-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-2-800-800-1.0-agg-reference.png b/tests/visual_tests/images/lines-multi-layout-2-800-800-1.0-agg-reference.png new file mode 100644 index 000000000..f31122187 Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-2-800-800-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-2-800-800-1.0-cairo-reference.png b/tests/visual_tests/images/lines-multi-layout-2-800-800-1.0-cairo-reference.png new file mode 100644 index 000000000..16561ac94 Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-2-800-800-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-2-800-800-2.0-agg-reference.png b/tests/visual_tests/images/lines-multi-layout-2-800-800-2.0-agg-reference.png new file mode 100644 index 000000000..ab7588155 Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-2-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-2-800-800-2.0-cairo-reference.png b/tests/visual_tests/images/lines-multi-layout-2-800-800-2.0-cairo-reference.png new file mode 100644 index 000000000..643ca1384 Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-2-800-800-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-shield-800-800-1.0-agg-reference.png b/tests/visual_tests/images/lines-multi-layout-shield-800-800-1.0-agg-reference.png new file mode 100644 index 000000000..dc5a1af04 Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-shield-800-800-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-shield-800-800-1.0-cairo-reference.png b/tests/visual_tests/images/lines-multi-layout-shield-800-800-1.0-cairo-reference.png new file mode 100644 index 000000000..3ae3eb173 Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-shield-800-800-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-shield-800-800-2.0-agg-reference.png b/tests/visual_tests/images/lines-multi-layout-shield-800-800-2.0-agg-reference.png new file mode 100644 index 000000000..7e2b733a0 Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-shield-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-shield-800-800-2.0-cairo-reference.png b/tests/visual_tests/images/lines-multi-layout-shield-800-800-2.0-cairo-reference.png new file mode 100644 index 000000000..ae89b493d Binary files /dev/null and b/tests/visual_tests/images/lines-multi-layout-shield-800-800-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-multi-layout-1-512-512-1.0-agg-reference.png b/tests/visual_tests/images/text-multi-layout-1-512-512-1.0-agg-reference.png index 0781feeac..302e87fdc 100644 Binary files a/tests/visual_tests/images/text-multi-layout-1-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/text-multi-layout-1-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-multi-layout-1-512-512-1.0-cairo-reference.png b/tests/visual_tests/images/text-multi-layout-1-512-512-1.0-cairo-reference.png new file mode 100644 index 000000000..8f863d1c5 Binary files /dev/null and b/tests/visual_tests/images/text-multi-layout-1-512-512-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-multi-layout-1-512-512-2.0-agg-reference.png b/tests/visual_tests/images/text-multi-layout-1-512-512-2.0-agg-reference.png index f2207cc65..ff3e98be4 100644 Binary files a/tests/visual_tests/images/text-multi-layout-1-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/text-multi-layout-1-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-multi-layout-1-512-512-2.0-cairo-reference.png b/tests/visual_tests/images/text-multi-layout-1-512-512-2.0-cairo-reference.png new file mode 100644 index 000000000..883b19fc2 Binary files /dev/null and b/tests/visual_tests/images/text-multi-layout-1-512-512-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-multi-layout-2-512-512-1.0-agg-reference.png b/tests/visual_tests/images/text-multi-layout-2-512-512-1.0-agg-reference.png index bb887fa58..d7e748485 100644 Binary files a/tests/visual_tests/images/text-multi-layout-2-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/text-multi-layout-2-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-multi-layout-2-512-512-1.0-cairo-reference.png b/tests/visual_tests/images/text-multi-layout-2-512-512-1.0-cairo-reference.png new file mode 100644 index 000000000..b4a157794 Binary files /dev/null and b/tests/visual_tests/images/text-multi-layout-2-512-512-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-multi-layout-2-512-512-2.0-agg-reference.png b/tests/visual_tests/images/text-multi-layout-2-512-512-2.0-agg-reference.png index caa5b8303..721d71715 100644 Binary files a/tests/visual_tests/images/text-multi-layout-2-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/text-multi-layout-2-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-multi-layout-2-512-512-2.0-cairo-reference.png b/tests/visual_tests/images/text-multi-layout-2-512-512-2.0-cairo-reference.png new file mode 100644 index 000000000..05cb2de56 Binary files /dev/null and b/tests/visual_tests/images/text-multi-layout-2-512-512-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/styles/text-multi-layout-1.xml b/tests/visual_tests/styles/text-multi-layout-1.xml index 93d0335af..46cb7db7c 100644 --- a/tests/visual_tests/styles/text-multi-layout-1.xml +++ b/tests/visual_tests/styles/text-multi-layout-1.xml @@ -1,5 +1,4 @@ - @@ -9,14 +8,19 @@ csv lat,long,nr --0.4,0.4,0 +-0.5,0.5,0 +0.5,-0.5,1 +0.5,0.5,2 +-0.5,-0.5,3 +0.08,0,4 +-0.08,0,5 @@ -25,11 +29,12 @@ lat,long,nr csv -lat,long,nr,ref1,ref2 --0.33,-0.33,0,test 1,first -0.33,-0.33,1,test 2,second --0.33,0.33,2,test 3,third -0.33,0.33,3,test 4,fourth +lat,long,nr,ref +-0.45,-0.45,0,first +0.45,-0.45,1,second +0.45,0.45,2,third +-0.45,0.45,3,fourth +0,0,4,fifth @@ -37,33 +42,22 @@ lat,long,nr,ref1,ref2 - - - frame - - csv - -lat,long,nr --1,-1,0 --1,1,1 -1,-1,2 -1,1,3 - - - - - diff --git a/tests/visual_tests/styles/text-multi-layout-2.xml b/tests/visual_tests/styles/text-multi-layout-2.xml index b68127872..513dd729b 100644 --- a/tests/visual_tests/styles/text-multi-layout-2.xml +++ b/tests/visual_tests/styles/text-multi-layout-2.xml @@ -1,5 +1,4 @@ - @@ -13,42 +12,37 @@ lat,long - + - - - frame - - csv - -lat,long,nr --1,-1,0 --1,1,1 -1,-1,2 -1,1,3 - - - - - diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py index 3c438c421..49653c0fc 100755 --- a/tests/visual_tests/test.py +++ b/tests/visual_tests/test.py @@ -160,8 +160,8 @@ files = { 'text-halign': {'sizes': [(800,800)], 'bbox': default_text_box}, 'text-malayalam': {'sizes': [(800, 100)], 'bbox': default_text_box}, 'text-bengali': {'sizes': [(800, 100)], 'bbox': default_text_box}, - 'text-multi-layout-1': {'sizes': [(512,512)]}, - 'text-multi-layout-2': {'sizes': [(512,512)]}, + 'text-multi-layout-1': {'sizes': [(512,512)], 'bbox':mapnik.Box2d(-1, -1, 1, 1)}, + 'text-multi-layout-2': {'sizes': [(512,512)], 'bbox':mapnik.Box2d(-1, -1, 1, 1)}, 'line-pattern-symbolizer': {'sizes':[(900, 250)],'bbox': mapnik.Box2d(-5.192, 50.189, -5.174, 50.195)}, 'tiff-alpha-gdal': {'sizes':[(600,400)]}, 'tiff-alpha-broken-assoc-alpha-gdal': {'sizes':[(600,400)]},