Commit graph

11719 commits

Author SHA1 Message Date
Dane Springmeyer
6254b3851e Merge branch 'master' of github.com:mapnik/mapnik into postgis-tests-squashed 2015-12-14 15:28:04 -08:00
Dane Springmeyer
75cb954d26 update test-data to include new postgis sql 2015-12-14 15:27:48 -08:00
Dane Springmeyer
fc6556170d let's not depend on CREATE EXTENSION working in C++ code 2015-12-14 15:27:05 -08:00
Dane Springmeyer
b42f072ad3 wip: start chipping away at getting tests running - refs #3180 2015-12-14 15:00:10 -08:00
Dane Springmeyer
dc109a7ae2 Merge branch 'master' of github.com:mapnik/mapnik into postgis-tests-squashed 2015-12-14 13:45:29 -08:00
Dane Springmeyer
2222ca9b95 Merge pull request #3197 from tomhughes/nik2img
Fix name reported by mapnik-render
2015-12-14 13:33:42 -08:00
artemp
3139dad5cd don't bother iterating over geometries if shape_type is shape_null in header 2015-12-14 14:11:38 +00:00
artemp
6ca0e34a80 mapnik-index - output failed feature JSON when both --validate-features and --verbose options present. 2015-12-14 11:47:19 +00:00
artemp
5e2f3ce61d geojson/geometry - update unit test 2015-12-14 11:46:39 +00:00
artemp
599b021175 support arbitrary (nested) attributes in JSON Geometry 2015-12-14 11:46:39 +00:00
artemp
e65cb96743 sync expressions tests with spirit-x3 branch 2015-12-08 16:39:32 +00:00
artemp
327ba670ff expressions unit test - add relational and regex tests 2015-12-08 16:25:59 +00:00
artemp
319651c33a expressions unit test - add logical expr 2015-12-08 14:25:02 +00:00
artemp
10cd9cd0fd unit test - expression parsing/evalution test 2015-12-08 14:25:02 +00:00
Tom Hughes
25a9cab9ad Fix name reported by mapnik-render 2015-12-06 15:10:43 +00:00
Dane Springmeyer
50d1e2fbb3 handle more gcc 4.9 -Wshadow warnings 2015-12-04 14:07:42 -05:00
Dane Springmeyer
8e6e74dfa2 suppress -Wshadow warning from ogr 2015-12-03 10:22:02 -05:00
Dane Springmeyer
e424ef1d77 start fixing gcc 4.9 -Wshadow warnings 2015-12-02 15:55:26 -05:00
Dane Springmeyer
a58ef62fc2 start fixing gcc 4.9 -Wshadow warnings 2015-12-02 15:54:58 -05:00
Dane Springmeyer
59723ae693 restore -Wno-unsequenced, accidentally dropped in 7608040906 2015-12-01 13:59:45 -05:00
bergwerkgis
8235d0ed30 AppVeyor: fix new paths for new GIT version 2015-12-01 10:49:53 +00:00
artemp
b9c65368d2 update CHANGELOG for mapnik v3.0.9 release [skip ci] 2015-11-26 10:13:12 +00:00
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
bergwerkgis
b4a7b594dd 1st iteration of PostGIS tests 2015-11-20 15:44:43 +01: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