artemp
|
317e9c497f
|
Merge branch 'master' into mapnik-geometry
|
2015-03-09 14:59:45 +01:00 |
|
Dane Springmeyer
|
c1e947bff1
|
fully static geojson parsing grammars
|
2015-03-07 12:00:38 -08:00 |
|
artemp
|
367208ece1
|
generic geometry_type impl
remove geometry_type from mapnik::datasource
|
2015-02-24 11:17:26 +01:00 |
|
artemp
|
2984fb9594
|
revive geojson plugin
|
2015-02-23 19:07:26 +01:00 |
|
artemp
|
bb57ebd258
|
implement get_geometry_type() for 'large json' strategy
@springmeyer - we should talk re: validity of this approach. I know the baclground but still.
|
2015-02-12 15:50:13 +01:00 |
|
artemp
|
e8f397c41c
|
instantiate geojson grammar using chr_iterator_type = char const* - via #2700
|
2015-02-12 11:51:11 +01:00 |
|
Dane Springmeyer
|
7d2b34d654
|
finish fixing windows build - closes #2698
|
2015-02-10 19:02:32 -08:00 |
|
Dane Springmeyer
|
8608ea3308
|
only enable geojson memory mapped files if SHAPE_MEMORY_MAPPED_FILE defined (TODO: rename this define) - refs #2698
|
2015-02-10 18:50:27 -08:00 |
|
artemp
|
eec661d263
|
geojson plugin
* use parse_geojson(Iterator start, Iterator end) signiture
* use Iterator = char const*
* remove unneeded I/O in 'initialise_index'
* use memory mapped file (currently #if/def)
|
2015-02-03 13:37:49 +01:00 |
|
artemp
|
89e516b493
|
unicode string grammar via boost/libs/spirit/example/qi/json/json/parser/grammar.hpp
update json based grammars
|
2015-02-02 11:22:54 +01:00 |
|
artemp
|
e3c96666c4
|
json - make feature_collection_grammar "on-feature" callback based
|
2015-01-29 12:33:18 +01:00 |
|
Dane Springmeyer
|
1753d0ab47
|
require boost >= 1.56 for geojson/topojson plugins
|
2015-01-27 22:20:03 -08:00 |
|
artemp
|
2a50372d25
|
use correct grammar instantiation
|
2015-01-26 12:51:34 +01:00 |
|
artemp
|
a1c562c6fc
|
cleanup
|
2015-01-26 12:51:10 +01:00 |
|
artemp
|
cc47bfd7fa
|
extract attributes schema + remove std::cerr
|
2015-01-26 11:09:06 +01:00 |
|
artemp
|
2a3af1eb40
|
move boost.geometry <-- mapnik::box2d<double> into separate header for better modularity and code re-use
|
2015-01-26 10:37:09 +01:00 |
|
artemp
|
1263bc9c2e
|
merge large geojson plug-in into geojson.input
|
2015-01-26 10:19:18 +01:00 |
|
artemp
|
44905ffc43
|
geojson.input - use adapted box2d<double> as box_type + make spatial index compatible with large_geojson
|
2015-01-26 09:42:06 +01:00 |
|
artemp
|
e42d0deb61
|
correct types usage
|
2015-01-22 16:23:44 +01:00 |
|
artemp
|
18554ec0b1
|
remove static_visitor usage and rely on automatic result type deduction
(NOTE: expression_evaluator requires ```using result_type = T1;``` )
Conflicts:
src/image.cpp
|
2015-01-07 11:39:06 +01:00 |
|
artemp
|
ee9481cb38
|
feature_collection_grammar : allow passing start_id at parse time - #2582
|
2014-11-24 12:26:11 +01:00 |
|
Dane Springmeyer
|
62d5cf7f16
|
fix error message in geojson plugin
|
2014-11-21 19:57:24 -08:00 |
|
artemp
|
333965b588
|
update copyright year
|
2014-11-20 15:25:50 +01:00 |
|
Dane Springmeyer
|
a65987af31
|
geojson plugin: fix compile against boost 1.57
|
2014-11-04 11:41:23 -05:00 |
|
Dane Springmeyer
|
ca3078938c
|
simplify and install mapnik wkt and json libs
|
2014-10-22 00:09:22 -07:00 |
|
Dane Springmeyer
|
83588937b9
|
silence boost warnings
|
2014-10-21 16:37:27 -07:00 |
|
Dane Springmeyer
|
bdb1f900eb
|
sync code between geojson and topojson rtree impl
|
2014-10-15 18:51:53 -07:00 |
|
Dane Springmeyer
|
4e8125d2ad
|
use c file io wrapper in geojson/topojson plugins
|
2014-10-15 11:36:57 -07:00 |
|
artemp
|
2e4c5b3ee0
|
use finer control over rtree instantiation
|
2014-10-15 15:15:31 +01:00 |
|
Dane Springmeyer
|
1c80cfe44f
|
fix geojson plugin linking #2535
|
2014-10-14 20:26:13 -07:00 |
|
Dane Springmeyer
|
44bc5b59d6
|
break out wkt/json grammars into separate libraries
|
2014-10-13 01:06:36 -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
|
8faa358067
|
Merge pull request #2400 from mapnik/single-pass-json
Drop multi_pass iterator
|
2014-08-28 19:12:04 -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 |
|
Dane Springmeyer
|
7cb907e13f
|
avoid warning from boost geometry
Conflicts:
plugins/input/geojson/geojson_datasource.hpp
|
2014-08-24 16:00:27 -07: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
|
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 |
|
artemp
|
ade32abcd8
|
mapnik::util::variant in mapnik::value
|
2014-08-08 12:13:49 +01: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 |
|
artemp
|
3f5344ca82
|
geojson - make feature_collection_grammar not dependend on mapnik::context
|
2014-07-30 11:01:54 +01:00 |
|
Dane Springmeyer
|
5fc2e01531
|
fix geojson plugin by avoiding static const grammar for now
|
2014-07-28 18:44:56 -07:00 |
|
Dane Springmeyer
|
d55a0010dc
|
also move feature_collection_grammar to impl file
|
2014-07-28 16:51:24 -07:00 |
|
Dane Springmeyer
|
7f0029eb0b
|
implement inline (in-memory string) support for GeoJSON plugin - refs #2058
|
2014-07-28 16:16:10 -07:00 |
|
Dane Springmeyer
|
c5be70ff65
|
refactor spirit grammars
|
2014-07-24 14:31:59 -07:00 |
|
artemp
|
fe215a684e
|
c++11 style : replace (almost) all typedef with type alias's
|
2014-07-07 18:23:15 +01:00 |
|