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

Merge branch 'master' of https://github.com/mapnik/mapnik

Browse source
This commit is contained in:
Ubuntu 2013-05-16 17:18:56 +00:00
commit 198c47f065
2 changed files with 44 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
tests/visual_tests/grids/text-halo-rasterizer-600-400-1.0-grid-reference.json
View file

@ -1,16 +1,22 @@
{
"keys": [
"",
"5",
"10",
"4",
"9",
"3",
"8",
"2",
"7",
"1",
"6"
"9",
"2",
"10",
"3",
"11",
"4",
"12",
"5",
"13",
"6",
"14",
"7",
"15",
"8",
"16"
],
"data": {},
"grid": [
@ -22,20 +28,10 @@
" ",
" ",
" ",
" !!! !!!!!! ### ###### ",
" !!!!!!!!!!!! ########## ",
" !!!!!!!!!!!! ########### ",
" !!!!!!!!!!! ########### ",
" !!!!!!!!!!! ####### ## ",
" ",
" ",
" ",
" ",
" ",
" $$ $$$$$$ %% %% %% %%% ",
" $$$$$$$$$$$$$$ %%%%%% %% %%% ",
" $$$$$$$$$$$$$$ %%%%%% %% %%% ",
" $$$$$$$$$$$$$ %%%%%%%%%%%%% ",
" ! ! ! ## ## ",
" ! ! !! ! #### # ",
" !!! ! ! !! #### ### ",
" ",
" ",
" ",
@ -43,6 +39,9 @@
" ",
" ",
" ",
" $ $ $ %% %% ",
" $ $ $$ $$ %%%% % ",
" $$$ $ $ $$ %%%% %%% ",
" ",
" ",
" ",
@ -50,12 +49,9 @@
" ",
" ",
" ",
" ",
" ",
" ",
" &&&&&&&&& && '''''' '' '' ",
" &&&&&& & && ' '''' ' ''' ",
" &&&&&&&&&&&&& ' '''' '''''' ",
" & & '' ' ",
" & & && & '''' '' ",
" &&& & & && '''' ''' ",
" ",
" ",
" ",
@ -63,6 +59,9 @@
" ",
" ",
" ",
" ( ( (( )) )) ",
" ( ( (( )))) ) ",
" ((( ( ( ( )))) ) ",
" ",
" ",
" ",
@ -70,12 +69,9 @@
" ",
" ",
" ",
" ",
" ",
" ",
" (((((((((( )) ))) ) ",
" (((((( ( )) ))) ) ",
" ((((((((( )))))) )) ",
" ********** ++ +++ + ",
" ****** * ++ +++ + ",
" ********* ++++++ ++ ",
" ",
" ",
" ",
@ -83,21 +79,31 @@
" ",
" ",
" ",
" ,,,,,,,,, ,, ------ -- -- ",
" ,,,,,, , ,, - ---- - --- ",
" ,,,,,,,,,,,,, - ---- ------ ",
" ",
" ",
" ",
" ",
" ",
" ",
" .. ...... // // // /// ",
" .............. ////// // /// ",
" .............. ////// // /// ",
" ............. ///////////// ",
" ",
" ",
" ",
" ",
" * * ++ + ",
" * * ** * ++++ ++ ",
" *** * * ** ++++ +++ ",
" ",
" ",
" 000 000000 111 111111 ",
" 000000000000 1111111111 ",
" 000000000000 11111111111 ",
" 00000000000 11111111111 ",
" 00000000000 1111111 11 ",
" ",
" ",
" ",
" ",

2
tests/visual_tests/test.py
View file

@ -19,7 +19,7 @@ defaults = {
'sizes': [(500, 100)],
'scales':[1.0,2.0],
'agg': True,
'cairo': True,
'cairo': mapnik.has_cairo(),
'grid': True,
}