Commit graph

11583 commits

Author SHA1 Message Date
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
artemp
b15dba95cd unit test - add malformed JSON test + update test data 2015-10-14 11:41:14 +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
faad6d8543 catch std::exception 2015-10-14 10:32:29 +01:00
artemp
950afdcac1 mapnik-index : output number of elements 2015-10-13 17:12:02 +01:00
artemp
3368b6d1de shapeindex - re-factor to read offset and record length from *.shx (allows reading erroneous shapefiles from NE) 2015-10-13 13:34:21 +01:00
artemp
4093f10f61 shapefile_reader.py - improve by adding test_polygon 2015-10-13 13:34:21 +01:00
Dane Springmeyer
b75f075885 now working on mapnik v3.0.8 [skip ci] 2015-10-12 16:31:47 -07:00
Dane Springmeyer
b4fb174146 update CHANGELOG for mapnik v3.0.7 release [skip ci] 2015-10-12 16:18:50 -07:00
Dane Springmeyer
e161253631 remove last reference to pre versioning [skip ci] 2015-10-12 13:56:13 -07:00
Dane Springmeyer
a326cff744 ensure mapnik-config is rebuilt if version.hpp changes 2015-10-12 13:42:08 -07:00
Dane Springmeyer
98e8a12d78 Fix #3124 2015-10-12 13:38:15 -07:00
Dane Springmeyer
ba8747784d fix typo 2015-10-12 13:38:01 -07:00
Dane Springmeyer
c9a4d3d8ef remove MAPNIK_VERSION_IS_RELEASE logic from scons - refs #3123 2015-10-12 10:41:11 -07:00
Dane Springmeyer
67718ed8e1 rename nik2img to mapnik-render 2015-10-12 10:38:58 -07:00
Dane Springmeyer
03cc55f4f0 remove MAPNIK_VERSION_IS_RELEASE - refs #3123 2015-10-12 10:28:23 -07:00
Dane Springmeyer
7fa1e58ab7 better c++11 usage 2015-10-12 10:10:12 -07:00
Dane Springmeyer
393070ae6c remove unused code 2015-10-12 10:10:08 -07:00