Commit graph

1425 commits

Author SHA1 Message Date
Oliver Tonnhofer
5dedae4320 testcase for 2014-03-08 19:54:05 -08:00
Dane Springmeyer
21555b51c2 avoid double application of scale_factor - refs 2014-02-27 13:28:25 -08:00
Dane Springmeyer
0d122c9878 update more tests after e49f63730e - refs 2014-02-27 13:28:17 -08:00
Dane Springmeyer
3dd05bd171 support scale_factor in geometry-transform translate and scale - refs 2014-02-27 13:28:03 -08:00
Dane Springmeyer
b1cfe548b0 avoid double application of scale_factor - refs 2014-02-27 13:20:58 -08:00
Dane Springmeyer
f7a0dadf33 update more tests after e49f63730e - refs 2014-02-27 13:08:45 -08:00
Dane Springmeyer
e49f63730e support scale_factor in geometry-transform translate and scale - refs 2014-02-27 11:55:58 -08:00
Dane Springmeyer
277ae93d2c make inflated image for blurring opt-in via 'image-filters-inflate' option - refs
Conflicts:
	src/agg/agg_renderer.cpp
2014-02-27 11:17:09 -08:00
Dane Springmeyer
4e957c9cac make inflated image for blurring opt-in via 'image-filters-inflate' option - refs 2014-02-27 10:11:17 -08:00
Jordan Hollinger
533820c63f Merge branch 'expr-v2' of github.com:mapnik/mapnik into expr-v2-group-symbolizer
Conflicts:
	src/text/placement_finder.cpp
	tests/visual_tests/test.py
2014-02-25 14:21:51 -05:00
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
Dane Springmeyer
14c02e76a7 Merge pull request from MapQuest/jmh-text-layouts
Multiple text layouts in text symbolizer
2014-02-18 17:59:56 -08: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
Matt Amos
a25b480593 Python interface for group symbolizer.
Boost::Python interface, and added a test to check that it works.
Looks like it fails at the moment due to other changes - a lot of
the python symbolizer tests show the same thing.
2014-02-18 16:38:58 -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
Stephan Bösch-Plepelits
96e5129c9a Create tests for point-symbolizer, using expressions for parameters
- there are two versions:
  - point-symbolizer-expressions: file
  - point-symbolizer-expressions-all: additionally test
    allow-overlap, opacity, transform, ignore-placement, comp-op
    which are not supported right now
2014-02-11 04:27:36 +01:00
Stephan Bösch-Plepelits
3882707123 Create tests for polygon-symbolizer, using expressions for parameters
- there are two versions:
  - polygon-symbolizer-expressions: fill, fill-opacity, gamma
  - polygon-symbolizer-expressions-all: additionally test
    comp-op which is not supported right now
2014-02-11 04:26:30 +01:00
Stephan Bösch-Plepelits
676e1c7bfc Added grid-reference.json files missing in 79fde58c0e 2014-02-11 03:49:53 +01:00
Jordan Hollinger
e4afefa514 Update text-multi-layout visual tests to demonstrate placement list with layout nodes and layout/format node nesting. Add new images for line-multi-layout tests. 2014-02-10 20:01:35 -05:00
Stephan Bösch-Plepelits
79fde58c0e Create tests for line-symbolizer, using expressions for parameters
- there are two versions:
  - line-symbolizer-expressions: stroke, stroke-width, stroke-opacity, offset
  - line-symbolizer-expressions-all: additionally test
    stroke-dasharray, stroke-linecap, stroke-linejoin, comp-op
    which are not supported right now
2014-02-10 20:02:08 +01:00
Dane Springmeyer
7b75a24111 Merge pull request from mapnik/expr-v2-vt-conv-feature
Expr v2 vt conv feature
2014-02-10 10:44:19 -08:00
Jordan Hollinger
e0125afdae Update test cases. 2014-02-10 09:03:50 -05:00
Jordan Hollinger
d8eda4898e Merge branch 'expr-v2' of github.com:mapnik/mapnik into jmh-text-layouts
Conflicts:
	tests/visual_tests/test.py
2014-02-10 07:38:25 -05:00
Dane Springmeyer
bcde6ae631 Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 2014-02-09 13:27:24 -08:00
Dane Springmeyer
89f72f02e8 pass feature to vertex_converters - refs #2148/#2140 2014-02-08 22:10:14 -08:00
Dane Springmeyer
fa762ce971 now that we only support boost >= 1.47 we can remove older phoenix support 2014-02-07 22:36:33 -08:00
Jordan Hollinger
586bb3b91a Tests for multiple text layout placements. 2014-01-30 07:10:18 -05:00
Dane Springmeyer
f286363ad0 more consistent memset/memcpy usage 2014-01-28 15:05:10 -08: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
944f34b3df Fix unaligned multi-line labels.
This forces offset lines to be aligned to the closest point to
the anchor point on the original line, meaning that they are
aligned where the offset line and original run parallel, or nearly
so.
2014-01-28 20:33:42 +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
5083f3a30e more expected image test updates 2014-01-27 16:28:34 -08:00
Dane Springmeyer
6722ea0394 fixup more image comparison tests and expected results 2014-01-27 14:24:22 -08:00
Dane Springmeyer
beb65664f7 fixup a variety of image comparison tests and expected results 2014-01-27 14:21:07 -08:00
Dane Springmeyer
a98de6a348 Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
	include/mapnik/expression_grammar_impl.hpp
	src/expression.cpp
2014-01-27 13:56:36 -08:00
Dane Springmeyer
24805bc500 update expected test image 2014-01-27 13:20:42 -08:00
Dane Springmeyer
84166882d9 minimum boost version is 1.47 - remove obsolete code handling older versions 2014-01-27 13:19:21 -08:00
Dane Springmeyer
1c16b3797d update expected tests after 2014-01-27 13:18:42 -08:00
Dane Springmeyer
63ea37b4c2 further no terminal port 2014-01-26 14:49:03 -08:00
Dane Springmeyer
cd24a7b877 Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
	tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
2014-01-26 14:12:03 -08:00
Dane Springmeyer
7b58b26df1 catch another addLayer -> add_layer case 2014-01-26 13:51:16 -08:00
Dane Springmeyer
8181aa9dec addLayer -> add_layer (change also coming in expr-v2 branch) 2014-01-26 13:41:30 -08:00
Dane Springmeyer
afb287633b update expected test images after fix from 2014-01-23 11:38:09 -08: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
99bf263afd Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 2014-01-21 21:01:48 -08:00
Dane Springmeyer
5153678876 fix linking order in svg c++ tests
Conflicts:
	tests/cpp_tests/svg_renderer_tests/build.py
2014-01-20 17:45:06 -08:00
Dane Springmeyer
75d5d9fd3c fix linking order in svg c++ tests 2014-01-20 11:07: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 2014-01-17 19:55:43 -08:00
Dane Springmeyer
2a953034f5 one more test for 2014-01-17 19:55:13 -08:00
Dane Springmeyer
9a312958ef tests for 2014-01-17 19:46:47 -08:00
Dane Springmeyer
abfd4e530d tests for 2014-01-17 19:41:17 -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 .
2014-01-02 18:51:01 +00:00
Dane Springmeyer
c02a1c5f04 avoid signed comparison warning in symbolizer test 2013-12-13 06:22:53 -08:00
Dane Springmeyer
6a0e593d87 fix svg_renderer 2013-12-11 07:26:32 -08:00
Dane Springmeyer
eca1c6e46b Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
	src/load_map.cpp
2013-12-09 11:40:55 -08:00
Dane Springmeyer
3212dbe44e add testcase for 2013-12-03 08:20:48 -08: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
c7879755f4 tests: re-enable strict map loading tests 2013-12-02 21:51:24 -08:00
Dane Springmeyer
e9ca9c8790 symbolizer-expressions replayed against latest master 2013-11-27 22:50:15 -08:00
Dane Springmeyer
3e69c337d2 tests: prefer testing png encoded bytes 2013-11-22 16:41:46 -08:00
Dane Springmeyer
529095d739 Actually convert the python tests - finishes 2013-11-22 16:41:27 -08:00
Dane Springmeyer
9e192c920d tests: update expected cairo outputs after 2013-11-22 21:56:19 +00:00
Dane Springmeyer
66347f78e6 rework tests: always run locally 2013-11-22 12:01:02 -08:00
Dane Springmeyer
1b71a91668 update expected test grids post 2013-11-22 00:47:47 -08:00
Dane Springmeyer
20a99999dd update expected test images post 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
e5bb5ed8aa backport geojson parsing/generation fixes from master to 2.3.x - refs 2013-11-21 14:11:47 -08:00
Dane Springmeyer
e4460150d3 merge with branch 2.3.x 2013-11-21 13:23:27 -08:00
Dane Springmeyer
1c56f0dc19 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-11-21 13:09:52 -08:00
Dane Springmeyer
5c15ba9e86 add tests for geojson empty/null geoms - 2013-11-21 12:09:55 -08:00
Dane Springmeyer
37341a1282 fix hit_test for lines + add tests - refs 2013-11-19 20:01:34 -08:00
Dane Springmeyer
03fdf7e596 Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
	src/deepcopy.cpp
	src/expression.cpp
	src/rule.cpp
2013-11-13 20:00:13 -08:00
Dane Springmeyer
5de5ffb764 remove unused and broken deepcopy support to be replaced in - refs and 2013-11-13 19:26:17 -08:00
Dane Springmeyer
d10eb830a2 silence warnings in load_map/save_map tests for now 2013-11-13 18:45:30 -08:00
Dane Springmeyer
dc3fad51a3 add test for render_with_detector + fix scale rendering tests - refs 2013-11-13 10:45:23 -08:00
Dane Springmeyer
6844863a89 Abort pending postgis connections when exception occurs
- patch from @abonnasseau
  - closes 
  - refs 
2013-11-12 18:38:39 -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 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
1cd7a9228c Merge branch '2.3.x' of https://github.com/mapnik/mapnik into 2.3.x 2013-11-03 15:26:50 -08:00
Dane Springmeyer
a656a7af25 tests: fix clipping test on windows by stripping newlines 2013-11-03 15:23:01 -08:00
Dane Springmeyer
6bbd8210f8 add more test files - amends 9886d84 - refs 2013-10-30 12:00:57 -07:00
Dane Springmeyer
9886d844fe Add a testcase to capture change in src_over compositing - refs and 2013-10-30 11:59:57 -07:00
Dane Springmeyer
7612ff7b20 csv plugin: support user defined extent 2013-10-30 11:57:03 -07:00
Dane Springmeyer
1f4160f0f0 topojson: built up knowledge of attributes and geometry type + tests 2013-10-29 00:37:41 -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 2013-10-28 14:18:44 -07:00
Dane Springmeyer
7a153c44cb tests: stop testing cairo postscript output since it is not important 2013-10-28 13:57:34 -07:00
Dane Springmeyer
0978157e92 tests: looser tolerance for comparing cairo output sizes 2013-10-28 13:56:48 -07:00
Dane Springmeyer
7d9392544d xadd more cairo test files, replace existing via ubuntu saucy 2013-10-28 20:39:47 +00:00
Dane Springmeyer
86dfa0778a fix cairo reference counting and add more cairo context tests - closes 2013-10-28 12:46: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
710d558218 scons: simplify linkflags/ldflags setting / attempt to fix 2013-10-22 16:35:46 -04:00
artemp
7adee4ab36 c++11 : remove boost::make_shared includes 2013-10-17 15:09:56 +01:00
artemp
0193b67775 cpp_tests : revive parameters tests 2013-10-09 15:52:53 +01:00
artemp
89586fbdf1 + only extract expected types from mapnik::parameters
aka mapnik::value_xxx types
2013-10-09 15:32:47 +01:00
Dane Springmeyer
ddf2226b6f merge with branch 2.3.x 2013-10-05 15:37:29 -07:00
Dane Springmeyer
5672ad9285 tests: wrap all web tests in try catch to avoid failures with older versions 2013-10-04 14:07:38 -07:00
Dane Springmeyer
cd27e521d4 update webp defaults to use WebPConfigInit 2013-10-04 12:59:47 -07:00
Dane Springmeyer
0c1fcd7098 expose all remaining webp encoding options except for 'show_compression' - refs 2013-10-04 01:03:20 -07:00
Dane Springmeyer
d17f897671 tests: be more explicit about png encoding comparison formats 2013-10-03 23:37:19 -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 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
9c8f7cc90d merge with 2.3.x branch 2013-10-02 18:25:24 -07:00
Dane Springmeyer
f9e630bbd3 Merge remote-tracking branch 'origin/2.3.x' 2013-10-02 18:23:09 -07:00
Dane Springmeyer
9aa596401a rename the agg int overflow test so it actually runs under nose 2013-10-02 09:41:05 -07:00
artemp
77d0ecc459 c++11
remove BOOST_FOREACH
2013-10-02 09:42:03 +01:00
Dane Springmeyer
a25826fb13 tests: use black background in test 2013-10-01 21:35:27 -07:00
Dane Springmeyer
81f14b8d36 Add currently failing test for 2013-10-01 21:21:55 -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
2d1249ef98 gah, completely disable image comparions for webp since versions differ too widely 2013-09-27 17:01:58 -07:00
Dane Springmeyer
619f7ec406 catch one more case of webp needing test workaround for old systems 2013-09-27 16:39:15 -07:00
Dane Springmeyer
06dc054208 skip webp tests that cannot run because expected test images cannot be opened - avoids 'WebPGetInfo failed' error 2013-09-27 16:34:41 -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 2013-09-27 15:14:58 -07:00
Dane Springmeyer
2287b0a7b9 move colorize-alpha to visual test suite - refs 2013-09-27 14:49:24 -07:00
Dane Springmeyer
a2f24e72bd iwyu 2013-09-27 11:52:40 -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 2013-09-26 16:14:40 -07:00
Dane Springmeyer
0f4ba4dfd5 sync with 2.3.x branch 2013-09-25 20:04:31 -07:00
Dane Springmeyer
09544849b9 move colorizer tests to visual suite 2013-09-25 14:08:47 -07:00
Dane Springmeyer
8d79008e9e move over other colortable test to visual tests 2013-09-25 14:02:52 -07:00
Dane Springmeyer
0ffb9ef308 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-09-25 13:14:01 -07:00
Dane Springmeyer
cb80fb8226 move/expand gdal nodata tests to visual suite - refs 2013-09-25 13:13:18 -07:00
Dane Springmeyer
41e68820c5 python: test loading and saving visual test xml files as well 2013-09-25 13:08:10 -07:00
Dane Springmeyer
681f8853d3 pull in changes from master 2013-09-24 22:57:01 -07:00
Dane Springmeyer
2c46300f61 remove dead code (colorize-alpha is now officially an image-filter) 2013-09-24 17:18:14 -07:00
Dane Springmeyer
8ca8b2c64e fix winding order, allowing boost::polygon clipper to return exterior/interior rings correctly 2013-09-24 15:24:18 -07:00
Dane Springmeyer
ad979a85a9 integrate async test into main postgis tests 2013-09-23 15:12:42 -07:00
Dane Springmeyer
5c020cf28f cleanup postgis async test 2013-09-23 14:52:46 -07:00
Dane Springmeyer
75d88f3370 Merge branch 'master' of github.com:mapnik/mapnik into Mappy-master-async-postgis 2013-09-23 14:31:55 -07:00
Dane Springmeyer
da4e6540d6 test: test to_geojson output to prevent regressions like 2013-09-23 12:20:40 -07:00
Dane Springmeyer
780d6a459d Merge branch 'master' of github.com:mapnik/mapnik into Mappy-master-async-postgis 2013-09-22 22:08:23 -07:00
Dane Springmeyer
f05b727bf5 fix dst-over alpha handling - closes - refs and 5e84ce0 2013-09-20 13:37:34 -07:00
Dane Springmeyer
da226a48cf add test data for 2013-09-20 13:35:54 -07:00
Dane Springmeyer
4713ddf8d6 reduced testcase for - refs and 2013-09-20 13:31:11 -07:00
artemp
b315eb2167 + use std::shared_ptr and std::make_shared 2013-09-20 14:01:27 +01:00
Dane Springmeyer
9df4deac73 consistent use of agg::rgba8_pre to construct premultiplied colors - refs 2013-09-19 19:41:46 -07:00
Dane Springmeyer
5b78b6b2dc fix 2013-09-19 19:19:11 -07:00
Dane Springmeyer
d054d47884 Add new test images - refs 2013-09-19 19:16:46 -07:00
Dane Springmeyer
2ccbdb101c add testcase for building fill-opacity premultiplied alpha bug - refs 2013-09-19 19:15:32 -07:00
Dane Springmeyer
f058a481b7 minor whitespace fixes 2013-09-18 19:55:02 -07:00
Dane Springmeyer
69cdca27a2 merge with master 2013-09-18 19:54:49 -07:00
Dane Springmeyer
d79ecf882f merge with master 2013-09-18 18:49:32 -07:00
Dane Springmeyer
d2f50a0158 no need to define BOOST_SPIRIT_USE_PHOENIX_V3 in each header, it is now set in SConstruct 2013-09-18 18:27:04 -07:00
Dane Springmeyer
722aa4ae14 python: add support for __geo_interface__ - closes 2013-09-18 16:08:34 -07:00
Dane Springmeyer
519fd16535 fix webp images tests 2013-09-18 14:58:47 -07:00
Dane Springmeyer
33766e9370 merge with master 2013-09-18 13:56:23 -07:00
artemp
ec0bdb21ad Merge branch 'geometry-types' into c++11 2013-09-16 14:18:22 +01:00
Dane Springmeyer
6bfbb53eac optimized WKTReader for parsing WKT into geometry paths 2013-09-15 23:23:43 -07:00
David Marteau
7495d2f381 [mappy] Parallel feature requests supports - PostGIS async requests 2013-09-11 14:04:10 +02:00
artemp
b690015d63 Merge branch 'master' into c++11 2013-09-09 12:32:47 +01:00
Dane Springmeyer
c5dd5487a5 Merge pull request from mapnik/background-image-comp-op
Map background-image-comp-op and background-image-opacity
2013-09-05 12:25:47 -07:00
artemp
d4b9a48cb1 + geometry::types Exterior/Interior polygon loops 2013-09-03 12:15:31 +01:00
artemp
4a2f59d9d1 + replace auto_ptr with unique_ptr 2013-08-30 09:49:44 +01:00
artemp
4f4e2b001e Merge branch 'master' into c++11
Conflicts:
	SConstruct
	benchmark/run.cpp
	bindings/python/mapnik_datasource.cpp
	bindings/python/mapnik_feature.cpp
	bindings/python/python_optional.hpp
	include/mapnik/css_color_grammar.hpp
	include/mapnik/expression_grammar.hpp
	include/mapnik/feature.hpp
	include/mapnik/feature_style_processor_impl.hpp
	include/mapnik/image_filter_types.hpp
	include/mapnik/image_util.hpp
	include/mapnik/json/geometry_generator_grammar.hpp
	include/mapnik/json/geometry_grammar.hpp
	include/mapnik/processed_text.hpp
	include/mapnik/tiff_io.hpp
	include/mapnik/util/geometry_svg_generator.hpp
	include/mapnik/util/geometry_wkt_generator.hpp
	include/mapnik/utils.hpp
	include/mapnik/webp_io.hpp
	include/mapnik/wkt/wkt_grammar.hpp
	plugins/input/shape/shape_datasource.cpp
	plugins/input/shape/shapefile.hpp
	src/expression_grammar.cpp
	src/expression_string.cpp
	src/image_util.cpp
	src/json/feature_collection_parser.cpp
	src/json/feature_parser.cpp
	src/miniz.c
	src/symbolizer_helpers.cpp
	src/tiff_reader.cpp
	src/webp_reader.cpp
	tests/cpp_tests/geometry_converters_test.cpp
	tests/cpp_tests/image_io_test.cpp
	tests/cpp_tests/map_request_test.cpp
	tests/python_tests/image_test.py
	tests/visual_tests/test.py
2013-08-30 09:46:09 +01:00
Dane Springmeyer
5e322dbff2 Merge pull request from PetrDlouhy/master
Offset enabled for LinePatternSymbolizer + tests
2013-08-27 15:13:15 -07:00
Dane Springmeyer
4bae8792a6 tests: fix png and web encoding tests to run only if support is available 2013-08-23 15:18:24 -07:00
Dane Springmeyer
d407cfa456 cpp tests: fix test to respect DEFINES 2013-08-23 15:07:45 -07:00
Petr Dlouhý
1e9ee87fce add LinePatternSymbolizer offset python binding 2013-08-22 12:56:04 +02:00
Petr Dlouhý
edf170c428 LinePatternSymbolizer visual test 2013-08-22 12:55:56 +02:00
Dane Springmeyer
1a8287da06 Add support for webp:alpha=false to create rgb images without alpha + other webp encoding cleanups - closes 2013-08-15 14:47:28 -04:00
Dane Springmeyer
e0026f3df2 use icu:: namespace and start isolating icu impl by consistenly using mapnik::value_unicode_string 2013-08-13 18:52:04 -04:00
Dane Springmeyer
78b4980352 finish exposing mapnik.Feature.from_geojson 2013-07-30 15:45:46 -04:00
Dane Springmeyer
13343eb5be workaround c++11 compile error due to ambiguous std::vector::insert usage - closes 2013-07-30 15:14:47 -04:00
Dane Springmeyer
2ea353bce0 test_python.py was still broken - actually fix it - refs 2013-07-30 14:31:29 -04:00
Dane Springmeyer
fad9af5263 add support for applying custom comp_op and opacity when blending map background image into background color at render time - refs 2013-07-25 01:00:38 -04:00
Dane Springmeyer
0ac9c7f4c9 re-write scale-hsla filter to work in doubles, allowing proper clamping at the right time - refs 2013-07-24 21:13:46 -04:00
Dane Springmeyer
eaeccc3c3a enforce valid hsla values - refs 2013-07-24 14:24:33 -04:00
Dane Springmeyer
4f01eb05b1 scons: correctly propagate DEFINES across builds 2013-07-23 20:03:00 -04:00
Dane Springmeyer
32464c5a4b Add expected test images 2013-07-23 20:02:37 -04:00
Dane Springmeyer
e24b894868 add regression test for 2013-07-23 20:00:42 -04:00
Dane Springmeyer
ef4dfeb747 make it possible to disable compilation of grid_renderer - closes 2013-07-23 19:37:25 -04:00
Dane Springmeyer
365572322c tests: disable the negative image test since this makes it hard to run the tests against older mapnik versions that do not have the fix 2013-07-23 18:38:57 -04:00
Dane Springmeyer
a6a16304cc regression test for gdal filter-factor 2013-07-19 18:56:50 -04:00
Dane Springmeyer
4f2e1993bf tests: add a pseudo-tiled test for preventing regression of 2013-07-19 16:07:12 -04:00
Dane Springmeyer
a141c5c27d webp encoding/decoding support - refs 2013-07-19 01:09:17 -04:00
Dane Springmeyer
db39528231 disable failing test of for now 2013-07-19 00:39:22 -04:00
Dane Springmeyer
0872061993 renable hsla filter as 'scale-hsla' - refs 2013-07-19 00:37:51 -04:00
Dane Springmeyer
23c5b0f2f7 add test data as followup to 87a2787a40 - refs 2013-07-19 00:28:20 -04:00
Dane Springmeyer
87a2787a40 add visual tests for group-by feature - refs 2013-07-18 18:35:14 -04:00
Dane Springmeyer
0f8ecc2ed3 scons: static linking on linux needs -dl for executables 2013-07-14 15:17:32 -04:00
Dane Springmeyer
39eee919e5 link mapnik first (needed static linking on linux) 2013-07-14 13:00:53 -04:00
Dane Springmeyer
26af45c40c Add a few expected images 2013-07-12 20:31:32 -04:00
Dane Springmeyer
ef537ac0f3 Accept a few changes to visual test xml via harfbuzz branch - refs 2013-07-12 20:30:56 -04:00
Tom Hughes
6f0e4daf52 Avoid rounding errors comparing envelopes 2013-07-11 18:32:54 +01:00
Dane Springmeyer
9be53df112 Merge pull request from tomhughes/python
Fix numeric truncation issues in python bindings
2013-07-10 16:47:29 -07:00
Tom Hughes
793104204a Numeric return results are now long rather than int 2013-07-10 22:36:38 +01:00
Tom Hughes
e3525ab54f Drop bogus assertion
Comparing to sys.maxint makes little sense as all it is doing is
testing the size of python's integers. The following assertion tests
that we are getting the correct return value anyway.
2013-07-10 22:36:19 +01:00
Dane Springmeyer
86bc7d6c11 fix svg parser to ignore empty groups - closes 2013-07-10 17:25:34 -04:00
Dane Springmeyer
022dd43834 add testcase for 2013-07-10 17:23:17 -04:00
Dane Springmeyer
63a06a9aab fix handling of opacity when rendering svg with cairo - closes 2013-07-10 16:19:28 -04:00
Dane Springmeyer
f31e04ec6c cpp_tests: no need for dynamic_cast 2013-07-04 14:27:33 -04:00
Dane Springmeyer
3e4f4a096e silence warnings 2013-07-02 16:48:16 -04:00
Dane Springmeyer
c011524b67 add mapnik.Image.premultiplied() to query status of pixel premultiplication 2013-07-02 16:01:23 -04:00
Dane Springmeyer
80d9171bd1 fix by ensuring that only tests for valid plugins are run 2013-07-01 10:00:43 -04:00
AJ Ashton
6814834892 Add test for translating geometries 2013-06-28 17:22:31 -04:00
Dane Springmeyer
36814bcb2e add expected (currently failing) test for 2013-06-28 15:03:55 -04:00
Dane Springmeyer
ba4d06a530 protect against negative image dimensions - closes 2013-06-26 16:46:36 -04:00
Dane Springmeyer
98d21de168 add currently failing test for 2013-06-13 20:20:03 -07:00
Dane Springmeyer
df6e9685d6 add visual test to ensure that does not regress 2013-06-13 20:09:24 -07:00
Dane Springmeyer
18fc10cf7d remove trailing command to realy unbreak github rendering 2013-06-13 13:43:39 -07:00
Dane Springmeyer
7f5d162bd3 remove the json comments to unbreak github rendering 2013-06-13 13:40:09 -07:00
Dane Springmeyer
ef15c45e65 json->geojson 2013-06-13 13:34:34 -07:00
Dane Springmeyer
02cd44a142 remove old metawriter testing code 2013-06-13 13:34:12 -07:00
Dane Springmeyer
01a6eb5633 remove uneeded test file 2013-06-13 13:32:20 -07:00
Dane Springmeyer
9ddb1e4c8b comment test that will fail with old gdal because it is not critical functionality to warn about 2013-06-03 15:19:33 -07:00
Dane Springmeyer
b33b6a4add comment test for now - refs 2013-06-03 15:13:12 -07:00
Dane Springmeyer
78dc1a4199 cleanup TODO usage in python tests 2013-06-03 15:02:43 -07:00
Dane Springmeyer
28bdb881f0 remove non-useful test as paths-from-xml will soon be removed - refs 2013-06-03 14:58:56 -07:00
Dane Springmeyer
cd220886b2 various sqlite plugin test fixes - closes 2013-06-03 14:15:27 -07:00
Dane Springmeyer
9d15a2c87d show exceptions at end of run for tests that could not be run 2013-06-03 14:00:51 -07:00
Dane Springmeyer
9768052d97 only test if reader works (to avoid failures for unsupported formats) 2013-06-03 12:36:54 -07:00
Dane Springmeyer
3b2bdba7b0 iwyu 2013-06-02 20:19:33 -07:00
Dane Springmeyer
0365d3e081 start centralizing filesystem operations in mapnik::util::fs - refs 2013-06-02 19:28:24 -07:00
Dane Springmeyer
2457f5f7f4 ensure we only modify logger test for specific tests that should be silenced 2013-06-02 18:40:06 -07:00
Dane Springmeyer
e51c59aacc fix - TODO - refactor base_path logic since it is confusingly written 2013-06-02 16:06:32 -07:00
Dane Springmeyer
c5f01be4e2 only build cpp test if >= boost 1.47 2013-06-02 14:54:27 -07:00
Dane Springmeyer
983cc3c0ec fix postgis tests after null/empty string change - refs 2013-06-02 13:44:58 -07:00
Dane Springmeyer
8ff0c48c64 tests: only show relevant traceback info 2013-06-02 13:41:14 -07:00
Dane Springmeyer
09fac756a9 convert postgis test to run all tests from command line 2013-06-02 13:37:29 -07:00
Dane Springmeyer
592d73a3f3 poor man's solution to 2013-05-31 14:03:53 -07:00
Dane Springmeyer
513ab16557 add tests for 2013-05-31 13:52:24 -07:00
Dane Springmeyer
4f961a04ab ticketize 2013-05-31 13:49:32 -07:00
Dane Springmeyer
88ca6fca5d Followup to , closes
This change adds back the ability to throw out both empty strings
and null values with the not equals statement like `[attr] != ''`

Note: this does not mean null == '' because the needed compatibility
fix only addresses the "not equals` operator to retain the historical
usage of not matching nulls.
2013-05-31 13:23:59 -07:00
Dane Springmeyer
6826920c53 add tests for 2013-05-31 12:11:30 -07:00
Dane Springmeyer
6831f87be8 re-enable all filter tests when run from command line 2013-05-31 11:57:45 -07:00
Dane Springmeyer
af8b5d8e40 fix signed/unsigned comparison warning 2013-05-30 09:19:18 -07:00
Dane Springmeyer
eba62d3c56 be more explicit about ctor kwargs for python datasource tests 2013-05-30 09:16:03 -07:00
Dane Springmeyer
b0f15bf5de avoid muffling proj_init at render time and instead catch at load_map - closes 2013-05-29 15:16:44 -07:00
Dane Springmeyer
97fe52ac04 use a truly invalid expression for the broken text symbolizer test 2013-05-29 15:09:55 -07:00
Dane Springmeyer
7da0028ed9 load map assertions were not working, fix them 2013-05-29 14:11:28 -07:00
Dane Springmeyer
fa362113b3 remove uneeded datasource template usage 2013-05-29 14:11:03 -07:00
Dane Springmeyer
080f500af3 more tests for , and make note of bug 2013-05-29 13:27:47 -07:00
Dane Springmeyer
1b9c4a63af more null/empty string filter tests - refs 2013-05-29 10:35:02 -07:00
Dane Springmeyer
74fd456653 make the mapnik-config test slightly more cross platform 2013-05-25 19:54:53 -07:00
Dane Springmeyer
a41c2205d5 more cpp test cleanup 2013-05-25 18:16:18 -07:00
Dane Springmeyer
738c2e5566 set working dir of map_request.cpp 2013-05-25 18:04:49 -07:00
Dane Springmeyer
3ff290ac07 enable passing working directory to cpp tests that hit the filesystem and expect files to be relative to the mapnik source folder 2013-05-25 17:56:10 -07:00
Dane Springmeyer
5184ef3e42 fix conversions tests on windows 2013-05-25 17:19:54 -07:00
Dane Springmeyer
6844226156 remove an uninteresting cpp test 2013-05-25 17:09:35 -07:00
Dane Springmeyer
37a1c07051 remove uneeded dependence of cpp tests on sqlite 2013-05-25 17:07:08 -07:00
Dane Springmeyer
4bd63ce7a0 iwyu and fix compile on linux 2013-05-25 16:04:40 -07:00
Dane Springmeyer
1211211f98 quiet mode for c++ tests 2013-05-24 17:21:55 -07:00
Dane Springmeyer
b86303202e remove a few seemingly valid pngs that no longer fail with libpng > 1.6 - closes 2013-05-24 16:47:18 -07:00
artemp
d0671098d1 OGR.input
+ set tolerance tol=0.001 in features_at_point test
  older versions of GDAL are not handling empty bounding boxes
  correctly e.g SetSpatialFilterRect(x0,y0,x0,y0)
  tested on ubuntu-12.04/64-bit g++-4.6.3 gdal-1.7.3
2013-05-24 09:32:48 +01:00
Dane Springmeyer
427308d654 postgis test: fix for postgis < 2.x 2013-05-22 17:20:17 -07:00
Dane Springmeyer
5083a24f89 postgis test: ensure threaded test fails early 2013-05-22 17:03:08 -07:00
Dane Springmeyer
dfec39224b renable cairo visual tests if cairo is installed 2013-05-22 15:42:28 -07:00
Dane Springmeyer
4ba061f506 higher threshold for difference between cairo visual tests 2013-05-22 15:10:19 -07:00
Dane Springmeyer
46b3bfb547 fix test behavior with postgis < 2.x 2013-05-22 09:22:47 -07:00
Dane Springmeyer
23878cf03e fix 2013-05-22 09:21:56 -07:00
Dane Springmeyer
1e6e587d60 support running tests without any plugins built 2013-05-21 20:27:00 -07:00
Dane Springmeyer
8634a04938 add support for drawing all geometry verticies with debug symbolizer mode=vertex and expose in python - closes 2013-05-21 19:21:35 -07:00
Dane Springmeyer
21fa4d2aed tests: ensure rgb image is truly different that argb - refs 2013-05-21 14:59:35 -07:00
Dane Springmeyer
9001f59502 overwrite expected cairo output 2013-05-21 08:46:07 -07:00
Dane Springmeyer
a2266f4feb overwrite all trivially failing cairo visual tests from os 10.8 (cairo 1.12.4 / freetype 2.4.11) 2013-05-21 08:46:07 -07:00
Dane Springmeyer
018bdc4f6d fix interplay of point symbolizer/cairo/scale_factor 2013-05-21 08:46:07 -07:00
Dane Springmeyer
b2fc3d7d57 update expected grid outputs 2013-05-21 08:46:07 -07:00
Dane Springmeyer
1d77a3c3c4 finish removal of osm plugin from visual tests 2013-05-21 08:46:06 -07:00
Dane Springmeyer
f06b465cf9 further convert visual tests to use csv plugin over osm 2013-05-21 08:46:06 -07:00
Dane Springmeyer
be31f7ea18 Start moving visual test usage from osm to csv plugin 2013-05-21 08:46:06 -07:00
Dane Springmeyer
866320be14 line clipping drops points so filter osm data to ensure only lines are being used in test 2013-05-21 08:46:05 -07:00
Dane Springmeyer
dee252eb88 ignore grids in html error output 2013-05-21 08:46:05 -07:00
Dane Springmeyer
24e9dd7b6c make visual test failure comparison work with relative image paths 2013-05-20 15:07:20 -07:00
Dane Springmeyer
665b0ef555 raise cairo visual test diff above 0 2013-05-20 13:02:17 -07:00
Dane Springmeyer
c1e94120f9 add more expected test files 2013-05-20 12:50:26 -07:00
Dane Springmeyer
c901f8b46e tests for 1849 2013-05-20 12:50:26 -07:00
Dane Springmeyer
735363c47d Revert "scons: use VariantDir to avoid 'Two environments with different actions' error when building both cpp_tests and with PLUGIN_LINKING=static"
This reverts commit 2393453765.
2013-05-20 11:08:40 -07:00
Dane Springmeyer
2e89e17687 first pass on an html report to view failures 2013-05-17 16:46:42 -07:00
Dane Springmeyer
6af84da0ef update out of date cairo reference images - refs 2013-05-17 15:34:33 -07:00
Dane Springmeyer
2393453765 scons: use VariantDir to avoid 'Two environments with different actions' error when building both cpp_tests and with PLUGIN_LINKING=static 2013-05-17 09:23:10 -07:00
Dane Springmeyer
cd2dd66636 add more box2d multiplication tests 2013-05-16 14:24:25 -07:00
Dane Springmeyer
f665bcb11e xadd expected cairo outputs for lines-shield test (via ubuntu precise) 2013-05-16 20:25:16 +00:00
Dane Springmeyer
71870a47b5 renable lines-shield test and always generate missing reference images - closes 2013-05-16 13:17:48 -07:00
Dane Springmeyer
c84ddc825e convert old tests into proper python tests - closes 2013-05-16 12:23:19 -07:00
Dane Springmeyer
1c03b9fefa update expected grid test 2013-05-16 10:17:26 -07:00
Dane Springmeyer
3436c324e8 only run cairo visual rendering tests if cairo backend is available 2013-05-16 10:16:51 -07:00
Hermann Kraus
d416d17ae9 Reenable Cairo and grid tests. 2013-05-15 15:15:02 +01:00
Hermann Kraus
38b95a12e7 Reenable Cairo and grid tests. 2013-05-15 11:31:32 +03:00
Dane Springmeyer
f7cad30f6c re-enable tiff from string tests - refs - closes 2013-05-13 09:25:05 -07:00