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
|
1e53351467
|
only compile cpp code if cairo/grid/svg renderers are enabled
|
2014-04-24 12:54:18 -07:00 |
|
Dane Springmeyer
|
a93252e569
|
add newlines to avoid pedantic warnings
|
2014-04-24 12:53:28 -07:00 |
|
Dane Springmeyer
|
34771d20dd
|
add newlines to avoid pedantic warnings
|
2014-04-24 12:53:08 -07:00 |
|
Dane Springmeyer
|
e8ee02877d
|
fix OGR plugin error reporting
|
2014-04-22 15:31:19 -07:00 |
|
Dane Springmeyer
|
02d4e7fd06
|
postgis geometry type detection - fall through to detecting type on individual geometries if the geometry_columns only reports 'geometry' - refs mapbox/tilemill/#2099
|
2014-04-22 15:31:06 -07:00 |
|
Dane Springmeyer
|
c4dbcf93bc
|
fix version in code comment
|
2014-04-15 17:26:02 -04:00 |
|
Dane Springmeyer
|
fef45cb22e
|
add #44 to changelog
|
2014-04-09 19:41:02 -04: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
|
d577b0814b
|
remove uneeded asserts in png_io
|
2014-04-09 19:34:13 -04:00 |
|
Dane Springmeyer
|
ecbba52bc0
|
add code comment about curl [skip ci]
|
2014-04-09 09:44:43 -04:00 |
|
Dane Springmeyer
|
1dd481f8f7
|
fallback if pkg-config fails for libcurl or libpq
|
2014-04-09 09:40:40 -04:00 |
|
Dane Springmeyer
|
015bb8d61f
|
travis: fix syntax error
|
2014-04-09 09:22:38 -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
|
cf784f5e29
|
restore agg polygon clipper
|
2014-04-09 00:28:18 -04:00 |
|
Dane Springmeyer
|
ca0f3da780
|
update expected test image - refs #2207
|
2014-04-08 23:15:49 -04:00 |
|
Dane Springmeyer
|
f1dd07fd64
|
fix static linking of the osm plugin against libcurl
|
2014-04-08 23:15:33 -04:00 |
|
Dane Springmeyer
|
7351879e6f
|
Merge pull request #2193 from strk/2.3.x-no-terminate-pgis-dtor
Do not throw in postgis_datasource destruction if backend is down
|
2014-04-04 18:20:59 -07:00 |
|
Dane Springmeyer
|
19349f951f
|
Merge pull request #2194 from strk/master-no-terminate-pgis-dtor
Do not throw in postgis_datasource destruction if backend is down
|
2014-04-04 18:20:28 -07:00 |
|
Dane Springmeyer
|
55ba8d38ae
|
Merge pull request #2182 from strk/2.3.x-all-async
Have all queries use the async interface
|
2014-04-03 23:59:11 -07: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
|
e94876ebe4
|
Merge pull request #2160 from MapQuest/expr-v2-group-symbolizer
Group Symbolizer
|
2014-04-03 11:52:21 -07:00 |
|
Dane Springmeyer
|
ce1ff9902e
|
better linking for postgis.input using pkg-config
|
2014-04-02 13:26:33 -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
|
5fd04e72ef
|
add #2196 change to changelog
|
2014-04-01 17:09:18 -07:00 |
|
Dane Springmeyer
|
e15e64a5a9
|
update test images after bc1c723 - refs #2196
|
2014-03-31 21:26:42 -07:00 |
|
Dane Springmeyer
|
bc1c7234c3
|
drop vertex_dist_epsilon to 1e-5 (could likely even go lower) - refs #2196, #2186
|
2014-03-31 21:22:05 -07:00 |
|
Dane Springmeyer
|
947f7a4b33
|
use COMPUTE_THRESHOLD=0 on os x, update expected test images
|
2014-03-31 21:15:35 -07:00 |
|
Sandro Santilli
|
32680434fe
|
Do not throw in postgis_datasource destruction if backend is down
... and persist_connections is true!
Closes #2191
|
2014-03-26 15:39:53 +01:00 |
|
Sandro Santilli
|
9d04d9fef9
|
Do not throw in postgis_datasource destruction if backend is down
... and persist_connections is true!
Closes #2191
|
2014-03-26 15:35:55 +01:00 |
|
Dane Springmeyer
|
e618a65498
|
fix #2185
|
2014-03-20 16:02:47 -07:00 |
|
Dane Springmeyer
|
68aaec5ac7
|
fix #2185
|
2014-03-20 16:02:08 -07:00 |
|
Dane Springmeyer
|
080b8e174c
|
fixup c++ style in offset_converter
|
2014-03-18 17:31:15 -07:00 |
|
Dane Springmeyer
|
7847c0a7b9
|
travis: start testing clang
|
2014-03-18 15:00:24 -07:00 |
|
Dane Springmeyer
|
83ad5f5a25
|
fix a few g++-4.8 warnings on linux
|
2014-03-18 14:52:41 -07:00 |
|
Dane Springmeyer
|
804c90d46e
|
fix c++11/clang-3.4/linux compile issue - closes #2022
|
2014-03-18 14:17:25 -07:00 |
|
Dane Springmeyer
|
1baeac34c7
|
use make_unique
|
2014-03-18 14:10:02 -07:00 |
|
Dane Springmeyer
|
2e6de5cc97
|
remove unused variables
|
2014-03-18 14:09:44 -07:00 |
|
Dane Springmeyer
|
f59dc36a19
|
attempt to workaround boost 1.49 bug when building in debug - refs #2085
|
2014-03-12 15:44:23 -07:00 |
|
Dane Springmeyer
|
42218b4bae
|
try debug build - refs #2181
|
2014-03-12 15:02:00 -07:00 |
|
Dane Springmeyer
|
6c4ea66509
|
postgis: use max float for no-op bbox token - closes #2158
|
2014-03-12 13:31:45 -07:00 |
|
Dane Springmeyer
|
551718df59
|
postgis: use max float for no-op bbox token - closes #2158
|
2014-03-12 13:31:14 -07:00 |
|
Dane Springmeyer
|
c9e3248cec
|
more auto_ptr usage to avoid bare geometry pointers
|
2014-03-12 13:11:51 -07:00 |
|
Sandro Santilli
|
bf3500d757
|
Have all queries use the async interface
|
2014-03-11 11:10:41 +01:00 |
|