Commit graph

11346 commits

Author SHA1 Message Date
artemp
03a0926bf0 update SCons to 2.4.1 2015-11-26 10:09:02 +00:00
artemp
e2cf79260f unit tests - add 'ensure original ordering in geojson.input' test ref #3182 2015-11-25 12:46:21 +00:00
artemp
d288ea0af6 Merge branch 'mapycz-geometry-remove-empty' 2015-11-24 15:49:50 +00:00
Jiri Drbalek
100e3c4995 centroid: enable algorithm on multi-geometries with empty sub-geometries 2015-11-24 15:41:34 +00:00
artemp
a2b1475ef7 port shapeindex_test.py to c++ (#3184) 2015-11-24 10:50:09 +00:00
Artem Pavlenko
1b6ca8bcd0 Merge pull request #3176 from mapycz/fix-warn
csv.input: fix warning
2015-11-23 10:46:10 +00:00
artemp
ec074752cc fix mistype => should be while (shx.is_good() && pos <= file_length - 4) 2015-11-23 10:32:14 +00: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
c32166c71f move loop terminatiion condition to the top and avoid potential infinite loop when if (content_length != shp.read_xdr_integer()) + Track empty shapes and don't create *.index when there is no non-empty geometries
(#3184)
2015-11-23 09:58:27 +00:00
Jiri Drbalek
7283b758a0 csv.input: fix warning 2015-11-23 08:54:13 +00:00
artemp
7aa97628e0 revert accidentally pushed changes from WIP branch 2015-11-20 19:55:21 +00:00
artemp
58998f8126 cleanup - remove unused vars 2015-11-20 17:45:10 +00:00
artemp
4fffcdd612 update test data 2015-11-20 17:11:52 +00:00
artemp
1eab1a3a28 CSV - change 'quote' auto-dection logic to handle mixed cases better 2015-11-20 17:10:55 +00:00
artemp
44eb1b69fa revert test-data 2015-11-20 14:13:13 +00:00
artemp
e0d7f8ffcb update test data 2015-11-20 14:10:44 +00:00
Dane Springmeyer
9a29b5005d fix #3178 2015-11-19 20:57:05 -08:00
Dane Springmeyer
c6d6153964 fix multiple -Wunused-parameter warnings [skip ci] 2015-11-19 17:14:58 -08:00
Artem Pavlenko
4dd2202055 Merge pull request #3175 from mapycz/fix-link-mapnik-index
mapnik-index: fix linking on Linux
2015-11-19 12:38:02 +00:00
artemp
da617f92eb add scale_image_agg' and reproject_and_scale_raster` overloads for backward caps 2015-11-19 12:26:16 +00:00
Jiri Drbalek
cb3f0fdcf2 mapnik-index: fix linking on Linux 2015-11-19 11:01:46 +00:00
artemp
7d8f7357ed GeoJSON - refactor FeatureCollection grammar to restore empty features condition (#3167) 2015-11-18 14:44:39 +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
artemp
998164dc72 mapnik c++ style 2015-11-18 14:42:29 +00:00
artemp
d373ae2e93 update visual-data 2015-11-17 15:28:25 +00:00
artemp
21c4438cbe Merge branch 'mapycz-fix-gray-scaling-2' 2015-11-17 15:04:08 +00:00
artemp
6d599dff0a Merge branch 'fix-gray-scaling-2' of https://github.com/mapycz/mapnik into mapycz-fix-gray-scaling-2 2015-11-17 15:03:37 +00:00
Dane Springmeyer
2ee9639f91 Merge branch 'master' of github.com:mapnik/mapnik 2015-11-12 10:19:56 -08:00
Dane Springmeyer
d9d37423b7 use mapnik/warning_ignore.hpp in a few last places 2015-11-12 09:51:41 -08:00
artemp
7a0688edcb mapnik-index - implement validatation callback by comparing bounding boxes from bbox extractor and GeoJSON feature 2015-11-12 16:12:06 +00:00
artemp
5eecf1dfae mapnik-index - add "--validate-features" option (experimental) 2015-11-12 13:45:25 +00:00
artemp
2602b1faff don't fail on null shapes (record length : 8 bytes) 2015-11-11 16:21:03 +00:00
artemp
4d6a735f53 initialise default (invalid) box2d with +/-std::numeric_limits<T>::max() to be in sync with Boost.Geometry 2015-11-11 15:50:56 +00:00
Artem Pavlenko
4e922f6a64 Merge pull request #3164 from mapycz/postgis-empty-geoms
check input data of centroid algorithm
2015-11-11 10:21:39 +00:00
Dane Springmeyer
2af154737c changelog improvements [skip ci] 2015-11-10 13:19:16 -08:00
Jiri Drbalek
924aa62662 raster scaling: fixes nodata handling, acurracy when working with small floats and clipping floats by [0; 255] 2015-11-10 20:37:45 +00:00
artemp
df03110939 update CHANGELOG 2015-11-10 16:00:44 +00:00
Jiri Drbalek
6066946ef2 add unit tests for is_empty and has_empty 2015-11-10 13:49:22 +00:00
Jiri Drbalek
071eeeb660 centroid algorithm: check for empty geometries 2015-11-10 13:49:12 +00:00
artemp
617400f1a1 unit test - add malformed FeatureCollection test where we expect exception to be thrown in featureset::next() method even when mapnik-index creates *.index file (expected due to optimised parsing) 2015-11-10 11:37:48 +00:00
artemp
dd31b95bbb better namings (post 9c7149aad5 itr_end implies Iterator concept which is not the case) ref #3166 2015-11-10 10:42:39 +00:00
Dane Springmeyer
9c7149aad5 fix variable shadowing in simplify_converter - refs #3166 2015-11-09 12:25:10 -08:00
Dane Springmeyer
5eefd8b1ec better harfbuzz ft check - refs #3166 2015-11-09 11:11:07 -08:00
Dane Springmeyer
8e1996d6c6 Scons: check for harfbuzz with freetype support 2015-11-09 10:58:16 -08:00
Dane Springmeyer
95fe045755 Merge branch 'master' of github.com:mapnik/mapnik 2015-11-09 10:47:21 -08:00
Dane Springmeyer
58f30f3d42 more CSV test coverage - refs #3098 2015-11-09 10:47:07 -08:00
Dane Springmeyer
61ee1284c6 Merge pull request #3131 from mapnik/code-of-conduct
Proposed code of conduct
2015-11-09 10:20:13 -08:00
Dane Springmeyer
53174718d8 use mapnik/warning_ignore.hpp in a few more places 2015-11-09 09:51:35 -08:00
artemp
38011dd388 Merge branch 'wmde-issue-3050' 2015-11-09 13:56:28 +00:00
artemp
5370dac598 Merge branch 'issue-3050' of https://github.com/wmde/mapnik into wmde-issue-3050 2015-11-09 13:56:06 +00:00