Dane Springmeyer
2c661ed3d5
support for render time variables
2014-05-11 13:08:24 -07:00
Dane Springmeyer
ef837eb92f
c++11 optimizations for faster map loading
2014-04-28 17:10:00 -07:00
Dane Springmeyer
9e9747ffad
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
src/agg/process_building_symbolizer.cpp
src/cairo_context.cpp
src/cairo_renderer.cpp
src/grid/process_building_symbolizer.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.png
tests/python_tests/images/support/marker-text-line-scale-factor-10.png
tests/python_tests/images/support/marker-text-line-scale-factor-100.png
tests/python_tests/images/support/marker-text-line-scale-factor-2.png
tests/python_tests/images/support/marker-text-line-scale-factor-5.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-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-2.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-2.0-agg-reference.png
tests/visual_tests/test.py
2014-04-24 21:44:28 -07:00
Dane Springmeyer
1baeac34c7
use make_unique
2014-03-18 14:10:02 -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
Oliver Tonnhofer
5dedae4320
testcase for #2170
2014-03-08 19:54:05 -08:00
Dane Springmeyer
7b75a24111
Merge pull request #2154 from mapnik/expr-v2-vt-conv-feature
...
Expr v2 vt conv feature
2014-02-10 10:44:19 -08:00
Dane Springmeyer
bcde6ae631
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
2014-02-09 13:27:24 -08:00
Dane Springmeyer
89f72f02e8
pass feature to vertex_converters - refs #2148/#2140
2014-02-08 22:10:14 -08:00
Dane Springmeyer
fa762ce971
now that we only support boost >= 1.47 we can remove older phoenix support
2014-02-07 22:36:33 -08:00
Dane Springmeyer
f286363ad0
more consistent memset/memcpy usage
2014-01-28 15:05:10 -08:00
Matt Amos
944f34b3df
Fix unaligned multi-line labels.
...
This forces offset lines to be aligned to the closest point to
the anchor point on the original line, meaning that they are
aligned where the offset line and original run parallel, or nearly
so.
2014-01-28 20:33:42 +00:00
Dane Springmeyer
a98de6a348
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
include/mapnik/expression_grammar_impl.hpp
src/expression.cpp
2014-01-27 13:56:36 -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
63ea37b4c2
further no terminal port
2014-01-26 14:49:03 -08:00
Dane Springmeyer
cd24a7b877
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
2014-01-26 14:12: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
99bf263afd
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
2014-01-21 21:01:48 -08:00
Dane Springmeyer
75d5d9fd3c
fix linking order in svg c++ tests
2014-01-20 11:07:18 -08:00
Dane Springmeyer
c02a1c5f04
avoid signed comparison warning in symbolizer test
2013-12-13 06:22:53 -08:00
Dane Springmeyer
6a0e593d87
fix svg_renderer
2013-12-11 07:26:32 -08:00
Dane Springmeyer
e9ca9c8790
symbolizer-expressions replayed against latest master
2013-11-27 22:50:15 -08:00
Dane Springmeyer
66347f78e6
rework tests: always run locally
2013-11-22 12:01:02 -08:00
Dane Springmeyer
e4460150d3
merge with branch 2.3.x
2013-11-21 13:23:27 -08:00
Dane Springmeyer
1c56f0dc19
Merge branch '2.3.x' of github.com:mapnik/mapnik
2013-11-21 13:09:52 -08:00
Dane Springmeyer
37341a1282
fix hit_test for lines + add tests - refs #2041
2013-11-19 20:01:34 -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
a656a7af25
tests: fix clipping test on windows by stripping newlines
2013-11-03 15:23:01 -08:00
Dane Springmeyer
710d558218
scons: simplify linkflags/ldflags setting / attempt to fix #2025
2013-10-22 16:35:46 -04:00
artemp
7adee4ab36
c++11 : remove boost::make_shared includes
2013-10-17 15:09:56 +01:00
artemp
0193b67775
cpp_tests : revive parameters tests
2013-10-09 15:52:53 +01:00
artemp
89586fbdf1
+ only extract expected types from mapnik::parameters
...
aka mapnik::value_xxx types
2013-10-09 15:32:47 +01:00
artemp
77d0ecc459
c++11
...
remove BOOST_FOREACH
2013-10-02 09:42:03 +01:00
Dane Springmeyer
c34c8a568f
merge with branch 2.3.x
2013-09-30 13:33:28 -07:00
Dane Springmeyer
a2f24e72bd
iwyu
2013-09-27 11:52:40 -07:00
artemp
b315eb2167
+ use std::shared_ptr and std::make_shared
2013-09-20 14:01:27 +01:00
Dane Springmeyer
69cdca27a2
merge with master
2013-09-18 19:54:49 -07:00
Dane Springmeyer
d2f50a0158
no need to define BOOST_SPIRIT_USE_PHOENIX_V3 in each header, it is now set in SConstruct
2013-09-18 18:27:04 -07:00
artemp
d4b9a48cb1
+ geometry::types Exterior/Interior polygon loops
2013-09-03 12:15:31 +01:00
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
d407cfa456
cpp tests: fix test to respect DEFINES
2013-08-23 15:07:45 -07: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
4f01eb05b1
scons: correctly propagate DEFINES across builds
2013-07-23 20:03:00 -04:00
Dane Springmeyer
a141c5c27d
webp encoding/decoding support - refs #1955
2013-07-19 01:09:17 -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
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
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
c5f01be4e2
only build cpp test if >= boost 1.47
2013-06-02 14:54:27 -07:00
Dane Springmeyer
592d73a3f3
poor man's solution to #1868
2013-05-31 14:03:53 -07:00
Dane Springmeyer
af8b5d8e40
fix signed/unsigned comparison warning
2013-05-30 09:19:18 -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
23878cf03e
fix #1858
2013-05-22 09:21:56 -07:00
Dane Springmeyer
9001f59502
overwrite expected cairo output
2013-05-21 08:46:07 -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
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
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
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
Sandro Santilli
0ecf7e5728
Add a couple more float to string conversion tests
...
See #1811
2013-04-17 11:00:27 +02:00
artemp
b9e66c82de
+ update image_io test to support WEBP
2013-04-16 11:36:23 +01:00
kunitoki
e919e96484
- added testcase for wkb format parser (still to be extended). complement of 4d85cd2c43
2013-04-09 08:38:48 +02:00
Dane Springmeyer
8814994dc4
add test using invalid png which leaks fd when it throws - refs #1783
2013-04-07 23:43:34 -07:00
Dane Springmeyer
b0d3132208
add image io tests for proper error behavior on invalid images - refs #1775
2013-03-25 18:27:41 -07:00
Dane Springmeyer
cc776d9553
update expected test images after fix landed for #1769
2013-03-22 18:12:19 -07:00
Dane Springmeyer
25591cfcbf
replace one more cairo/halo image
2013-03-19 14:24:05 -07:00
artemp
bdf3c59a2c
+ disable failing clipping tests pending different impl
2013-03-15 12:51:31 +00:00
Dane Springmeyer
11e825a045
formatting
2013-03-14 18:33:59 -07:00
Dane Springmeyer
e2c7283522
Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443
2013-03-13 19:49:59 -07:00
Dane Springmeyer
5e1f81d954
clipping test - we do not expect a close path if using line clipper
2013-03-13 15:26:54 -07:00
Dane Springmeyer
96c65979a1
first pass at a lower level set of clipping tests that avoid complexity of wkt and vertex converters - refs #1699
2013-03-07 13:31:32 -08:00
Dane Springmeyer
0aa81e75a7
add missing test file
2013-02-28 12:19:09 -05:00
Dane Springmeyer
00c2ff999d
fix all double to_string conversion failures by using sprintf method in all cases - closes #1741
2013-02-27 10:08:55 -05:00
Dane Springmeyer
ef021e84ad
comment out non-critical failing karma conversion to_string tests, leaving just single important failure - refs #1741
2013-02-27 09:40:16 -05:00
Dane Springmeyer
4d82a97814
implement support in cairo and grid renderer for mapnik::request - refs #1737
2013-02-26 15:05:44 -05:00
Dane Springmeyer
575164afb7
enable cairo in the cpp tests
2013-02-26 15:00:04 -05:00
Dane Springmeyer
00a2f54346
further refine the mapnik::request object which can be passed to custom agg_renderer
2013-02-25 19:33:08 -05:00
Dane Springmeyer
a8599d7c61
remove uneeded default args to projection ctor (also fixes msvc linking)
2013-02-20 10:47:55 -08:00
artemp
730f07fbd6
+ fix #1700
2013-01-24 17:28:32 +00:00
artemp
7c229b457d
+ fix formatting
2013-01-24 13:44:17 +00:00
artemp
57c8b55079
+ add geometry conversions tests (clipping,smothing...)
2013-01-24 13:34:00 +00:00
Dane Springmeyer
ccd9acfecc
default to fast, simple, and correct (per ostringstream) to_string conversions fully removing boost::lexical_cast, disabling karma, and fixing up tests
2013-01-19 10:12:32 -08:00
Dane Springmeyer
1c42f48613
re-enable double conversion test and make expected value match actual which is fine because this is also the behavior of std::ostringstream (tested on OS X with clang++ 3.3) - closes #1676
2013-01-17 16:57:01 -08:00
Dane Springmeyer
bbcd53c6f4
refactor headers involving variant attempting to move as much variant usage out of hpp files to speed up compiles
2013-01-12 21:00:45 -08:00
