Dane Springmeyer
087add2c71
Remove MAPNIK_BUNDLED_SHARE_DIRECTORY build option
...
- this was intended to be used by python-mapnik
- but it is not currently, so let's clean it up
- todo: get actual ICU_DATA,PROJ_LIB,GDAL_DATA values from those depependent libs
2016-03-16 13:48:26 -07:00
artemp
96b96c745d
Revert "csv_utils - check and skip processing lines consisting only of 0xa (windows) ( fixes #3359 )"
...
This reverts commit 9c09f15de9
2016-03-15 13:01:54 +01:00
artemp
9c09f15de9
csv_utils - check and skip processing lines consisting only of 0xa (windows) ( fixes #3359 )
2016-03-15 12:26:00 +01:00
Dane Springmeyer
89db790dda
rename parse_csv function to avoid confusion in inheritance
2016-03-11 14:23:16 -08:00
Dane Springmeyer
c715b142ec
suppress more third party warnings
2016-03-10 11:44:44 -08:00
Dane Springmeyer
57dbd77819
more warning_ignore usage - refs #2907
2016-03-09 16:43:00 -08:00
artemp
ff9cceeb9f
use platform specific macros as return codes (EXIT_SUCCESS/EXIT_FAILURE) + check if extent read from shapefile is valid and has valid width and heoght before creating an index.
2016-03-07 13:52:58 +01:00
Dane Springmeyer
833703026d
add COVERAGE configure option - only set coverage flags on libmapnik and plugins - refs #3344
2016-03-03 14:19:12 -08:00
Mickey Rose
c21778fdfc
merge mapnik-index::process_csv_file and csv_datasource::parse_csv
...
- the function in plugin was already configurable via flags, and only
contained two un-conditioned blocks that process_csv_file didn't have
- so I extracted the common parts into a separate function (in a class
holding the flags and state), process_csv_file calls it with default
flags, plugin sets them from params
- removed namespace ::detail, moving stuff that was used outside
csv_utils to ::csv_utils, and the rest to ::csv_utils::detail
2016-02-26 20:28:42 +01:00
Mickey Rose
aaffb1c771
don't #include .cpp, add it to sources
2016-02-25 11:58:38 +01:00
Dane Springmeyer
d1a4268eb6
remove unneeded includes - found with http://include-what-you-use.org
2016-02-24 22:39:50 -08:00
Dane Springmeyer
f2782d0b67
[csv] move spirit usage to cpp
2016-02-24 17:42:51 -08:00
Dane Springmeyer
8ffee05048
Merge branch 'master' of github.com:mapnik/mapnik into faster-csv-compile
2016-02-24 16:42:23 -08:00
artemp
b7dd8331df
use std::ofstream (ref 3300)
2016-02-18 12:54:17 +01:00
Dane Springmeyer
85d4596769
move getline impl to separate header to avoid as much spirit inclusion
2016-02-15 19:06:11 -08:00
artemp
ca0c0e5888
csv_util - combine auto-decting separator/quote/newline into one method std::tuple<char, bool, char, char> autodect_csv_flavour(T & stream, std::size_t file_length)
2016-02-15 13:55:06 +01:00
artemp
2b725dd257
shapeindex - skip 'null' shapes (ref #3288 )
2016-02-08 15:51:13 +01:00
Dane Springmeyer
e76a1d9a81
[csv] use faster version of csv_utils::parse_line in more places + fix error output
2016-02-01 12:23:26 -08:00
artemp
d027ed67c7
more const strictness, update to work with latest mapbox::variant/visitor-no-copy branch
2016-01-27 14:50:17 +01:00
Dane Springmeyer
03285f60b0
install mapbox variant - followup to #3236
2016-01-14 14:09:32 -08:00
artemp
c8932b3df3
svg2png : use SVG dimensions as a fallback when bounding box has zero width or height (e.g horizontal or vertical line)
2016-01-08 10:20:50 +00:00
artemp
412fa20eb8
shapeindex: indicate default behaviour in -h(--help)
2016-01-04 13:23:50 +00:00
artemp
4c6632cf93
shapeindex : remove duplicate node defs + add default ctor
2016-01-04 13:19:16 +00:00
artemp
a2b3130d4b
rebase to master (remove spirit-x3 changes)
2016-01-04 11:43:27 +00: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
Tom Hughes
25a9cab9ad
Fix name reported by mapnik-render
2015-12-06 15:10:43 +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
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
cb3f0fdcf2
mapnik-index: fix linking on Linux
2015-11-19 11:01:46 +00: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
Dane Springmeyer
7608040906
centralize warning suppression
2015-11-07 17:53:09 -08:00
artemp
60fc5910f3
mapnik-index - fix std::clog message typo
2015-11-06 10:56:45 +00:00
Dane Springmeyer
db7466adf0
link icu again - refs #3145 - reverts 3bb0f1748f
2015-11-04 13:12:25 -08:00
artemp
6aca4b17f8
extract_bounding_box - fail on nested "FeatureCollection" elements
2015-11-03 13:33:06 +00:00
artemp
439fcd0426
correct clog message + formatting
2015-11-02 14:27:57 +00:00
artemp
2acafe78ee
mapnik-index - check extracted bounding box is valid
2015-11-02 14:14:12 +00:00
Dane Springmeyer
18858dffca
avoid boost qi warning [skip ci]
2015-10-27 16:38:43 -07:00
artemp
209fe55e14
trim headers + sync with csv.input
2015-10-23 13:10:23 +01:00
artemp
6effbedff3
csv.input/mapnik-index - validate geometry locator and throw early if invalid
2015-10-22 13:29:26 +01: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
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
c8867d1419
use std::system
2015-10-19 10:01:33 -07:00
artemp
652fa15ec0
better stderr
2015-10-16 10:49:29 +01:00
artemp
950afdcac1
mapnik-index : output number of elements
2015-10-13 17:12:02 +01:00
