Commit graph

1158 commits

Author SHA1 Message Date
Dane Springmeyer
6433d9482e Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
	include/mapnik/symbolizer.hpp
	src/agg/agg_renderer.cpp
	src/agg/process_line_pattern_symbolizer.cpp
	src/agg/process_line_symbolizer.cpp
	src/agg/process_polygon_pattern_symbolizer.cpp
	src/agg/process_polygon_symbolizer.cpp
	src/cairo_renderer.cpp
	src/feature_type_style.cpp
	src/grid/process_line_pattern_symbolizer.cpp
	src/grid/process_line_symbolizer.cpp
	src/grid/process_markers_symbolizer.cpp
	src/grid/process_polygon_pattern_symbolizer.cpp
	src/grid/process_polygon_symbolizer.cpp
2014-03-10 00:05:56 -07:00
Oliver Tonnhofer
5dedae4320 testcase for #2170 2014-03-08 19:54:05 -08:00
Dane Springmeyer
21555b51c2 avoid double application of scale_factor - refs #1926 2014-02-27 13:28:25 -08:00
Dane Springmeyer
0d122c9878 update more tests after e49f63730e - refs #1926 2014-02-27 13:28:17 -08:00
Dane Springmeyer
3dd05bd171 support scale_factor in geometry-transform translate and scale - refs #1926 2014-02-27 13:28:03 -08:00
Dane Springmeyer
277ae93d2c make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165
Conflicts:
	src/agg/agg_renderer.cpp
2014-02-27 11:17:09 -08:00
Dane Springmeyer
14c02e76a7 Merge pull request #2138 from MapQuest/jmh-text-layouts
Multiple text layouts in text symbolizer
2014-02-18 17:59:56 -08: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 #2154 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 #2117 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
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
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 #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
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 #2090 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