artemp
|
aca229c2bb
|
implement custom feature GeoJSON parser for improved performance
|
2016-11-18 15:17:23 +01:00 |
|
artemp
|
f64db40a8a
|
don't catch exceptions in featureset::next() as expected behaviour is to throw
|
2016-11-18 09:43:53 +01:00 |
|
artemp
|
d286b75fb5
|
make keys member var + cache geojson grammar
|
2016-11-17 17:36:01 +01:00 |
|
artemp
|
22a6652160
|
use spirit::x3 based parser for disk-indexed GeoJSON access
|
2016-11-17 16:45:11 +01:00 |
|
artemp
|
b5c9966e4b
|
refactor value related objects into include/value dir
|
2016-10-11 18:01:30 +02:00 |
|
artemp
|
8ce7a1c43d
|
refactor souce code files with the following rule: the physical filesytem path matches namespace structure
e.g `mapnik::geometry::centroid()` -> `$(MAPNIK_SOURCE)/include/mapnik/geometry/centroid.hpp`
|
2016-10-11 18:01:29 +02:00 |
|
artemp
|
dad0ca2071
|
clamp num_features_to_query to 1...max range (at least one feature will queried) + use std::size_t for feature count (ref #3515)
|
2016-09-23 11:56:32 +02:00 |
|
Dane Springmeyer
|
acd90042fb
|
geojson.input: minor code adjustments
- Avoids making copy of inline string to save memory
- Moves duplicated code out of #ifdef to be more readible
|
2016-09-02 15:51:58 -07:00 |
|
artemp
|
f3252d00f4
|
expose "num_features_to_query" datasource parameter (ref #3495)
|
2016-08-16 10:55:56 +01:00 |
|
artemp
|
046c9638e1
|
GeoJSON - ensure descriptors order is consistent ( ref #3494)
|
2016-08-15 12:21:02 +01:00 |
|
artemp
|
31814b32d0
|
rename empty_featureset => invalid_featureset to avoid ambiguity + add helper is_valid method
|
2016-08-15 10:41:30 +01:00 |
|
artemp
|
bab985dd04
|
always return am empty featureset instead of featureset_ptr()
|
2016-07-13 15:17:51 +01:00 |
|
Dane Springmeyer
|
abe943c983
|
revert geometry changes for now - will develop them in branch to reduce downstream breakage
|
2016-04-11 14:00:27 -07:00 |
|
artemp
|
caa03d78bd
|
move geometry_adapters.hpp to geometry/boost_geometry_adapters.hpp
|
2016-04-11 15:14:52 +02:00 |
|
artemp
|
7cd5301cbe
|
mapnik-index - refactor to use box2d<float> and reduce memory requirement during index creations
|
2016-03-24 17:12:16 +00:00 |
|
Dane Springmeyer
|
a473abf1c7
|
remove unneeded includes [skip ci]
|
2016-03-18 09:26:16 -07:00 |
|
artemp
|
8f9134c72d
|
file_io - rename open to is_open to be consistent with STL i/o via @lightmare (0d032c2618 (commitcomment-16753722))
|
2016-03-18 10:02:19 +01:00 |
|
artemp
|
f44b5ccfd9
|
always query upto num_features_to_query to determine data schema (currently 5) across all access modes (ref #3237 #3238)
|
2016-02-25 15:29:32 +01:00 |
|
artemp
|
aee0149a1a
|
GeoJSON - preserve feature ordering with both cache_features=true' and cache_features=false` (#3182)
|
2015-11-23 10:19:49 +00:00 |
|
artemp
|
938702dc8b
|
geojson.input - rely on expectation failure to select optional single Feature/Geometry parser
|
2015-11-18 14:43:40 +00:00 |
|
Dane Springmeyer
|
7608040906
|
centralize warning suppression
|
2015-11-07 17:53:09 -08:00 |
|
artemp
|
133ca16d3a
|
GeoJSON.input - skip empty geometries (#3156)
|
2015-10-29 16:54:35 +00:00 |
|
artemp
|
3de31c50ab
|
correct exceptions text
|
2015-10-29 14:08:08 +00:00 |
|
artemp
|
5cb2b8a77a
|
geojson.input - create temp internal mapnik::feature_impl objects with id = -1 for clarity ref #3134
|
2015-10-21 11:14:13 +01:00 |
|
artemp
|
c952db979e
|
use mapnik::value_integer for feature id's
|
2015-10-20 11:45:39 +01:00 |
|
artemp
|
c053682711
|
geojson.input - assign incremental feature_id in geojson_index_featureset and geojson_memory_index_featureset
(ref #3134)
|
2015-10-20 11:12:11 +01:00 |
|
artemp
|
26bf021af9
|
rename large_geojson_featureset -> geojson_memory_index_featurest to better reflect undelying implementations: geojson_index_featureset is most capable in terms of handling large input data with minimal memory requrements via utilising on disk spatial index (createed with mapnik-index utility)
|
2015-10-19 10:54:52 +01:00 |
|
Dane Springmeyer
|
8813e73cfc
|
rename SHAPE_MEMORY_MAPPED_FILE to MAPNIK_MEMORY_MAPPED_FILE
|
2015-10-16 13:34:53 -07:00 |
|
artemp
|
4733c7ffc1
|
geojson.input - geometry_type for disk-index
|
2015-10-16 17:31:36 +01:00 |
|
artemp
|
942fb3c562
|
geojson.input - implement spatial disk index featureset
|
2015-10-16 13:15:20 +01:00 |
|
artemp
|
886ac23c64
|
geojson.input - force caching features and parse single feature/geometry when cache_features = false but extract_bounding_box fails (input is not FeatureCollection)
|
2015-10-15 17:35:46 +01:00 |
|
artemp
|
2906706a40
|
geojson.input - split parsing FeatureCollection and single Feature/Geometry into separate grammars
|
2015-10-15 15:12:16 +01:00 |
|
artemp
|
8562d18cd0
|
geoson.input - throw an exception if input hasn't been fully consumed
|
2015-10-14 11:03:07 +01:00 |
|
artemp
|
0bca3afa4e
|
formatting
|
2015-10-09 12:49:33 +01:00 |
|
artemp
|
faeae5bc2e
|
c++11 - more concise syntax
|
2015-10-09 11:26:39 +01:00 |
|
Dane Springmeyer
|
3bfd997b83
|
fix -Wsign-compare warning [skip ci]
|
2015-10-07 14:43:33 -07:00 |
|
Dane Springmeyer
|
2d59fca9f9
|
ensure consistent, ordered linking for plugins - closes #3105
|
2015-10-01 13:35:56 -07:00 |
|
Dane Springmeyer
|
d70725b218
|
fix variable shadowing in extract_bounding_box_grammar
|
2015-09-30 15:42:42 -07:00 |
|
artemp
|
7a956651fe
|
geojson - avoid passing invalid bounding boxes to boost::geometry::index
|
2015-09-30 12:50:53 +01:00 |
|
artemp
|
4943cb4cf8
|
remove unused includes
|
2015-08-20 14:15:35 +02:00 |
|
artemp
|
56678b8aad
|
geojson.input - fix bug typo
|
2015-07-06 12:47:45 +02:00 |
|
Dane Springmeyer
|
4fe3c87a84
|
tame a few more boost -Wsign-conversion warnings
|
2015-06-17 13:29:54 -07:00 |
|
artemp
|
8c6bf0eef6
|
update copyright notice
|
2015-06-16 12:49:16 +02:00 |
|
Dane Springmeyer
|
b2c85e0c65
|
fix a slew of -Wsign-conversion, -Wconversion, -Wunused-argument warnings
|
2015-06-15 20:41:51 -07:00 |
|
Dane Springmeyer
|
0d86afff36
|
start using -Wsign-compare and -Wshadow + fix heaps of warnings - refs #2907
|
2015-06-12 14:51:18 -07:00 |
|
artemp
|
2eaa90033a
|
move singleton to util/singleton.hpp
move windows UTF conversion routines to util/utf_conv_win.hpp
|
2015-06-02 11:10:41 +01:00 |
|
Dane Springmeyer
|
145781aec9
|
remove uneeded includes [skip ci]
|
2015-05-21 11:11:04 -07:00 |
|
artemp
|
3b663af863
|
use boost::spirit::standard instead of boost::spirit::ascii to avoid assertions failing (isascii_(ch)) in debug builds - ref #2829
|
2015-05-21 11:27:21 +01:00 |
|
Dane Springmeyer
|
f1e6be4572
|
silence boost warning in geojson_datasource
|
2015-05-15 14:43:42 -07:00 |
|
Dane Springmeyer
|
126c777c8d
|
shuffle around boost/geometry usage in headers to reduce compile time
|
2015-05-05 22:04:49 -07:00 |
|
artemp
|
3f1aa7b4b4
|
geometry : allow boost::geoemetry algorithms to work directly with box2d<double>, removing bounding_box
|
2015-04-09 12:33:31 +02:00 |
|
artemp
|
1cf0a897ac
|
move datasource::geometry_t into separate header and rename -> datasource_geometry_t to avoid cyclic dependencies issue
to_ds_type - return actual datasource_geometry_t (remove optional)
update across datasources
experssions - revert to using
|
2015-03-24 12:13:31 +01:00 |
|
artemp
|
8de2621b99
|
datasource : temporary reinstate get_geometry_type() method to increese test coverage and ease migration to mapnik-geometry
|
2015-03-19 12:09:07 +01:00 |
|
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 |
|