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
|
0e8fa50215
|
update a few expected tests due to differences I presume are related to freetype version
|
2014-04-09 00:42:06 -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
|
103e874f25
|
fix #2202
|
2014-04-03 17:15:57 -07:00 |
|
Dane Springmeyer
|
659772168b
|
add (currently buggy) visual test images for #2202
|
2014-04-03 17:12:18 -07:00 |
|
Dane Springmeyer
|
a5ee9cbcb9
|
add testcase for #2202
|
2014-04-03 16:57:11 -07:00 |
|
Dane Springmeyer
|
2c8cf76808
|
update a few expected tests
|
2014-04-01 19:41:57 -07:00 |
|
Dane Springmeyer
|
af64692dcc
|
visual test threshold of 2 on OS X
|
2014-04-01 18:15:31 -07:00 |
|
Dane Springmeyer
|
818e87dce4
|
update tests
|
2014-04-01 17:34:24 -07:00 |
|
Dane Springmeyer
|
e15e64a5a9
|
update test images after bc1c723 - refs #2196
|
2014-03-31 21:26:42 -07:00 |
|
Dane Springmeyer
|
947f7a4b33
|
use COMPUTE_THRESHOLD=0 on os x, update expected test images
|
2014-03-31 21:15:35 -07:00 |
|
Dane Springmeyer
|
1baeac34c7
|
use make_unique
|
2014-03-18 14:10:02 -07:00 |
|
Dane Springmeyer
|
c9e3248cec
|
more auto_ptr usage to avoid bare geometry pointers
|
2014-03-12 13:11:51 -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 |
|
Dane Springmeyer
|
f286363ad0
|
more consistent memset/memcpy usage
|
2014-01-28 15:05:10 -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
|
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
|
047373772d
|
update a few expected test images
|
2014-01-22 20:46:18 -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
|
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 |
|
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
|
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 |
|