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

1239 commits

Author SHA1 Message Date
Dane Springmeyer
ecdb12ac07 speed up topojson parsing - closes #2397 2014-09-04 20:26:52 -07:00
Dane Springmeyer
7d5d02e031 Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-09-04 09:22:53 -07:00
artemp
72e2f4446f re-implement mapnik::value deriving from value_base and update across core 
fix mapnik::value conversions in topojson plugin
 2014-09-04 17:10:13 +01:00
Dane Springmeyer
d577ef8719 Merge branch 'master' of https://github.com/mapnik/mapnik into 3x-msvs 2014-08-29 18:56:43 -07:00
Dane Springmeyer
6074e87bbb include optional - fix msvs compile - refs #2396 2014-08-28 19:29:07 -07:00
Dane Springmeyer
8faa358067 Merge pull request #2400 from mapnik/single-pass-json 
Drop multi_pass iterator
 2014-08-28 19:12:04 -07:00
artemp
ecfaec1027 rename ctrans.hpp to view_transform.hpp 2014-08-28 10:29:04 +01:00
artemp
de22d5900c rename CoordTransform to view_transform to better reflect its purpose and be consistent 2014-08-28 10:17:15 +01:00
Dane Springmeyer
f6a7bddca3 Merge pull request #2394 from strk/master-pgis-simplify-20th 
Bring postgis simplification factor back to 1/20 of a pixel
 2014-08-26 21:25:24 -07:00
Dane Springmeyer
cc970dea1c remove unused statistics member 2014-08-26 18:36:01 -07:00
Dane Springmeyer
616896c6ee remove spirit::multi_pass - refs #2397 2014-08-26 16:22:12 -07:00
Sandro Santilli
0d098a0467 Bring postgis simplification factor back to 1/20 of a pixel 
This was the value in 2.2.x and was accidentally changed as part
of a completely unrelated commit, see:
http://github.com/mapnik/mapnik/issues/1639#issuecomment-53388951
 2014-08-26 13:03:22 +02:00
Dane Springmeyer
3e1ab9beab fix gdal compile with msvs 2013 - closes #2257 2014-08-25 17:50:45 -07:00
Dane Springmeyer
225810e3ee ogr: also accept 'inline' arg like geojson/topojson/csv plugins 2014-08-25 11:59:32 -07:00
Dane Springmeyer
7cb907e13f avoid warning from boost geometry 
Conflicts:
	plugins/input/geojson/geojson_datasource.hpp
 2014-08-24 16:00:27 -07:00
artemp
a4cd4821a0 ohh evil #ifdef/#endif - fix compiling with boost < 1.56 2014-08-21 12:21:47 +01:00
artemp
6dee6c1c86 fix typo :) 2014-08-21 11:40:42 +01:00
artemp
455168c6af topojson - use bulk-loading packing algorithm for rtree creation 
(http://www.boost.org/doc/libs/1_56_0/libs/geometry/doc/html/geometry/spatial_indexes/introduction.html)
use unique_ptr where appropriate
 2014-08-21 11:14:33 +01:00
Sandro Santilli
01b56c3606 Add mention of CartoDB support in pgraster input plugin code 2014-08-20 17:31:41 +02:00
artemp
fd7682aab2 c++ pedantic 2014-08-20 16:11:27 +01:00
artemp
e4b3a46e3e fix geojson plugin, even better name is geometry_index (to avoid confusion) 2014-08-20 16:08:41 +01:00
artemp
2d50a2dccc topojson plugin : fix spatial index population, rename 'count' to 'index' 2014-08-20 16:00:12 +01:00
artemp
1e4368e97a fix compilation with boost < 1.56 2014-08-20 09:42:28 +01:00
Dane Springmeyer
9020b8c6df adapt geojson+topojson plugins to boost 1.56 - refs #2367 2014-08-19 14:48:21 -07:00
Dane Springmeyer
7c1f9b1490 fix compile with older OGR 2014-08-18 21:33:37 -07:00
Dane Springmeyer
a4c926ac8a don't throw for OGR layers with no features - refs #2260 #2352 #2354 
Conflicts:
	tests/python_tests/ogr_test.py
 2014-08-15 19:49:33 -07:00
artemp
1d02eb0d1d Merge branch 'master' into custom-variant-2 2014-08-13 09:06:58 +01:00
Dane Springmeyer
6ec3905fc5 fix redefinition warnings + dodge a compile error due to clashing toupper in python + clib by using iosfwd - closes #2355 2014-08-12 23:52:31 -07:00
Dane Springmeyer
7da05accc0 Merge branch 'master' of github.com:mapnik/mapnik into custom-variant-2 2014-08-12 23:19:26 -07:00
Joel Brown
c517b20237 add ogr plugin error handling to master/3.x 2014-08-12 23:09:42 -07:00
Dane Springmeyer
44844f7bd0 postgis: disable NOTICES by default - refs #2296 2014-08-12 20:30:34 -07:00
Dane Springmeyer
e4c7e2419c make sure pgraster is rebuilt if headers change inside the postgis plugin dir 2014-08-12 20:29:51 -07:00
Dane Springmeyer
e03448ecb9 port pg_raster plugin to c++11/recent 3.x changes 2014-08-12 15:14:25 -07:00
Dane Springmeyer
4e12b999f0 pull in pgraster plugin by @strk from 2.3.x to master/3.x - refs #2329 #1660 2014-08-12 15:03:51 -07:00
artemp
6136a32092 Merge branch 'master' into custom-variant-2 2014-08-12 19:44:37 +01:00
Dane Springmeyer
c604e925f5 apply #2350 to master/3.x too 2014-08-12 11:44:34 -07:00
Dane Springmeyer
a13fa6720a csv: parse true/false as boolean in csv plugin - closes #1540 2014-08-12 11:16:05 -07:00
artemp
fb2dd283c0 fix DEBUG=yes compilation 2014-08-12 19:10:32 +01:00
Dane Springmeyer
c55a3c3130 csv plugin: support conversion to boolean types - closes #1540 2014-08-12 10:00:37 -07:00
artemp
f57f3a7f83 ammend topojson_grammar and remove last boost::variant usage 2014-08-12 16:16:17 +01:00
artemp
95cea92a4a convert all boost::variant to util::variant 
apart from topojson (TODO)
 2014-08-12 13:40:45 +01:00
artemp
e315922b70 Merge branch 'master' into custom-variant-2 
Conflicts:
	include/mapnik/value.hpp
 2014-08-11 11:53:59 +01:00
artemp
43b8069698 topojson - revert to using boost::variant for mapnik::topojson::geometry (TODO) 2014-08-11 11:51:19 +01:00
Dane Springmeyer
d61efc0b5a -fvisibility=hidden fixes on osx with -flto 2014-08-09 13:44:42 -07:00
artemp
ade32abcd8 mapnik::util::variant in mapnik::value 2014-08-08 12:13:49 +01:00
Dane Springmeyer
d27b45553a use emplace/emplace_back over insert/push_back - refs #2336 2014-08-05 15:19:37 -07:00
Dane Springmeyer
05f49f9cac visual tests - keep default debug severity levels 2014-08-04 19:18:38 -07:00
artemp
3b707d1c79 opps - remove unused itarators decl 2014-07-30 16:41:10 +01:00
artemp
eee750e074 c++11 - range based for loop (tidy) 2014-07-30 16:39:49 +01:00
artemp
61c05bfb45 re-use feature_collection_grammar 2014-07-30 11:28:23 +01:00