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

1089 commits

Author SHA1 Message Date
artemp
be56a61dea + input plugins: don't link to boost_thread 
(python bindings still need boost_thread via thread_specific_ptr usage)
 2013-10-11 15:17:32 +01:00
artemp
582ca02f44 remove unused boost.thread includes 2013-10-11 13:39:39 +01:00
artemp
3edfc69c81 == c++11 
use std::tuple with std::get<>
 2013-10-11 12:36:04 +01:00
artemp
c5763f07d6 == topojson 
+ experimental simplification of arcs (boost::geometry::simplify - DP?)
 2013-10-11 12:34:15 +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
0febcd76ba + pipe-style range adaptors for readability 2013-10-07 11:23:45 +01:00
artemp
b0edff4d11 + skip repeated verticies 2013-10-07 11:14:50 +01:00
artemp
352b8994fc + optimize polygon generation (pre-alloc std::vector) 2013-10-07 10:52:19 +01:00
artemp
e3f18717d3 == topojson == 
support multi geometries
 2013-10-04 15:40:06 +01:00
artemp
56a14368bf cleanup usage 2013-10-03 17:16:21 +01:00
artemp
56174edaa8 == topjson == 
+ extract and transcode property values
 2013-10-03 17:12:33 +01:00
artemp
11fabe0fcb == topojson == 
+ use boost::variant<> for storing properties
+ parse properties as top level key/value pairs
 2013-10-03 15:40:36 +01:00
artemp
ac8ececf1c == topojson == 
+ use boost::variant<> for storing properties
+ parse properties as top level key/value pairs
 2013-10-03 15:32:07 +01:00
artemp
48e65feb62 == topojson == 
+ polygon generator
 2013-10-02 15:14:27 +01:00
artemp
81159bc006 oops -> don't copy topology object 2013-10-01 19:18:05 +01:00
artemp
bfcf356b84 topojson 
+ populate r-tree index
 2013-10-01 17:22:41 +01:00
Dane Springmeyer
c34c8a568f merge with branch 2.3.x 2013-09-30 13:33:28 -07:00
Dane Springmeyer
a6ad3e6627 + avoid copying feature_ptr during r-tree initialisation + avoid taking reference to temporary 2013-09-30 13:23:38 -07:00
artemp
fddec700ad TopoJSON input plugin 
skeleton implementation
 2013-09-30 14:14:58 +01:00
artemp
ff93a8117b add missin copyright notice 2013-09-30 13:32:24 +01:00
artemp
b3948e4a9c + avoid copying feature_ptr during r-tree initialisation 2013-09-30 11:36:04 +01:00
Dane Springmeyer
0f4ba4dfd5 sync with 2.3.x branch 2013-09-25 20:04:31 -07:00
Dane Springmeyer
226e5b2d7a no need to set 'value' attribute on rasters except for point query 2013-09-25 15:24:08 -07:00
Dane Springmeyer
df3a455e19 refactor nodata related code dropping support for user-overide nodata where it does not make sense - refs #2023 2013-09-25 14:37:21 -07:00
Dane Springmeyer
681f8853d3 pull in changes from master 2013-09-24 22:57:01 -07:00
Dane Springmeyer
e8b00ab8a9 minor c++ style fixes 2013-09-23 17:37:46 -07:00
Dane Springmeyer
01344baffb maintain default of max_size=10 and improve error output in the case max_size < max_async_connections 2013-09-23 17:32:42 -07:00
Dane Springmeyer
dc1d568501 code cleanup, consistent debug output 2013-09-23 14:57:23 -07:00
artemp
e2f5e35616 + opps, 'auto' is c++11 2013-09-20 17:19:23 +01:00
artemp
0eada70845 + use const std::unique_ptr< []> instead of boost::scoped_array 2013-09-20 15:01:58 +01:00
artemp
09ce29489e use const std::unique_ptr<> instead of boost::scoped_ptr<> 2013-09-20 14:22:58 +01:00
artemp
62af2e6765 + replace <boost/shared_ptr.hpp> with <memory> 2013-09-20 14:13:23 +01:00
artemp
b315eb2167 + use std::shared_ptr and std::make_shared 2013-09-20 14:01:27 +01:00
Dane Springmeyer
5c77edcc5e remove uneeded usage of std::move 2013-09-18 20:24:51 -07:00
Dane Springmeyer
111bdccebc various post-merge fixes 2013-09-18 19:51:14 -07: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
David Marteau
7495d2f381 [mappy] Parallel feature requests supports - PostGIS async requests 2013-09-11 14:04:10 +02:00
artemp
d4b9a48cb1 + geometry::types Exterior/Interior polygon loops 2013-09-03 12:15:31 +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
72c019f1c3 wrap section of gdal plugin only needed for debug output 2013-08-19 22:30:23 -04: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
4eef244e73 move SHAPE_MEMORY_MAPPED_FILE to be a global define 2013-08-13 14:48:04 -04:00
Dane Springmeyer
cf6e08aa52 disable (by default) use of shared memory in ogr plugin 2013-08-13 14:26:48 -04:00
Dane Springmeyer
134cbc3eec forward declare mapped_region in mapped_memory_cache.hpp and other shared memory fixups 2013-08-13 14:13:56 -04:00
Dane Springmeyer
d2000b465b Merge branch 'master' of github.com:mapnik/mapnik 2013-08-13 12:19:19 -04:00
Dane Springmeyer
28ed9a2cfd only include mapped_memory_cache.hpp if truly building shapefile plugin with -DSHAPE_MEMORY_MAPPED_FILE 2013-08-13 12:19:01 -04:00
Dane Springmeyer
e32c225307 fix handling of F and O type dbf fields and sync handling for attribute_descriptors - refs #1614 and closes #1976 2013-08-07 18:58:01 -04:00
Dane Springmeyer
4fb2e271f6 Revert "as discussed with @artemp - there should be no need or benefit to trying to handle F type in dbf since it is a foxpro extension that shapefiles do not commonly use" 
This reverts commit 53acae94be.
 2013-08-07 18:42:16 -04:00