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

fix simply option + tests for #1484 and #1992

Browse source
This commit is contained in:
Dane Springmeyer 2014-08-18 19:23:50 -07:00
parent 0e87d913ed
commit d6c59d96ec
7 changed files with 83 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/symbolizer_keys.cpp
View file

@ -78,7 +78,7 @@ static const property_meta_type key_meta[to_integral(keys::MAX_SYMBOLIZER_KEY)]
property_meta_type{ "smooth", false, nullptr, property_types::target_double },
property_meta_type{ "simplify-algorithm", enumeration_wrapper(radial_distance),
[](enumeration_wrapper e) { return *simplify_algorithm_to_string(simplify_algorithm_e(e.value));}, property_types::target_simplify_algorithm },
property_meta_type{ "simplify-tolerance", 0.0, nullptr, property_types::target_double },
property_meta_type{ "simplify", 0.0, nullptr, property_types::target_double },
property_meta_type{ "halo-rasterizer", enumeration_wrapper(HALO_RASTERIZER_FULL),
[](enumeration_wrapper e) { return enumeration<halo_rasterizer_enum,halo_rasterizer_enum_MAX>(halo_rasterizer_enum(e.value)).as_string();}, property_types::target_halo_rasterizer },
property_meta_type{ "text-placements", false, nullptr, property_types::target_double },

158
tests/visual_tests/grids/line-pattern-smooth-and-offset-512-512-1.0-grid-reference.json
View file

@ -26,91 +26,91 @@
" ",
" ",
" ",
" !!! !! ",
" !!!!!!!!! !!!!!!!! ",
" !!! !!!! !!!! !!! ",
" !!! !!!!! !!! !!! !!!!! !! ",
" !! !!!!!!!! !!! !!! !!!!!!!! !! ",
" !!!!! ! !! !! !!! !! !! !!! !! ",
" !! !! !!!!! !! !! !! !! !!!!! !!!!!! ",
" !! ! !!! !!!!! !! !! !! !!! !! !! !!! ",
" !! !! !!!!!!! !!!! !! !! !!!!!!!!! !! !! ",
" !! !!!!!!! !! !! !! !! !!!!!!!!!!!!!! !! !! ",
" !!!! !!!! !! ! !! !!!!!!!!! !!!!!! !! ",
" !! !! !!! !! !!!! !! !!!!! !!!!!!!!! ",
" !! ! !!! !!!!! ! !! !!!!!!!!!!!!!! !!!!! !!! ",
" !! !! !!! !!!!!!! !! !!!!!!!!!!! !!!!! !!!!! !! ",
" !! !!!!! !!!!!! !!!! !! !!!!!! !!!!!!!!! !! ",
" !!!! !! !! !!! !!!! !! !!!!! !!!! !!!!!!!! !! ",
" !! !! !! !! !!!!! !! !! !!!!! !!!!!!!!!! !!!! !!!!!! ",
" !! !!!! !!! !!! ! !! !!!!!!!!! !!! !!!! !!!! !! !!! ",
" !! !!!!! !! !!! !!!! !!! !!!!! !!! !!!! !!!!!! !! ",
" !! !!!! !! !! !!!!! !! !!! !!!!! !! !!! !!!!!!! !! ",
" !!!! !! !!! !!!! !!!!! !!! !!!! !!!!!!!! !!! !!!!!!! !! ",
" !! !!!!! !! !!! !!!!! !! !!!!!!! !!!!!!!!! !!! !!! !!!!!! ",
" !! !!!! !! !! !!!!! !! !! !!! !! !! !!! !!!!!! !!! ",
" !! !!!!! !! !! !! !!!!! !!! !!!!! !! !!!!!! !! ",
" !! !!!!!!! !!! !!!!! !! !!!! !!!!!! !! !!!!!!! !! ",
" !!!! !! !! !! !!!!! !!!!!!!! !!! !! !! !!!!!!! !! ",
" !! !!!!!!! !! !!!!!! !!!!! !!!!!! !!! !!!!!!!!!!",
" !! !!!! !! !!! ! !!! !!!! !! !! !!!!!!! !!",
" !! !! !!!! !! !!!!!! !!!! !! !! !!!!!!! !",
" !! !!!!!!! !! !!!! !!!!!!!!!!!!!!! !!!!!!!! !! ",
" !!!! !!!! !! !! !! !!!!!! !! !! !! !!!!!!!!",
" !! !! !!!! !! !!!! !! !! !!!!!!! !!",
" !! !!!! !! !! !! !! !!! !!! !! !! !! !",
" !! !! !!!! !! !! !!!! !!!!!!!! !! !!!!! ",
" !! !! !!!! !! !!!!!!!!!!! !! !! !! !!!",
" !! ! !! !! !! !! !! !!! !! !!!! !!!",
" !! !! !!!! !! !!!!!!!! !! !! !! !!",
" !! !! !!!! !! !!! !!! !! !!!! !!",
" ! !! !!!!! !! !!!! !!! !! !!!!",
" !! !! !!!! !! !!!!!! !!!! !",
" !! !! !!!! !! !! !!!",
" !! !! !!!!! !! !! !! ",
" !! !! !!!! !! !!!! ",
" ! !! !!!!! !! !! ",
" !! !! !!!!! !! ",
" !! !! !!!!!!! ",
" !! !! !!!!! !! ",
" !! !! !!!!! !! ",
" ! !! !!!!!!!! ",
" !! !! !!!!! !! ",
" !! !! !!!!! !! ",
" !! !! !!!!!!!! ",
" !!!!!!!! !! !! !!!!! !! ",
" !!!! !!!!! ! !! !!!!!! !! ",
" !!! !!!! !!!! !! !! !!!!!! ! ",
" !! !!!!!!!! !!!! !! !! ! !!! !! ",
" !! !!! !!!! !!!! !! !! !!!!!! !! ",
" !! !!! !!!!! !!!! !!!! !! !! !!!!!! ! ",
" !! !!! !!! !!!! !!!! !!!! !! !! !! !!!!!! ",
" !! !!! !! !!!!!!!! !!!! !!!! !! !! !!!!!! !! ",
" !! !!! !!!!!!!!!!!!!! !!!! !!! !!!! !! !!!! !! ",
"!! !!! !!!!! !!!!! !!!! !!! !! !! !! ! !!!! ",
"! !!! !!!! !!!!!!! !!!!!! !!! !! !! !! !!!!!! !! ",
" !!! !!! !!!!!!!!!! !!!!!! !! !!! !! !! !!!! !! ",
"!!! !!! !!!! !!! !! !!! !!!!! !! !!!! !!!! ",
"!! !!! !!! !!!!! !! !! !! !! !!!! !! !!!! !! ",
"! !!!! !! !!!!!!!! !! !! ! !! ! !! !! !!!! ! ",
" !!!! !! !!! !!! !! !!!!!! ! !!!! !! ! !! ",
" ",
" ",
" ! ",
" !!!!! !!!!!!! ! !!!!! ",
" !!!!!!!!!!!!!!!!!!! ! ! !!!!!!!! ",
" !!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! ! !! !! !!! ",
" !!!!!!!!! !!!!! !! !!!!!!!! !!! !! !!!!! !!! ",
" !!!!!! ! !!! !!!!! !!!!!!!! !! !!! !! !! ",
" !!!!! !! !!!!!!! !! !!!!!! !! !!!!!!!!! !! ",
" !!!! !!!!!!! !! !! !!!!!!!!!!!!!!!!!! !! ",
" !!!! !! !!!! !! ! !!!!!! !!!!!! ",
" !!!!!!! !! !!! !! !! !!!!!!! !!!!!! ",
" !!!!! !!! ! !!! !!!!! !!!!!!!!!!!!!! !!!!! ",
" !!!! !! !! !! !!! !!!!!!! !!!!!!!! !!!!!!!! !!!!! ",
" !!! ! ! !! !!!!! !!!!!! !! !!!!!! !!!!!!!!!!!!!!!! ",
" !!!! !!! !! !! !! !!! !! !!!!! !!!! !!!!!!!!!!!! ",
" !!! !! !! !! !! !!!!! !!!!! !!!!!!!!!!!!!!!!! !!! ",
" !!! !!!! !!! !!! ! !!!!!! !!!!! !!!!!!!!!! !! ",
" !!! !! !!!!! !! !!! !! !!!!! !!! ! !!!!!!!!!!!! ",
" !!! !!!! !! !! !!!!! !!!!! !! ! !!!!!!!!!!! ",
" !!! !! !! !! !!! !!!! !!!!! !!!!!!!! !!!!!!!!!!! ",
" !!! !! !!!!! !! !!! !!!!! !! !!!!!!!!! !!!!!!! !!! ",
" !! !! ! !!!! !! !!! !!!!! !! !!! !! !! !! !!! !!!!!! ",
" !! ! !!! !!!!! !! !!!! !! !!!!! !!! !!!!! !! !! !!!!!! ",
" !! ! !! !!!!!!! !!!! !!!!! !! !!!! !!!!!! !! !!!!!!! ",
" !! !!!!! !! !! !! !! !!! !!!!! !!!!!!!! !!! !! !! !!!!!!! ",
" !! !!! !!!!!!! !! !!! !!!!!! !!!!! !!!!!! !! ! !!! !!!!!!! ",
" !! !!!! !!!! !! !!! ! ! !!! !!!! !! !! !! !!!!!!! ",
" !! !! ! !! !!!! !! !!! !!!!!! !!!! !! !! !! !!!!!!!! ",
" !! !! !!!!!!! !! !!! !!!! !!!!!!!!!!!!!!! !! !!!!!!!!!!!!",
" !! !! !!!! !! !! !! !! !!!!!! !! !! !! !! !!!!!!!!",
" !! !! !!!! !! !!! !!!! !! !! !!!! !!!!!!!!!!",
" !!! !!!! !! !! !!! !! !! !!! !!!!! !! !! !! !!!!",
" !!! !! !!!! !! !! !! !!!! !!!!!!!! !!! !! !!!!! ",
" !! !! !!!! !! ! !!!!!!!!!!! !! !!! !! !! !!!",
" !! ! !! !! !!! !! !! !!! !! !! !!!! !!!",
" !! !! !!!! !!!! ! !!!!!!!! !! !! !! !! !!",
" !!! !! !!!! !! ! !!! !!! !! !!!! !!",
" !!! !! !!!!! !!! !!!! !!! !! !!!!",
" !! !! !!!! !! ! !!!!!!!! !!!! !",
" !! !! !! !!!! !!! ! ! !!! !! !!!",
" !!! !!! !! !!!!! !!! !!! ! !! !! ",
" !! !!! !! !!!! !! !!!! ",
" !! !!! !! !!!!! !! !! ",
" !! !! !! !!!!! !!! ",
" !! ! !! !!!!!!!!! ",
" !! !!! !! !!!!! !! ",
" !! !! !! !!!!! !! ",
" !! !! !!!!!!!!! ",
" !! !! !!!!! !!!! ",
" !!! !! !! !!!!! !!! ",
" !! ! !! !!!!!!!!!!! ",
" !! !! !!!!! !!!! ",
" !! ! !! !!!!!! !!!! ",
" !! !!! !!!! !! !!!!!! !!!! ",
"!!! !!! !!!!!!!! !! ! !!! !!!! ",
"!! !!! !!! !!!! !! !!!!!! !!!! ",
"! !!!!!! !!!!! !!!! !! !!!!!! !!!! ",
"! !! !!! !!! !!!! !!!! !! !! !!!!!! ! ",
" ! !!!!! !! !!!!!!!! !!!! !! !!!!!! !!!! ",
" !! !!! !!!!!!!!!!!!!! !!!! !! !! !!!! !!!! ",
"!!!!!! !!!!! !!!!! !!!! !! !! ! !!!! ",
" !!!! !!!! !!!!!!! !!!!!! !!! !! !!!!!! !! ",
"!!!! !!! !!!!!!!!!! !!!!!! !! !! !! !!!! !! ",
"!!! !!! !!!! !!! !! !!! !! !! !!!! !!!! ",
"!! !!! !!! !!!!! !! !! !! !! !! !! !!!! !! ",
"! !!!! !! !!!!!!!! !! !! ! !! !! !! !!!! ! ",
" !!!! !! !!! !!! !! !!!!!! !!!! !! ! !! ",
"!!!! !! !!! !!! !! !!!!!! !! !! !!!! !! ",
"!!! !!! !! !!! !!!!!! !! !!!! !! !!!! ",
" !! !! !! !! !!!!!! !!!! !! !!!! !! ",
"!! !! !! !! !!!! !!!!! !!!! !! !! ",
"!!!! !!! !! !!!! !! !! !! !!!! ",
" !! !! !! !! !!!!! !!!!! !! !! ",
" ! !! !!!!!!! !!!!!! !!!!! ! ",
" !! !! !!!!! !!!!! !! ",
" ! !! !!!!! !!!!! !! ",
" !! !!!!!!!!!!! !!! ",
"!!!! !!! !! !!!! !! !! !! !!!!!! ",
" !! !! !! !! !!!!! !!!!! !! !!!! ",
" ! !! !!!!!!! !!!!!! !!!!!!! ! ",
" !! !! !!!!! !!!!! !!!! ",
" ! !! !!!!! !!!!! !! ! ",
" !! !!!!!!!!!!! !!!!! ",
" !! !!!!!!!!! !!! ",
" !! !!! !!! !!! ",
" !! !!!!! !!! ",
" !! !!! ",
" !!!!!!! ",
" !!!! ",
" ",
" !!!! !!!!! !!!!! ",
" !! !! !!! ! ",
" !!!!!!!!!!!! ",
" !!!!!!!! !! ",
" ! !! !! ",
" ",
" ",
" ",

BIN
tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-1.0-agg-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 32 KiB

BIN
tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-1.0-cairo-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 32 KiB

BIN
tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-2.0-agg-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 38 KiB

BIN
tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-2.0-cairo-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 38 KiB

4
tests/visual_tests/styles/line-pattern-smooth-and-offset.xml
View file

@ -3,7 +3,7 @@
<Style name="style">
<Rule>
<LineSymbolizer stroke="yellow" stroke-width="6" offset="30" smooth="1"/>
<LineSymbolizer stroke="yellow" stroke-width="6" offset="30" smooth="1" simplify="50000" simplify-algorithm="visvalingam-whyatt"/>
<LineSymbolizer stroke="orange" stroke-width="6" offset="20" smooth="1"/>
<LineSymbolizer stroke="red" stroke-width="6" offset="10" smooth="1"/>
<LineSymbolizer stroke="green" stroke-width="6" offset="0" smooth="1"/>
@ -11,6 +11,8 @@
<LineSymbolizer stroke="purple" stroke-width="6" offset="-20" smooth="1"/>
<LinePatternSymbolizer file="../../data/svg/octocat.svg" opacity=".1" comp-op="multiply" transform="scale(.05)" offset="30" smooth="1"/>
<LinePatternSymbolizer file="../../data/svg/octocat.svg" opacity=".1" comp-op="multiply" transform="scale(.05) rotate(90)" offset="-20" smooth="1"/>
<TextSymbolizer placement="line" size="14" simplify="50000" simplify-algorithm="visvalingam-whyatt" halo-radius="1" character-spacing="3" spacing="25" face-name="DejaVu Sans Book" dy="10" smooth="1">'offset • +10'</TextSymbolizer>
<TextSymbolizer placement="line" size="14" halo-radius="1" character-spacing="3" spacing="25" face-name="DejaVu Sans Book" dy="-18" smooth="1">'offset • -18'</TextSymbolizer>
</Rule>
</Style>