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

11563 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Mickey Rose
ccf579f450 csv_grammar: simplify csv_line_grammar 2016-02-15 15:15:51 +01:00
artemp
ff54a14e34 update deps 2016-02-15 13:57:54 +01: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
a9e1388b3b csv_grammar - always requre matching closing quoting character 2016-02-15 12:02:45 +01:00
lightmare
f4bb28b2c1 Merge pull request #3292 from lightmare/to-string 
to_expression_string should re-escape backslashes and quotes
 2016-02-15 04:10:36 +01:00
Mickey Rose
2d88fec458 to_expression_string: fix backslash-escapes in strings 2016-02-15 02:45:29 +01:00
Mickey Rose
f19b8e8eff test/expressions: add checks for backslash-escapes in strings 2016-02-15 02:23:19 +01:00
artemp
bfb93c7222 Merge branch 'lightmare-trim-filter-grammar' 2016-02-11 15:43:28 +01:00
artemp
edc2e75474 Merge branch 'trim-filter-grammar' of https://github.com/lightmare/mapnik into lightmare-trim-filter-grammar 2016-02-11 15:43:18 +01:00
artemp
fa6376d9a1 update variant submodule 2016-02-11 10:18:16 +01:00
Dane Springmeyer
10bd37ddd7 avoid unneccesary dependence on << operator of mapnik::enumeration 2016-02-09 10:09:12 -08:00
Dane Springmeyer
8ecb42894f restore << operator for mapnik::enumeration + add unit test 2016-02-09 10:08:29 -08:00
Dane Springmeyer
6c1b6e301d gradient does not need to be a fancy enumeration 2016-02-09 09:56:57 -08:00
Blake Thompson
1d981e899b Merge pull request #3289 from lightmare/lts 
bootstrap: relieve leaning toothpick syndrome
 2016-02-09 09:26:26 -06:00
Mickey Rose
dea4a73927 bootstrap: relieve leaning toothpick syndrome 2016-02-09 15:06:09 +01:00
artemp
87c3032e63 Merge branch 'lightmare-expr-no-barewords' 2016-02-09 14:15:35 +01:00
artemp
f0cc65958f Merge branch 'expr-no-barewords' of https://github.com/lightmare/mapnik into lightmare-expr-no-barewords 2016-02-09 14:15:22 +01:00
artemp
c53b4cdeda update test data ref #3288 2016-02-09 11:44:55 +01:00
Mickey Rose
15f841213a expression_grammar: restrict unquoted strings to single-atom expressions 
- fixes #3017
- closes #3214
 2016-02-08 17:15:13 +01:00
artemp
2b725dd257 shapeindex - skip 'null' shapes (ref #3288) 2016-02-08 15:51:13 +01:00
bergwerkgis
9e7b67e35d Merge branch 'master' of https://github.com/mapnik/mapnik 2016-02-08 13:55:25 +00:00
bergwerkgis
643391ba20 Windows: props file to override solution settings for /MP 2016-02-08 13:55:08 +00:00
Mickey Rose
8da250a0ee show build status badges for master (svg) 
- Travis badge URL was .png
- AppVeyor badge used latest build (any branch)
- [skip ci]
 2016-02-07 14:22:44 +01:00
Mickey Rose
ed8c8df738 expression_grammar: use one symbol table for all constants 2016-02-06 18:40:33 +01:00
Mickey Rose
ae39d48b86 test/expressions: add checks for logical operator precedence 2016-02-06 14:26:57 +01:00
Mickey Rose
959d4ded23 image_filter_grammar: rewrite using Nabialek trick 2016-02-06 02:03:55 +01:00