sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11839 commits 112 branches 95 tags 181 MiB
Commit graph

11839 commits

This branch
This branch
All branches
Author SHA1 Message Date
artemp
16321047da Merge branch 'master' into value-cpp 2016-02-25 15:38:43 +01:00
artemp
176d3e49c9 update test (ref f44b5ccfd9 #3237 #3238) 2016-02-25 15:31:18 +01:00
artemp
f44b5ccfd9 always query upto num_features_to_query to determine data schema (currently 5) across all access modes (ref #3237 #3238) 2016-02-25 15:29:32 +01:00
Mickey Rose
aaffb1c771 don't #include .cpp, add it to sources 2016-02-25 11:58:38 +01:00
artemp
c044b6d073 add relevant empty string/null equality ref #1859 #3255 2016-02-25 11:21:07 +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
08d7bf2152 no need for template usage for autodect_csv_flavour 2016-02-24 22:24:24 -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
bergwerkgis
1a7cf57b9f [skip ci] Windows: checkout Python bindings recursively 2016-02-24 14:36:43 +00:00
artemp
bd5d1c8df8 prune include directives a bit more 2016-02-24 12:24:06 +01:00
artemp
eea68adb40 add required include 2016-02-24 12:10:25 +01:00
Artem Pavlenko
04c2532a81 Merge pull request #3302 from lightmare/travis 
move some shell code from .travis.yml to separate script
 2016-02-24 12:04:41 +01:00
artemp
50db396760 move value implementation into *.cpp 2016-02-23 23:05:19 +01:00
artemp
0c9a615c24 restore back compatibility shim ref #1859 (TODO: must go away in 3.1.x!!) 2016-02-23 14:01:06 +01:00
artemp
d43bc3232f remove unused include 2016-02-22 15:38:15 +01:00
artemp
2c931a238f color.cpp - port premultiply/demultiply and remove agg dependency 2016-02-22 14:39:31 +01:00
artemp
3e8ee9a559 simplify color generators - remove boost::phoenix usage 
(ref: https://github.com/mapbox/windows-builds/issues/81)
 2016-02-22 12:45:28 +01:00
Mickey Rose
ea54876d79 remove unused includes 2016-02-20 01:16:11 +01:00
artemp
9fe049d8af CSV utils - strengthen quote detection logic + tests 2016-02-19 15:05:15 +01:00
artemp
62de76a66e test bogus *.index files are handled correctly (ref #3300) + indirectly tests #3306 via requiring mapped_memory_cache::instance().clear() 2016-02-19 11:25:27 +01:00
artemp
c4817f7ae1 clear mapped_memory_cache to ensure new '*.index` are used (MAPNIK_MEMORY_MAPPED_FILE) (ref #3306) 2016-02-19 11:02:12 +01:00
artemp
96175554ae Add explicit instantiation declaration of singleton<mapped_memory_cache, CreateStatic> to avoid multiple instantiations across translation units. (ref #3306) 2016-02-19 11:00:58 +01:00
artemp
6a9240f3d4 Revert "shape.input - add 'update-cache' optional parameter (default:true)" -- no much use as OS seems to apply it's own caching, doh .. 
This reverts commit f65c799475.
 2016-02-18 17:37:46 +01:00
artemp
eb1a23d6e4 'invalid index' - testing invalid *.index fallback (ref #3300) 2016-02-18 17:36:18 +01:00
artemp
f65c799475 shape.input - add 'update-cache' optional parameter (default:true) 2016-02-18 17:34:03 +01:00
artemp
085a2afe40 minor formatting 2016-02-18 17:17:44 +01:00
Mickey Rose
efb06d2060 travis: move some shell code to separate script 
- refs #3291
 2016-02-18 15:40:13 +01:00
artemp
b7dd8331df use std::ofstream (ref 3300) 2016-02-18 12:54:17 +01:00
artemp
b43ee6dd04 beef up has_index method to check if *.index file is valid (has expected header) (ref #3300) 2016-02-18 11:45:58 +01:00
artemp
5183c1da44 spatial_index - rename check_header to check_spatial_index and make it free function ref #3300 2016-02-18 11:38:29 +01:00
artemp
cd5105785a csv_utils - fix istringstream initialiser by using explicit iterators pair std::string ctor 2016-02-18 11:35:14 +01:00
artemp
4c0781dbe9 remove redundant unique_ptr usage for local variable 2016-02-18 10:53:12 +01:00
Mickey Rose
6557394dc8 re-add mapnik::to_utf8 stub for backward compatibility 2016-02-17 16:56:21 +01:00
artemp
d7d22276c0 Merge branch 'lightmare-benchanting' 2016-02-17 12:07:19 +01:00
artemp
9aed60a1e6 Merge branch 'benchanting' of https://github.com/lightmare/mapnik into lightmare-benchanting 2016-02-17 12:07:06 +01:00
artemp
c72e3b7a2f Merge branch 'lightmare-to-string' 2016-02-17 10:52:54 +01:00
artemp
de409410a0 Merge branch 'to-string' of https://github.com/lightmare/mapnik into lightmare-to-string 2016-02-17 10:51:20 +01:00
Dane Springmeyer
f014041d9c restore intended variant version - partial revert of 93c4974b1 - refs #3297 2016-02-16 17:07:34 -08:00
Mickey Rose
8762e1d034 benchmarks: add option --min-duration=SECONDS 
- with this option test_runner() will be called repeatedly (doing the
  given number of --iterations each time) until SECONDS have elapsed

- added output column showing average time per iteration, should help
  when comparing different runs

- shrinked the # of iterations column using k/M suffixes
 2016-02-17 01:30:32 +01:00
Dane Springmeyer
93c4974b1b fix PYTHONUSERBASE - broken since b3170c397c [skip ci] 2016-02-16 13:23:34 -08:00
Dane Springmeyer
4beda3bc46 fix #3290 2016-02-16 12:30:40 -08:00
Mickey Rose
2f303e4da4 benchmarks: helper class for running a sequence of tests 2016-02-16 19:53:03 +01:00
Mickey Rose
29c4f730eb benchmarks: fix errors in non-compiling sources 2016-02-16 19:38:09 +01:00
Mickey Rose
ece5b93f08 benchmarks: add option --log-severity 
this option is applied immediately after parsing args to override
MAPNIK_DEFAUL_LOG_SEVERITY
 2016-02-16 18:37:24 +01:00
Mickey Rose
90fcdc90d3 benchmarks: fix output formatting 
snprintf is a better tool for this task, anyway, but here's what was
wrong with the stream formatting:

s << name << ":" << std::setw(45 - (int)s.tellp())

cannot be used to align columns, tellp() may return any of:
    0
    name.length()
    name.length() + strlen(":")

because the compiler is allowed to reorder the evaluation of
sub-expressions as it likes -- it may evaluate s.tellp() before
evaluating (s << name) or in-between (s << name) and (s << ":")

try with gcc-4.8
 2016-02-16 16:27:32 +01:00
artemp
15f905b272 csv - improved quote auto-detection logic which should catch more corner cases 2016-02-16 16:05:12 +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
Mickey Rose
1499475d04 remove to_utf8, instead use UnicodeString::toUTF8String 2016-02-15 21:07:01 +01:00
Mickey Rose
5d1fd56cef csv_grammar: make csv_white_space_skipper a primitive_parser 2016-02-15 15:17:26 +01:00