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

11971 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dane Springmeyer
4edb57bf11 Merge pull request #3315 from mapnik/faster-csv-compile 
Speed up CSV plugin / mapnik-index compile
 2016-03-02 12:22:16 -08:00
Mickey Rose
d4566c28d2 gdal: only register drivers once 
- refs #3339, #3093
 2016-03-02 21:21:59 +01:00
Dane Springmeyer
10a9dba143 trim includes in json/error_handler.hpp 2016-03-02 12:17:12 -08:00
Dane Springmeyer
d148a966c8 from_geojson/to_geojson are now used in unit tests, csv plugin, and node-mapnik so move these to cpp 2016-03-02 11:26:56 -08:00
Dane Springmeyer
72459b3140 Merge branch 'master' of github.com:mapnik/mapnik into faster-csv-compile 2016-03-02 11:10:23 -08:00
Dane Springmeyer
31171824ec Merge pull request #3326 from lightmare/faster-csv-compile 
merge mapnik-index::process_csv_file and csv_datasource::parse_csv
 2016-03-02 10:47:05 -08:00
artemp
9138d64725 value.hpp - fix error C2375: redefinition; different linkage 2016-03-02 17:15:05 +01:00
artemp
a549803b5b to_utf8 : fix visibility via MAPNIK_DECL 2016-03-02 17:02:25 +01:00
artemp
f11cc5920f revive lost to_utf8 method but move it into '<mapnik/unicode.hpp>' 2016-03-02 16:47:55 +01:00
artemp
65da617ec0 re-use vector_converter + move apply_marker_multi into *.cpp 2016-03-02 16:20:10 +01:00
artemp
ff7d04f209 Merge branch 'lightmare-markers-placements-union' 2016-03-02 12:48:26 +01:00
Mickey Rose
66e7ef58d7 refactor markers_placement_finder 
- refs #3327

Replace member variant of placement-type implementations with plain
union. The active implementation is chosen at construction time like
before.

Make placement-type implementation classes virtual to allow invoking
the active union member through a base class pointer.
 2016-03-02 00:53:45 +01:00
artemp
77eaaa1259 move vertex_adapters implementation into .cpp - mark extern 2016-03-01 21:55:47 +01:00
artemp
053faa8a27 remove unused vars/cleanup 2016-03-01 20:49:54 +01:00
artemp
bb78b178cd reuse type 2016-03-01 20:37:23 +01:00
artemp
4c8928dd8c Merge branch 'master' into value-cpp 2016-03-01 17:43:02 +01:00
artemp
d374829b30 refactor apply_markers_multi and help compiler a bit more (re-enable support for GEOMETRYCOLLECTION) 2016-03-01 17:29:03 +01:00
artemp
45b54c703c apply_marker_multi - unroll template instantiation logic + drop 'GeometryCollection' support (experimental) 2016-03-01 17:28:09 +01:00
artemp
566c99807f minor formatting 2016-03-01 17:27:59 +01:00
bergwerkgis
bd4c97f82d [skip ci] AppVeyor: update %ICU_VERSION% 2016-02-29 13:58:59 +00:00
bergwerkgis
820ab82de9 [skip ci] AppVeyor: enable Postgres (for tests) 2016-02-29 13:37:09 +00:00
Mickey Rose
930056f5db benchmarks: fix over-width number formatting issue 2016-02-28 01:04:35 +01:00
Mickey Rose
db58b8b578 benchmarks: synchronize threads before starting the benchmark 2016-02-28 00:28:00 +01:00
Mickey Rose
02286bb7d1 benchmarks: report iterations per second instead of the inverse 2016-02-27 22:23:28 +01:00
Mickey Rose
3fdc799e84 benchmarks: rename option --log-severity to --log for consistency 
- haven't noticed before that test/visual/run already had --log,
  and test/unit/run received that option recently

- pass --log=none by default in benchmark/run script
 2016-02-27 22:19:08 +01: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
Dane Springmeyer
e836836bdc [make release] add variant, increase depth to avoid (likely) checkout problems of test data [skip ci] 2016-02-26 10:42:03 -08:00
artemp
a4d7f03bb6 output detected newline character for debugging (ref #3220) 2016-02-26 19:20:23 +01:00
artemp
3ee109f46b allow any trailing combinations of line-endings (unix, mac, dos) (ref #3320) 2016-02-26 19:19:32 +01:00
Dane Springmeyer
776c599185 update CHANGELOG for mapnik v3.0.10 release [skip ci] 2016-02-25 16:37:57 -08:00
Dane Springmeyer
5c0d496c82 setting up for mapnik v3.0.10 release [skip ci] 2016-02-25 16:37:35 -08:00
Dane Springmeyer
7c555ca696 Add changelog for v3.0.10 [skip ci] 2016-02-25 16:17:05 -08:00
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