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

8086 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dane Springmeyer
f058a481b7 minor whitespace fixes 2013-09-18 19:55:02 -07:00
Dane Springmeyer
69cdca27a2 merge with master 2013-09-18 19:54:49 -07:00
Dane Springmeyer
111bdccebc various post-merge fixes 2013-09-18 19:51:14 -07:00
Dane Springmeyer
5cd2152866 fix failing halo rendering visual tests 2013-09-18 19:50:30 -07:00
Dane Springmeyer
ee2378a6d2 port minor fixes around type handling from c++11 branch 2013-09-18 19:50:04 -07:00
Dane Springmeyer
b2d1363011 remove expression optimizer for now since it is currently unused - refs #1002 2013-09-18 19:19:41 -07:00
Dane Springmeyer
fc2280ffcf merge with master 2013-09-18 19:13:13 -07:00
Dane Springmeyer
6496a44465 drop boost::interprocess::bufferstream and optimized wkb output 2013-09-18 19:12:14 -07:00
Dane Springmeyer
d3d750ebf7 merge with master 2013-09-18 19:06:11 -07:00
Dane Springmeyer
30c8ca5f66 minor formatting to sync cleaner with master 2013-09-18 19:04:44 -07:00
Dane Springmeyer
9770985ead port box2d cleanups from c++11 branch to master 2013-09-18 19:04:20 -07:00
Dane Springmeyer
9811a946f5 Fix whitespace 2013-09-18 18:50:12 -07:00
Dane Springmeyer
d79ecf882f merge with master 2013-09-18 18:49:32 -07:00
Dane Springmeyer
7a6ab9b0ed sync a few files with master 2013-09-18 18:47:44 -07:00
Dane Springmeyer
7070856f9c fix clipping test and drop rule cache tests 2013-09-18 18:47:28 -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
Dane Springmeyer
722aa4ae14 python: add support for __geo_interface__ - closes #2009 2013-09-18 16:08:34 -07:00
Dane Springmeyer
ebf9dd39d4 be explicit about inlining feature.hpp methods 2013-09-18 14:59:06 -07:00
Dane Springmeyer
519fd16535 fix webp images tests 2013-09-18 14:58:47 -07:00
Dane Springmeyer
9f5b7f3fb0 improve the c++ and python demo apps to conditionally output image formats 2013-09-18 14:32:43 -07:00
Dane Springmeyer
12395eb1cd merge 2013-09-18 14:07:24 -07:00
Dane Springmeyer
d4d5b617d2 re-enable miniz 2013-09-18 14:06:46 -07:00
Dane Springmeyer
33766e9370 merge with master 2013-09-18 13:56:23 -07:00
Dane Springmeyer
580ad4fb07 viewer: leverage mapnik-config --cxx for QMAKE_CXX and QMAKE_LINK 2013-09-18 12:32:08 -07:00
artemp
4143d52c16 + more realistic clipping benchmark 2013-09-17 11:59:38 +01:00
artemp
c6a093f55a + fix bench : iterate over clipped path 2013-09-16 15:02:58 +01:00
artemp
ec0bdb21ad Merge branch 'geometry-types' into c++11 2013-09-16 14:18:22 +01:00
artemp
95026329ce + fix err message typo 2013-09-16 10:40:48 +01:00
artemp
ac8a0f01eb c++ style : std::map 2013-09-16 10:39:52 +01:00
artemp
23b1948c6e + minor tweaks 2013-09-16 10:03:54 +01:00
Dane Springmeyer
2ecef415cd update changelog 2013-09-15 23:24:01 -07:00
Dane Springmeyer
6bfbb53eac optimized WKTReader for parsing WKT into geometry paths 2013-09-15 23:23:43 -07:00
Dane Springmeyer
3c69c42a3b update changelog after 1dd1275 2013-09-15 23:18:33 -07:00
Dane Springmeyer
1dd12755c6 optimize expression evaluation of text by avoiding extra copy 2013-09-15 23:18:11 -07:00
Dane Springmeyer
d3ab601e30 integrate various minor c++ style and cast fixes into master from c++11 branch 2013-09-15 23:08:04 -07:00
Dane Springmeyer
b6040ac324 correct return type from std::string::substr 2013-09-15 21:12:12 -07:00
David Marteau
7495d2f381 [mappy] Parallel feature requests supports - PostGIS async requests 2013-09-11 14:04:10 +02:00
artemp
b690015d63 Merge branch 'master' into c++11 2013-09-09 12:32:47 +01:00
Dane Springmeyer
f3b864541c Merge branch 'master' of github.com:mapnik/mapnik 2013-09-05 12:41:06 -07:00
Dane Springmeyer
0719d320e0 add mention of background-image-opacity and background-image-comp-op to changelog - refs #1966 2013-09-05 12:40:41 -07:00
Dane Springmeyer
c5dd5487a5 Merge pull request #1966 from mapnik/background-image-comp-op 
Map background-image-comp-op and background-image-opacity
 2013-09-05 12:25:47 -07:00
Dane Springmeyer
f60e1f01c1 more 2.3.x changelog updates 2013-09-05 12:19:17 -07:00
Dane Springmeyer
d6e4882939 more changelog additions 2013-09-05 12:11:16 -07:00
Dane Springmeyer
7392beb491 further develop 2.3.0 changelog 2013-09-05 11:29:12 -07:00
artemp
d4b9a48cb1 + geometry::types Exterior/Interior polygon loops 2013-09-03 12:15:31 +01:00
artemp
4ea16b596e Merge branch 'master' into c++11 2013-09-02 09:50:59 +01:00
Dane Springmeyer
099936eab6 Merge pull request #1997 from kapouer/patch-1 
Additional optional dependency on librasterlite
 2013-09-01 22:03:23 -07:00
Dane Springmeyer
02f2fbdf8b always link libdl on linux - needed on some systems after #1804 - closes #1998 2013-09-01 22:02:52 -07: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