Commit graph

1102 commits

Author SHA1 Message Date
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 #1991 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 #1986 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 #1973 2013-07-30 15:14:47 -04:00
Dane Springmeyer
2ea353bce0 test_python.py was still broken - actually fix it - refs #1513 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 mapnik/mapnik-support#8 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 #1954 2013-07-24 21:13:46 -04:00
Dane Springmeyer
eaeccc3c3a enforce valid hsla values - refs #1954 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 #1952 2013-07-23 20:00:42 -04:00
Dane Springmeyer
ef4dfeb747 make it possible to disable compilation of grid_renderer - closes #1962 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 #1477 2013-07-19 16:07:12 -04:00
Dane Springmeyer
a141c5c27d webp encoding/decoding support - refs #1955 2013-07-19 01:09:17 -04:00
Dane Springmeyer
db39528231 disable failing test of #1913 for now 2013-07-19 00:39:22 -04:00
Dane Springmeyer
0872061993 renable hsla filter as 'scale-hsla' - refs #1954 2013-07-19 00:37:51 -04:00
Dane Springmeyer
23c5b0f2f7 add test data as followup to 87a2787a40 - refs #916 2013-07-19 00:28:20 -04:00
Dane Springmeyer
87a2787a40 add visual tests for group-by feature - refs #916 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 #1950 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 #1945 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 #1944 2013-07-10 17:25:34 -04:00
Dane Springmeyer
022dd43834 add testcase for #1944 2013-07-10 17:23:17 -04:00
Dane Springmeyer
63a06a9aab fix handling of opacity when rendering svg with cairo - closes #1943 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 #1933 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 #1931 2013-06-28 15:03:55 -04:00
Dane Springmeyer
ba4d06a530 protect against negative image dimensions - closes #1927 2013-06-26 16:46:36 -04:00
Dane Springmeyer
98d21de168 add currently failing test for #1913 2013-06-13 20:20:03 -07:00
Dane Springmeyer
df6e9685d6 add visual test to ensure that #1501 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 #783 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 #1893 2013-06-03 14:58:56 -07:00
Dane Springmeyer
cd220886b2 various sqlite plugin test fixes - closes #1889 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 #1177 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 #1886 - 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 #1859 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 #1868 2013-05-31 14:03:53 -07:00
Dane Springmeyer
513ab16557 add tests for #1806 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 #1642, closes #1859
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 #1872 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 #646 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 #1859, and make note of bug #1873 2013-05-29 13:27:47 -07:00
Dane Springmeyer
1b9c4a63af more null/empty string filter tests - refs #1859 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 #1854 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 #1858 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 #1848 2013-05-21 19:21:35 -07:00
Dane Springmeyer
21fa4d2aed tests: ensure rgb image is truly different that argb - refs #1559 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 #1781 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 #1696 2013-05-16 13:17:48 -07:00
Dane Springmeyer
c84ddc825e convert old tests into proper python tests - closes #1460 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 #1805 - closes #1831 2013-05-13 09:25:05 -07:00
Dane Springmeyer
374e4af8e4 basic tests for tiff writer - refs #1831 2013-05-10 14:34:29 -07:00
Dane Springmeyer
be7c4f2cd5 update the mapnik-config python tests 2013-05-10 13:47:04 -07:00
Dane Springmeyer
48791815a2 Add tests for frombuffer as well - refs #1805 2013-05-09 08:46:46 -07:00
Dane Springmeyer
73f405a2fe commment failing tiff test - refs #1831 2013-05-09 08:45:11 -07:00
Dane Springmeyer
dc2ab8506f Add test for image.fromstring - refs #1805 2013-05-09 15:09:25 +01:00
Dane Springmeyer
db91494461 Add test for image.fromstring - refs #1805 2013-05-08 20:13:20 -07:00
Dane Springmeyer
b8e41d5c8b remove uneeded python imports 2013-05-08 11:18:30 -07:00
Hermann Kraus
24913c4759 Merge pull request #1781 from mapnik/subpixelhalo
Render halos < 1.0 with fast halo algorithm.
2013-04-24 16:23:39 -07:00
artemp
58927b404c c++11
+ replace BOOST_FOREACH with for( : )
+ remove boost/foreach.hpp
+ fix benchmarks (17,18)
2013-04-24 16:40:35 +01:00
Dane Springmeyer
e62126ff48 update expected map-request image - seems valid, not sure when/what changed 2013-04-23 18:34:16 -07:00
Dane Springmeyer
401ca20b32 Merge branch 'master' of github.com:mapnik/mapnik into image-readers-c++11 2013-04-19 11:18:07 -07:00
Dane Springmeyer
1ae236c176 scons: disable special handling of agg test, uneeded except for specific dev 2013-04-19 11:17:43 -07:00
artemp
c73e48fa58 + use std::unique_ptr instead of std::auto_ptr (deprecated!) 2013-04-19 09:50:50 +01:00
artemp
22a1df8388 Merge branch 'master' into image-readers-c++11
Conflicts:
	include/mapnik/factory.hpp
2013-04-18 09:48:31 +01:00
Dane Springmeyer
83eb8f2595 fix handling of null values for feature id in sqlite/postgis input - closes #1817 2013-04-17 15:34:21 -07:00
Dane Springmeyer
8c2d314413 fix visual test reporting to show test that could not be run rather than just 0 2013-04-17 15:33:31 -07:00
Dane Springmeyer
dac0e14068 add test for #1816 2013-04-17 13:40:48 -07:00
Dane Springmeyer
0a68f66c35 fixup postgis null comparision tests 2013-04-17 13:40:48 -07:00
artemp
cc5788e9c4 Merge branch 'master' into image-readers-c++11 2013-04-17 10:17:03 +01:00
Sandro Santilli
0ecf7e5728 Add a couple more float to string conversion tests
See #1811
2013-04-17 11:00:27 +02:00
Dane Springmeyer
294b10229e disable the hsla image-filter - not yet ready for primetime 2013-04-16 19:09:40 -07:00
artemp
b9e66c82de + update image_io test to support WEBP 2013-04-16 11:36:23 +01:00
Dane Springmeyer
60eee883e5 Add empty string equality to null test 2013-04-11 16:09:57 -07:00