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
Dane Springmeyer
9db18a6ffa
remove uneeded includes
2013-01-11 11:11:34 -08:00
Dane Springmeyer
24cb20051e
iwyu
2013-01-04 00:06:05 -08:00
Dane Springmeyer
fb5b6e5a7c
fix -Wshadow warning
2013-01-03 18:03:26 -08:00
Dane Springmeyer
ec47745abf
fix failing exceptions test which needed a symbolizer added after #1670 and 0d8f415070
2013-01-03 16:25:14 -08:00
Dane Springmeyer
0aa2c491ed
comment failing to_string precision test - refs #1676
2013-01-02 18:09:15 -08:00
artemp
b75b54a787
+ fix bigint support
...
+ fixup cpp tests
2012-12-18 20:34:27 +00:00
artemp
8f9ebe8452
+ remove LL
2012-12-18 18:05:17 +00:00
artemp
a38b252ccd
Merge branch 'master' into bigint
...
Conflicts:
plugins/input/geojson/geojson_datasource.cpp
plugins/input/postgis/postgis_featureset.cpp
2012-12-18 13:57:39 +00:00
Sandro Santilli
e8b7b82bbb
Implement scientific notation for double-to-string
...
Also fixes tests for 1e5 expecting fixed precision rather than
scientific notation (stringstream gives scientific notation indeed)
The only still failing test now is the one having less than 16
significant digits of precision, due to the boost bug:
https://svn.boost.org/trac/boost/ticket/7785
2012-12-17 19:29:44 +01:00
Dane Springmeyer
4040eebf10
catch c++ abort
2012-12-14 13:52:39 -08:00
artemp
9453d93f15
+ update conversion tests to have 0.0 and negative numbers
2012-12-14 19:22:04 +00:00
artemp
c4bae9d30a
Merge branch 'master' into bigint
...
Conflicts:
bindings/python/mapnik_feature.cpp
plugins/input/shape/dbfile.cpp
2012-12-14 10:01:21 +00:00
Artem Pavlenko
e60a3f7703
Merge pull request #1632 from strk/master-float-labels
...
Fix float data conversion to string
2012-12-12 06:21:17 -08:00
Sandro Santilli
9416a57b85
Add test for backward compatibility of double to string conversion
...
The testcase is ready to host more conversion tests but is currently
really only targetting the double-to-string.
refs #430 , #1632
2012-12-11 10:47:01 +01:00
Dane Springmeyer
348eed125e
try/catch in case font_registration test cannot run
2012-12-06 15:15:21 -08:00
artemp
855aea95e0
+ mapnik::value and mapnik::parameters - initial support for 64-bit integers
2012-12-03 13:12:09 +00:00
Dane Springmeyer
f39c3ad857
add marker-multi-policy parameter to support user-configurable rendering behavior for multi-geometries when using either point or interior placement - closes #1573 , refs #1555
2012-11-20 17:58:39 -08:00
Dane Springmeyer
5ef08b557b
fix namespace usage
2012-10-30 19:21:34 -07:00
Dane Springmeyer
858252323c
only link to agg if needed
2012-10-10 10:23:04 -07:00
Dane Springmeyer
e0bcf44874
Add c++ fontset test
2012-10-04 16:35:46 -07:00
artemp
967d6110bf
+ singleton: return ref from instance() method
2012-09-07 16:23:03 +01:00
Dane Springmeyer
449aff6432
comment failing agg blending tests
2012-09-03 10:52:51 -07:00
Dane Springmeyer
bc3c7b4b40
optimize the agg compositing test build
2012-08-31 18:15:56 -07:00
Dane Springmeyer
5e84ce0dfc
agg compositing: change src_over alpha to avoid pixel artifacts by reordering computations and add basic tests comparing src_over composting to normal agg alpha blending - closes #1452 - refs #1313 , #1454 , #1369
2012-08-31 18:04:08 -07:00
Colin Rundel
dc3763885c
More parser clean up - color parser
...
Dropped color_factory class in favor of single color_parser function. Moved implementation to new color_factory.cpp since it is odd to have two headers (color.hpp, color_factory.hpp) and only one source file.
2012-08-29 16:41:48 -04:00
Dane Springmeyer
5120d0398d
add build file for headers and svg/output code directories to hold the svg_renderer used for output - refs #1438
2012-08-27 17:58:49 -07:00
Dane Springmeyer
f4a74d0dde
add a csv_datasource initialization c++ test
2012-08-23 09:10:03 -07:00
Dane Springmeyer
da1f12613e
start a label algorithm c++ test - refs #1425
2012-08-22 13:33:24 -07:00
Dane Springmeyer
e225eaae4b
add c++ test for exceptions
2012-07-20 18:33:14 -07:00
Dane Springmeyer
028b042185
add support for older boost in the cpp tests
2012-05-18 11:17:54 -07:00
Dane Springmeyer
074c28c4bc
avoid assert in cpp tests in debug mode
2012-05-15 11:45:55 -07:00
Dane Springmeyer
e986bce7f6
format c++ tests
2012-04-16 22:33:37 -07:00
Dane Springmeyer
6de1a84949
renable the intentionally broken font test now that there is no log output
2012-04-12 16:09:00 -07:00
Dane Springmeyer
8220acce82
more params tests
2012-04-06 14:20:04 -07:00
Dane Springmeyer
9c3d3ab285
more concise output from c++ tests
2012-04-05 08:35:28 -07:00
Dane Springmeyer
a50ea0750e
compile c++ tests even if only installing and hook them all up automatically to make test target
2012-04-04 15:19:37 -07:00
Dane Springmeyer
46fdc570c2
cpp tests for mapnik parameters and mapnik:boolean -refs #1141
2012-03-23 20:04:42 -07:00
Dane Springmeyer
3b498efbd9
fixup font registration code ensuring invalid fonts will warn but not throw and register_fonts will only return success if > one font is registered and none have failed
2012-03-23 15:07:28 -07:00
Hermann Kraus
52702d3a20
Rename filter_factory to expression.
2012-02-12 13:06:39 +01:00
Artem Pavlenko
14700dba16
switch back from mapnik2 to mapnik
...
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
2011-11-23 11:33:58 +00:00
Dane Springmeyer
87da27e7ac
csv: test for columns that are numbers stored as strings
2011-11-01 20:39:27 -04:00
Dane Springmeyer
d8f19fab05
always link to boost system - closes #931
2011-10-25 19:29:51 -07:00
Dane Springmeyer
22c39d91ba
scons: rename all SConscript files to more friendly name of 'build' with a python extension for quick syntax detection in editors
2011-08-30 05:32:01 +00:00
Dane Springmeyer
3e67c1d694
scons: centralize install path info
2011-08-12 21:31:28 +00:00
Dane Springmeyer
af62ad9c27
scons: collect and propogate the libs used to link libmapnik
2011-08-11 21:11:11 +00:00
Dane Springmeyer
0d0c3cdb09
scons: avoid duplicate libs and pass CUSTOM_LDFLAGS
2011-05-25 20:26:47 +00:00
Dane Springmeyer
52ac7d8d3a
fix spherical mercator proj4 string in tests to always include +over (to avoid proj4 trying to wrap) and +wktext (to ensure apps like ogr/gdal retain +over during conversion through wkt representation)
2011-05-16 23:55:30 +00:00
Dane Springmeyer
1070b293ad
tabs -> spaces
2011-05-04 15:53:36 +00:00
Artem Pavlenko
e580078d26
+ apply MetaWriter patch from zerebubuth
...
( see #735 for details )
2011-03-16 13:32:04 +00:00
Carlos López
83a7b4710e
Fixed a bug that caused half of the vertexes to disappear from the SVG path.
...
+ mapnik::geometry_iterator was replaced by mapnik::svg::path_iterator
+ svg::path_output_grammar was simplified
+ the container for this grammar is now coord_transform2, instead of geometry
+ added typedef size_type to coord_transform2 and removed it from geometry
2011-02-14 03:40:25 +00:00
Artem Pavlenko
98b7f62155
+ remove template from mapnik::rule
...
+ rename globaly rule_type -> rule
( ticket #552 )
2011-01-13 21:35:01 +00:00
Carlos López
e390715c58
Added support for processing multiple symbolizers to svg renderer.
2010-08-10 08:23:02 +00:00
Carlos López
08eec40986
Added test that produces svg file with output from SVG path grammar.
2010-07-28 06:51:24 +00:00