sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7964 commits 112 branches 95 tags 181 MiB
Commit graph

1227 commits

Author SHA1 Message Date
Dane Springmeyer
811e93cdc4 update visual tests against freetype 2.5.3 2014-03-10 11:38:42 -07:00
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
b1cfe548b0 avoid double application of scale_factor - refs #1926 2014-02-27 13:20:58 -08:00
Dane Springmeyer
f7a0dadf33 update more tests after e49f63730e - refs #1926 2014-02-27 13:08:45 -08:00
Dane Springmeyer
e49f63730e support scale_factor in geometry-transform translate and scale - refs #1926 2014-02-27 11:55:58 -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
4e957c9cac make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165 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 #2138 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 #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
afb287633b update expected test images after fix from #2117 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 #2023 2014-01-17 19:55:43 -08:00
Dane Springmeyer
2a953034f5 one more test for #2023 2014-01-17 19:55:13 -08:00
Dane Springmeyer
9a312958ef tests for #2023 2014-01-17 19:46:47 -08:00
Dane Springmeyer
abfd4e530d tests for #2023 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 #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
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 #1460 2013-11-22 16:41:27 -08:00
Dane Springmeyer
9e192c920d tests: update expected cairo outputs after #2087 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 #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
e5bb5ed8aa backport geojson parsing/generation fixes from master to 2.3.x - refs #2083 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 - #2083 2013-11-21 12:09:55 -08:00
Dane Springmeyer
37341a1282 fix hit_test for lines + add tests - refs #2041 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 #2081 - refs #1390 and #946 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 #2075 2013-11-13 10:45:23 -08:00
Dane Springmeyer
6844863a89 Abort pending postgis connections when exception occurs 
- patch from @abonnasseau
  - closes #2042
  - refs #2069
 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 #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
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 #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
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