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
83c0db36cb
add support for rendering (vs skipping) 3D and 4D postgis geometries like POINTZM, LINESTRINGZM, and POLYGONZM - closes #44
2014-04-09 19:40:14 -04: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
e94876ebe4
Merge pull request #2160 from MapQuest/expr-v2-group-symbolizer
...
Group Symbolizer
2014-04-03 11:52:21 -07: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
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
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
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
c7879755f4
tests: re-enable strict map loading tests
2013-12-02 21:51:24 -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
e5bb5ed8aa
backport geojson parsing/generation fixes from master to 2.3.x - refs #2083
2013-11-21 14:11:47 -08:00
Dane Springmeyer
5c15ba9e86
add tests for geojson empty/null geoms - #2083
2013-11-21 12:09:55 -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
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
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
a5926e70b2
tests: lessen strictness of cairo comparison tests so that files created on ubuntu saucy/os x pass on ubuntu precise - refs #1868
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 #2031
2013-10-28 12:46:44 -07:00
Dane Springmeyer
adabe3022d
add harfbuzz branch testcases
2013-10-23 23:59:14 -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 #1964
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
9aa596401a
rename the agg int overflow test so it actually runs under nose
2013-10-02 09:41:05 -07: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 #2000
2013-10-01 21:21:55 -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
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
41e68820c5
python: test loading and saving visual test xml files as well
2013-09-25 13:08:10 -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 #2019
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 #1995 - refs #1452 and 5e84ce0
2013-09-20 13:37:34 -07:00
Dane Springmeyer
f058a481b7
minor whitespace fixes
2013-09-18 19:55:02 -07:00
Dane Springmeyer
722aa4ae14
python: add support for __geo_interface__ - closes #2009
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
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
Dane Springmeyer
c5dd5487a5
Merge pull request #1966 from mapnik/background-image-comp-op
...
Map background-image-comp-op and background-image-opacity
2013-09-05 12:25:47 -07: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
Petr Dlouhý
1e9ee87fce
add LinePatternSymbolizer offset python binding
2013-08-22 12:56:04 +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
78b4980352
finish exposing mapnik.Feature.from_geojson
2013-07-30 15:45:46 -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
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
a141c5c27d
webp encoding/decoding support - refs #1955
2013-07-19 01:09:17 -04:00
Tom Hughes
6f0e4daf52
Avoid rounding errors comparing envelopes
2013-07-11 18:32:54 +01: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
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
Dane Springmeyer
ba4d06a530
protect against negative image dimensions - closes #1927
2013-06-26 16:46:36 -04:00
Dane Springmeyer
ef15c45e65
json->geojson
2013-06-13 13:34:34 -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
cd220886b2
various sqlite plugin test fixes - closes #1889
2013-06-03 14:15:27 -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
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
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
eba62d3c56
be more explicit about ctor kwargs for python datasource tests
2013-05-30 09:16:03 -07:00
Dane Springmeyer
7da0028ed9
load map assertions were not working, fix them
2013-05-29 14:11:28 -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
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
