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

1121 commits

Author SHA1 Message Date
Dane Springmeyer
538af2515d fix rendering of multiple styles with OGR plugin - refs #2048 and mapbox/tilemill#2202 2014-01-31 19:13:24 -08:00
Dane Springmeyer
f286363ad0 more consistent memset/memcpy usage 2014-01-28 15:05:10 -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
777e067770 remove workaround for boost less than 1.46 since 1.47 is now the min needed - refs #1082 2014-01-27 12:24:20 -08:00
Dane Springmeyer
d82d9d382f fix compile with BOOST_SPIRIT_NO_PREDEFINED_TERMINALS 2014-01-26 16:06:32 -08:00
Dane Springmeyer
63ea37b4c2 further no terminal port 2014-01-26 14:49:03 -08:00
Dane Springmeyer
77da5d919c further gdal nodata handling improvements - refs #2023 
Conflicts:
	plugins/input/gdal/gdal_featureset.cpp
 2014-01-17 19:46:35 -08:00
Dane Springmeyer
b492437505 avoid dereferencing pointer more than once 2013-12-11 07:27:51 -08:00
artemp
eb3da7d32d c++11 : use nullptr instead of NULL 2013-11-27 15:54:16 +00:00
Dane Springmeyer
03fdf7e596 Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	src/deepcopy.cpp
	src/expression.cpp
	src/rule.cpp
 2013-11-13 20:00:13 -08:00
Dane Springmeyer
6844863a89 Abort pending postgis connections when exception occurs 
- patch from @abonnasseau
  - closes #2042
  - refs #2069
 2013-11-12 18:38:39 -08:00
Dane Springmeyer
410c65eb37 consistenly use std::memcpy and std::memset 2013-11-09 23:02:24 -08:00
Dane Springmeyer
5393978dd4 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-11-07 18:16:10 -08:00
Dane Springmeyer
0b39a7eb12 ogr plugin: remove unused code 2013-11-07 14:43:12 -08:00
artemp
afd58da6e2 geojson - feature_collection_parser 
(allow single feature and geometry input)
 2013-11-04 12:39:10 +00:00
Dane Springmeyer
9428f7f018 csv plugin: fix syntax after merge 2013-11-03 23:17:40 -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
2d268d3a95 features_with_context: no need for default arg 2013-11-03 23:07:03 -08:00
Dane Springmeyer
a17006bdd3 scons: avoid pollution of global compiler flags from python plugin - closes #2060 2013-10-31 13:37:13 -07:00
Dane Springmeyer
7612ff7b20 csv plugin: support user defined extent 2013-10-30 11:57:03 -07:00
Dane Springmeyer
1f4160f0f0 topojson: built up knowledge of attributes and geometry type + tests 2013-10-29 00:37:41 -07:00
Dane Springmeyer
44fe776bf5 geojson plugin: simplify code 2013-10-29 00:34:42 -07:00
Dane Springmeyer
5d7012f32f iwyu 2013-10-28 18:46:58 -07:00
Dane Springmeyer
b21b59b835 shape.input: conditionally include boost interprocess 2013-10-28 18:31:20 -07:00
artemp
24ce0f4b91 remove unused member variable 2013-10-23 17:44:04 +01:00
artemp
2f93188786 apply 116706fd1c fix - ref #2048 2013-10-23 15:26:43 +01:00
artemp
116706fd1c remove index_array from datasource and implement move semantics in featureset 
fixes #2048 for topojson.input
 2013-10-23 15:01:29 +01:00
Dane Springmeyer
710d558218 scons: simplify linkflags/ldflags setting / attempt to fix #2025 2013-10-22 16:35:46 -04:00
Dane Springmeyer
afd23586f3 c++11 compile fixes 2013-10-22 16:05:44 -04:00
artemp
a1daefe467 fix index 2013-10-22 16:51:55 +01:00
artemp
7adee4ab36 c++11 : remove boost::make_shared includes 2013-10-17 15:09:56 +01:00
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
artemp
ae3f682564 add missin copyright notice 2013-09-30 13:32:30 -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