sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7447 commits 112 branches 95 tags 181 MiB
Commit graph

140 commits

Author SHA1 Message Date
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