Commit graph

242 commits

Author SHA1 Message Date
Jordan Hollinger
08ea56996a Add shield symbolizer support in group symbolizer processing.
Update some test cases to use ShieldSymbolizer instead of point and text.
2014-02-25 08:53:35 -05:00
Jordan Hollinger
07dc6e37a2 Merge branch 'expr-v2' of github.com:mapnik/mapnik into expr-v2-group-symbolizer
Conflicts:
	include/mapnik/attribute_collector.hpp
2014-02-18 18:22:01 -05:00
Jordan Hollinger
bbd2cfd40f Grid renderer implementation for group symbolizer.
This uses common process_group_symbolizer for most of the work.
Add reference grids for visual tests.
2014-02-18 16:37:41 -05:00
Matt Amos
7e25a220a8 Implement debug symbolizer for Cairo. Update tests for debug symbolizer.
Debug symbolizer is useful, and used in a bunch of tests. This
adds debug symbolizer support for Cairo to make it closer to the
capabilities of AGG.

Adding debug symbolizer for Cairo meant that red boxes appeared in
many of the visual test outputs. This commit replaces them with
the output, after visual inspection. They should now be closer to
the output of the AGG test cases.
2014-02-18 15:53:55 -05:00
Matt Amos
44e69e9b05 Cairo renderer implementation of group symbolizer.
This uses the renderer_common header to do most of the heavy
lifting, but otherwise is very similar to the AGG renderer
implementation.

Add cairo ref images for group symbolizer tests.
2014-02-18 15:45:11 -05:00
Matt Amos
f8097748a4 Added more tests for group symbolizer.
The first test shows how an obstacle under the group being displayed
will cause the whole group to not display. Above is an replica of
the same layout using non-grouped symbolizers, which shows that
only the parts which intersect the obstacle will not be drawn.

The second is a line placement test, which just tests placement
of groups on a line with variable spacing.

The third is a test of repeat key in group symbolizer.
The test shows two items with different repeat keys ("foo" and "bar")
and rows of other group symbolizers sensitive to either one. The
reference images show that the "bar"-sensitive rows are displaced
by the "bar" item, but not the "foo" item.
2014-02-18 15:06:40 -05:00
Matt Amos
efc29649ab Added test for group symbolizer, fixed segfault.
Segfault was due to `glyph_position` structs keeping a pointer to
`glyph_info` objects which went out of scope at a different time.
The (rather ugly) fix for the moment is to copy that information
into the thunk object.
2014-02-18 14:06:05 -05:00
Matt Amos
0ad3441b68 Update tests affected by alignment change.
These are mostly text affected because it is multi-line. The
"lines-5" test case text is improved - it lines up now. The
"line-offset" test case is not multi-line, but the differences
appear to be minimal.
2014-01-28 20:42:15 +00:00
Matt Amos
17626d5501 Added visual test for multi-line label alignment.
Calculation of label alignment in multi-line labels seems to be
off. This test reproduces it by laying out a series of multi-line
labels along an S-shaped curve. In all these cases, the vertical
bar character should, to within a few pixels, line up. The
orientation at sharper corners is still a little off, but likely
due to discontinuities.
2014-01-28 19:10:04 +00:00
Dane Springmeyer
17434992d1 update a few expected visual tests 2014-01-22 22:58:41 -08:00
Dane Springmeyer
7520c15e86 Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 2014-01-22 20:48:07 -08:00
Dane Springmeyer
047373772d update a few expected test images 2014-01-22 20:46:18 -08:00
Dane Springmeyer
98f923b9b6 Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
	tests/visual_tests/test.py
2014-01-17 20:04:30 -08:00
Dane Springmeyer
49aadae244 Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
	tests/visual_tests/test.py
2014-01-17 20:04:09 -08:00
Dane Springmeyer
66d8885828 enable further test 2014-01-17 20:03:30 -08:00
Dane Springmeyer
8e30ae8160 one more test for #2023 2014-01-17 19:55:43 -08:00
Dane Springmeyer
9a312958ef tests for #2023 2014-01-17 19:46:47 -08:00
Matt Amos
eacdff2f7d Added test for markers compared with points.
Both are rendering the same SVG marker, at the same size. The
output should (and does, for Cairo & Grid renderers) look like
identical rows of spots. But the AGG one does not.

This is an attempt to create a test case for issue #2117.
2014-01-02 18:51:01 +00:00
Dane Springmeyer
cb27237e71 visual tests: fix rendering of khmer, malayalam, and bengali tests 2013-12-02 22:47:04 -08:00
Dane Springmeyer
a46d409898 visual tests: re-enable and update malayalam, bengali, and khmer renderings 2013-12-02 22:35:11 -08:00
Dane Springmeyer
1b71a91668 update expected test grids post #2087 2013-11-22 00:47:47 -08:00
Dane Springmeyer
20a99999dd update expected test images post #2087 2013-11-22 00:47:43 -08:00
Dane Springmeyer
64d5153aea Improved support for international text
- Implementation by @herm for GSOC 2012 (http://mapnik.org/news/2012/10/06/gsoc2012-status9/)
 - C++11 port, improvements, optimizations by @artemp
 - Testing and integration with master by @springmeyer
 - Thank you to all the support from @behdad along the way
 - Thanks for help testing @toton6868, @stephankn, @nirvn, @mfrasca, @simonsonc and many others

Refs: #2073,#2070,#2038,#2037,#1953,#1820,#1819,#1714,#1634,#1547,#1532,#1319,#1208,#1154,#1146
2013-11-22 00:06:32 -08:00
Dane Springmeyer
73faa94306 tests: smaller font sizes and ensure labels are on top 2013-11-08 18:41:00 -08:00
Dane Springmeyer
08fa9fd8ec Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
	bindings/python/mapnik_building_symbolizer.cpp
	bindings/python/mapnik_debug_symbolizer.cpp
	bindings/python/mapnik_line_pattern_symbolizer.cpp
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_markers_symbolizer.cpp
	bindings/python/mapnik_point_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
	bindings/python/mapnik_python.cpp
	bindings/python/mapnik_raster_symbolizer.cpp
	bindings/python/mapnik_shield_symbolizer.cpp
	bindings/python/mapnik_symbolizer.cpp
2013-11-07 09:21:05 -08:00
Dane Springmeyer
0250538149 add support for geometry-transform in pattern symbolizers - closes #2065 2013-11-05 16:40:09 -08:00
Dane Springmeyer
b08908b5f4 tests: no need to reference khmer font directory for bug2037 2013-11-04 21:06:32 -08:00
Dane Springmeyer
f998b2bda6 Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
	deps/agg/build.py
	deps/clipper/build.py
	include/mapnik/feature_style_processor_impl.hpp
	plugins/input/csv/csv_datasource.cpp
2013-11-03 23:10:21 -08:00
Dane Springmeyer
6bbd8210f8 add more test files - amends 9886d84 - refs #2052 2013-10-30 12:00:57 -07:00
Dane Springmeyer
9886d844fe Add a testcase to capture change in src_over compositing - refs #2052 and #1452 2013-10-30 11:59:57 -07:00
Dane Springmeyer
0d58a8aee4 merge with 2.3.x 2013-10-28 14:45:52 -07:00
Dane Springmeyer
a5926e70b2 tests: lessen strictness of cairo comparison tests so that files created on ubuntu saucy/os x pass on ubuntu precise - refs #1868 2013-10-28 14:18:44 -07:00
Dane Springmeyer
9755296091 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-10-24 00:00:53 -07:00
Dane Springmeyer
adabe3022d add harfbuzz branch testcases 2013-10-23 23:59:14 -07:00
Dane Springmeyer
bb3e38ebb3 add missing expected test images 2013-10-23 14:03:53 -07:00
Dane Springmeyer
ddf2226b6f merge with branch 2.3.x 2013-10-05 15:37:29 -07:00
Dane Springmeyer
805be3daa5 tests: add visual test using multiple blurs 2013-10-03 17:52:52 -07:00
Dane Springmeyer
0224ce3019 add support for seamless blurring - closes #1478 2013-10-03 16:37:09 -07:00
Dane Springmeyer
e276d8fe35 enable new test 2013-10-03 16:32:38 -07:00
Dane Springmeyer
de45801a37 Add visual test of multiple chained image filters 2013-10-03 16:32:15 -07:00
Dane Springmeyer
f9e630bbd3 Merge remote-tracking branch 'origin/2.3.x' 2013-10-02 18:23:09 -07:00
Dane Springmeyer
c34c8a568f merge with branch 2.3.x 2013-09-30 13:33:28 -07:00
Dane Springmeyer
8ebd804360 remove tabs 2013-09-30 13:30:16 -07:00
Dane Springmeyer
82e1b37281 allow single color colorize-alpha 2013-09-27 16:11:23 -07:00
Dane Springmeyer
70976695d8 fixed test images after f4c3620d67 2013-09-27 15:29:53 -07:00
Dane Springmeyer
f4c3620d67 protect against invalid memory access if agg gradient lookup fails to build 2013-09-27 15:24:33 -07:00
Dane Springmeyer
423a8007ba another colorize-alpha test - this one likely exposing a bug - refs #1371 2013-09-27 15:14:58 -07:00
Dane Springmeyer
2287b0a7b9 move colorize-alpha to visual test suite - refs #1371 2013-09-27 14:49:24 -07:00
Dane Springmeyer
2010f5f1d9 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-09-26 20:08:01 -07:00
Dane Springmeyer
68ff3ceead add color-to-alpha image-filter - closes #2023 2013-09-26 16:14:40 -07:00