Dane Springmeyer
9e9747ffad
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
src/agg/process_building_symbolizer.cpp
src/cairo_context.cpp
src/cairo_renderer.cpp
src/grid/process_building_symbolizer.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.png
tests/python_tests/images/support/marker-text-line-scale-factor-10.png
tests/python_tests/images/support/marker-text-line-scale-factor-100.png
tests/python_tests/images/support/marker-text-line-scale-factor-2.png
tests/python_tests/images/support/marker-text-line-scale-factor-5.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/test.py
2014-04-24 21:44:28 -07:00
Dane Springmeyer
67357568a5
move line rendering tests to visual tests
2014-04-24 21:00:00 -07:00
Dane Springmeyer
cc855ac7e2
update expected visual tests - 39737c5f1d accidentaly overwrote some using 2.3.x code
2014-04-24 19:16:00 -07:00
Dane Springmeyer
39737c5f1d
Merge branch '2.3.x' of github.com:mapnik/mapnik
...
Conflicts:
.travis.yml
CHANGELOG.md
bindings/python/build.py
include/mapnik/feature_style_processor_context.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/json/feature_collection_grammar.hpp
include/mapnik/json/feature_collection_parser.hpp
include/mapnik/json/feature_generator_grammar.hpp
include/mapnik/json/feature_parser.hpp
include/mapnik/json/geojson_generator.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_parser.hpp
plugins/input/gdal/gdal_featureset.cpp
plugins/input/geojson/geojson_datasource.cpp
plugins/input/occi/occi_featureset.cpp
plugins/input/osm/osm_featureset.cpp
plugins/input/postgis/build.py
plugins/input/postgis/connection.hpp
src/agg/agg_renderer.cpp
src/build.py
src/cairo_context.cpp
src/datasource_cache.cpp
src/grid/process_line_symbolizer.cpp
src/grid/process_polygon_pattern_symbolizer.cpp
src/grid/process_polygon_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
src/json/feature_grammar.cpp
tests/cpp_tests/fontset_runtime_test.cpp
tests/visual_tests/images/collision-600-400-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png
tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png
tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png
tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png
tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png
tests/visual_tests/test.py
2014-04-24 14:50:55 -07:00
Dane Springmeyer
fa745d9e76
update more expected tests - refs #2207
2014-04-09 00:32:45 -04:00
Dane Springmeyer
ca0f3da780
update expected test image - refs #2207
2014-04-08 23:15:49 -04:00
Dane Springmeyer
818e87dce4
update tests
2014-04-01 17:34:24 -07:00
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
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
24805bc500
update expected test image
2014-01-27 13:20:42 -08:00
Dane Springmeyer
047373772d
update a few expected test images
2014-01-22 20:46:18 -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
dc3fad51a3
add test for render_with_detector + fix scale rendering tests - refs #2075
2013-11-13 10:45:23 -08: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
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 #2031
2013-10-28 12:46:44 -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 #1964
2013-10-04 01:03:20 -07:00
Dane Springmeyer
8d79008e9e
move over other colortable test to visual tests
2013-09-25 14:02:52 -07:00
Dane Springmeyer
f05b727bf5
fix dst-over alpha handling - closes #1995 - refs #1452 and 5e84ce0
2013-09-20 13:37:34 -07:00
Dane Springmeyer
519fd16535
fix webp images tests
2013-09-18 14:58:47 -07:00
Dane Springmeyer
1a8287da06
Add support for webp:alpha=false to create rgb images without alpha + other webp encoding cleanups - closes #1986
2013-08-15 14:47:28 -04:00
Dane Springmeyer
a141c5c27d
webp encoding/decoding support - refs #1955
2013-07-19 01:09:17 -04:00
Dane Springmeyer
c84ddc825e
convert old tests into proper python tests - closes #1460
2013-05-16 12:23:19 -07:00
Dane Springmeyer
34708c4df0
throw if scale_factor == 0 instead of hanging and add rendering tests - closes #1100
2013-02-20 18:55:03 -08:00
Dane Springmeyer
ef4ee9efb2
fix tests given new, expected behavior with custom merc<->longlat transformations
2013-01-29 00:55:51 -05:00
Dane Springmeyer
18e23be9c0
merge work from mappy/abonnasseau allowing buffer-size to be overiddend by layer - closes #1566
2013-01-15 18:53:34 -08:00
Dane Springmeyer
be05aa5b60
add palette.to_string() method and add python tests of fixed palette functionality
2012-11-30 12:31:58 -08:00
Dane Springmeyer
3a9dd7724f
add tests and reference images (created at 211b102ec5) for ensuring consistent output of png encoding - refs #1557
2012-11-08 18:51:34 -05:00
Alexandre Bonnasseau
efff5f0ef0
Issue #1545 - override buffer-size parameter at layer level - revised
2012-11-08 15:51:22 +01:00
Dane Springmeyer
dcee6480f6
add test for #1559
2012-11-06 11:16:11 -05:00
Dane Springmeyer
eda4436b51
ensure that the transparency level option is passed to the octree encoder - closes #1556
2012-11-04 06:16:18 -05:00
Mickey Rose
c3702404cb
image_filter: make 'gray' and 'invert' filters honor alpha
2012-10-20 00:08:23 +02:00
Mickey Rose
187ce93a60
tests: add style_level_image_filter test
2012-10-16 18:40:24 +02:00
Mickey Rose
2ee6c1e0e0
tests: add style_level_comp_op test
2012-10-16 18:40:24 +02:00
Dane Springmeyer
df501a2fa3
update tests after #1515 - many are not ideal due to #1519
2012-10-04 16:39:00 -07:00
Dane Springmeyer
7866cc3dec
expose more compositing options in python (the non-agg custom ones) to set up for testing as per #1493 and #1369
2012-10-01 17:41:07 -07:00
Dane Springmeyer
794f5e369a
start moving raster visual tests into place (add new,currently failing tests for raster.input)
2012-09-26 12:01:28 -07:00
Dane Springmeyer
af5f0cb243
fix reference raster images after fixing edge effects as per #1471
2012-09-14 17:02:53 -07:00
Dane Springmeyer
12f26614e5
add failing testcase for #1471 (expected image generated with patch from #1471 that disables premultiplication of data raster before blending)
2012-09-11 19:29:45 -07:00
Dane Springmeyer
116f025e8a
fix expected reprojection output after #1473
2012-09-11 17:04:15 -07:00
Dane Springmeyer
6450d33462
update tests images after change made to agg src_over in #1452 , refs #1369
2012-08-31 18:16:49 -07:00
Dane Springmeyer
769fc8948e
fix test failure after c3dae01055 - refs #1399,#1282, and #1433
2012-08-22 18:17:43 -07:00
Rich Wareham
6867509da8
python plugin: remove Shapely dependency from tests
...
Remove the Shapely dependency by generating the output features directly in WKT format. Update the expected output image
because the circles are now generated directly as 72-sided polygons rather than by buffering a point.
2012-08-18 17:17:14 +01:00
artemp
92eff33433
+ update tests to use Python iterator protocol
2012-08-08 17:31:30 +01:00
Dane Springmeyer
3965e2e9e3
new test image after color burn fixes
2012-08-06 11:40:14 -07:00
