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
|
818e87dce4
|
update tests
|
2014-04-01 17:34:24 -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 |
|
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 |
|