Commit graph

11250 commits

Author SHA1 Message Date
artemp
c3ccff4f02 shape.input - add stream state check and calculate position limit 2015-10-21 16:33:12 +01:00
artemp
9f439d1e2e unit test geojson - only expect CHECK_THROW when *.index is not present. Bounding box extractor parser is not strict in the sense that it doesn't require input to be fully consumed (i.e it can handle extra traling characters). 2015-10-21 11:33:24 +01: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
17ace8a3e8 shape.input - read shx_file_length in shape_featureset and avoid passing wrong file length by mistake ref #3136 2015-10-21 10:55:26 +01:00
artemp
19c1c0afd0 bug fix - shape_featureset now expects shx file length (!) ref #3136 2015-10-21 10:46:49 +01:00
Dane Springmeyer
e547ee127c run/post coverage even if tests fail 2015-10-20 23:27:39 -07:00
Dane Springmeyer
56d8516216 increase test coverage of get_geometry_type 2015-10-20 23:17:44 -07:00
Dane Springmeyer
14589dabd1 improve test coverage of geojson indexing 2015-10-20 22:56:03 -07:00
Dane Springmeyer
9df548670c manually inherit DYLD_LIBRARY_PATH - closes #3138 2015-10-20 17:22:52 -07:00
Dane Springmeyer
1455c6be1f put mapnik-index on PATH to allow testing to work without installing - refs #3137 2015-10-20 15:24:58 -07:00
Dane Springmeyer
d1c5c69f07 Also dump posix return (aka WEXITSTATUS) 2015-10-20 15:18:12 -07:00
Dane Springmeyer
cd5b97b01f better error reporting when no valid files are passed to mapnik-index 2015-10-20 14:49:58 -07:00
Dane Springmeyer
1df6fbb17e dump std::system return code if index is not found 2015-10-20 12:23:05 -07:00
Dane Springmeyer
2c72833629 Revert "travis - std::system() calls fails"
This reverts commit 5de3a3776d.
2015-10-20 12:19:06 -07:00
Dane Springmeyer
d80179fca4 fix mapnik-index build when memory mapping is disabled - closes #3135 2015-10-20 12:17:32 -07:00
Dane Springmeyer
001520aa95 mapnik-index: only dump output if actually processing csv or geojson 2015-10-20 12:15:51 -07:00
Dane Springmeyer
3bb0f1748f icu linking for mapnik-index should be unneeded 2015-10-20 12:15:23 -07:00
Dane Springmeyer
82a4984f79 Merge branch 'master' of github.com:mapnik/mapnik 2015-10-20 07:57:19 -07:00
artemp
bfbc72c484 feature : put back set_id() for upstream compatibility 2015-10-20 14:36:19 +01:00
artemp
ab2d86c617 shape.input: remove set_id() method as it's no longer required ref #1020 #1019 2015-10-20 14:18:17 +01:00
artemp
5de3a3776d travis - std::system() calls fails 2015-10-20 13:50:54 +01:00
artemp
4822477d40 don't rely on std::system return value (implementation defined) 2015-10-20 12:44:45 +01:00
artemp
aa537e6254 geojson unit test - further simplify and increase coverage 2015-10-20 12:04:32 +01:00
artemp
c4ec93a5f2 geojson unit test - run 'FeatureCollection' test using all permutations of disk_index and cache_features settings. 2015-10-20 11:46:39 +01:00
artemp
c952db979e use mapnik::value_integer for feature id's 2015-10-20 11:45:39 +01:00
artemp
daaf2ee9d5 unit test (geojson) - de-dupe code 2015-10-20 11:22:42 +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
Dane Springmeyer
ecf79b463c add detail to changelog [skip ci] 2015-10-19 10:01:49 -07:00
Dane Springmeyer
c8867d1419 use std::system 2015-10-19 10:01:33 -07:00
artemp
d9a66a765c unit/geojson - add basic test for *.index access mode 2015-10-19 16:58:32 +01:00
artemp
4b5bbe9446 unit test(geojson) - add tests reading all geometry primitives 2015-10-19 12:23:43 +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
ee873aa17d fix compile with older harfbuzz that lacks HB_VERSION_ATLEAST 2015-10-16 14:55:43 -07:00
Dane Springmeyer
8813e73cfc rename SHAPE_MEMORY_MAPPED_FILE to MAPNIK_MEMORY_MAPPED_FILE 2015-10-16 13:34:53 -07:00
artemp
4976a7c72a update test data 2015-10-16 17:42:39 +01:00
artemp
4733c7ffc1 geojson.input - geometry_type for disk-index 2015-10-16 17:31:36 +01:00
Artem Pavlenko
097289ac3d Merge pull request #3130 from mapnik/smart-geojson
geojson.input - split parsing FeatureCollection and single Feature/Ge…
2015-10-16 13:18:11 +01:00
artemp
942fb3c562 geojson.input - implement spatial disk index featureset 2015-10-16 13:15:20 +01:00
artemp
e88ecb86c4 add has_name(std::string const& name) const method 2015-10-16 13:14:41 +01:00
artemp
2437473e74 c++11 - upfate to canonical operator= impl 2015-10-16 12:46:24 +01:00
artemp
652fa15ec0 better stderr 2015-10-16 10:49:29 +01:00
artemp
584fc5a61a Merge branch 'master' into smart-geojson 2015-10-16 10:33:32 +01:00
Dane Springmeyer
a938ca58a9 consistently catch by const ref [skip ci] 2015-10-15 18:06:33 -07:00
Dane Springmeyer
cc0ff85328 Merge branch 'master' of github.com:mapnik/mapnik 2015-10-15 13:56:09 -07:00
Dane Springmeyer
5da6563db4 maintain 'FT_LOAD_NO_HINTING' / adapt to changes upstream in harfbuzz 1.0.5 mapnik/test-data-visual#25 2015-10-15 13:56:02 -07: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
Dane Springmeyer
c48690ff87 add proposed code of conduct from http://contributor-covenant.org 2015-10-15 08:34:02 -07:00
artemp
2906706a40 geojson.input - split parsing FeatureCollection and single Feature/Geometry into separate grammars 2015-10-15 15:12:16 +01:00
artemp
b798503623 shape.input - pass shx_file_length to shape_featureset 2015-10-15 11:49:18 +01:00
artemp
a73e8537d8 shape.input - add support for reading offset/record_length from *.shx in shape_featureset (no *.index) - ref #3126 2015-10-14 16:44:43 +01:00