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

12165 commits

This branch
This branch
All branches
Author SHA1 Message Date
artemp
ea7808d6e0 Merge branch 'glarrain-patch-1' 2016-06-02 16:07:23 +02:00
artemp
86d8b6ef5f Merge branch 'patch-1' of https://github.com/glarrain/mapnik into glarrain-patch-1 2016-06-02 16:06:53 +02:00
artemp
d30143c60f remove unsupported ESRI data files 2016-06-02 16:04:43 +02:00
artemp
bca9675b13 Merge remote-tracking branch 'origin/master' 2016-06-02 15:58:39 +02:00
artemp
2f9c2a3a9b update variant submodule 2016-06-02 11:33:43 +02:00
Artem Pavlenko
5aba65e54d Merge pull request #3442 from glarrain/patch-2 
Fix markdown issue in C++ demo README
 2016-05-31 18:30:51 +02:00
Germán Larraín
a876070ccb Fix markdown issue in C++ demo README 
Commands were rendered incorrectly due to missing spaces, causing that `mapnik-config --prefix` was rendered without backticks, which are necessary.
 2016-05-31 13:14:27 -03:00
Germán Larraín
503d4eaea1 fix shapefiles encoding in demo for C++ 
Mapnik builds without `boost_regex_icu` (see #3440) and the C++ demo does not run:

```
/mapnik# demo/c++/rundemo `mapnik-config --prefix`                                                                                                                                         
 running demo ... 
### std::exception: could not create converter for latin1
```
 2016-05-31 12:40:27 -03:00
artemp
efdc90f699 fix building with BIGINT=no (NOTE: some tests will fail) 2016-05-26 17:23:53 +02:00
Artem Pavlenko
ddd61c55ff fix LGPL link 2016-05-26 17:12:18 +02:00
artemp
a24dfbf6a0 simplify logic a bit 2016-05-26 16:27:22 +02:00
artemp
081c003b0e c++ style 2016-05-26 16:27:22 +02:00
Wilhelm Berg
2fb0326892 Update appveyor.yml to use boost 1.60 2016-05-25 13:53:23 +02:00
artemp
cf604518a5 fix typo 2016-05-25 13:08:20 +02:00
Artem Pavlenko
ffe9b21b58 Merge pull request #3435 from woodpeck/patch-1 
Fix DejaVu font directory
 2016-05-25 10:30:50 +02:00
Frederik Ramm
8af8737272 Fix DejaVu font directory 
Fonts in Mapnik tree are now 2.35 not 2.34
 2016-05-25 10:12:53 +02:00
artemp
37a8aed62d transcode input strings to UTF-8 (portability) 2016-05-24 12:16:48 +02:00
artemp
acb2d56f49 prefix string literals with u8"" to force UTF8 encoding (windows) 2016-05-24 10:54:34 +02:00
artemp
b9cc746c07 sync up visual test data 2016-05-24 10:27:44 +02:00
artemp
65a23b436d bump visual test data 2016-05-24 10:15:00 +02:00
artemp
06d487c8d1 update visual data 2016-05-23 17:49:20 +02:00
artemp
de0d384ca9 update test data 2016-05-23 12:30:08 +02:00
Artem Pavlenko
44e1102166 Merge pull request #3434 from mapnik/topojson 
Topojson (refactor)
 2016-05-23 11:44:14 +02:00
artemp
f3ae60fed4 Merge branch 'master' into topojson 2016-05-23 10:52:19 +02:00
artemp
01967cfaff topojson grammar - re-factor to allow geometry elements to be in any order 2016-05-23 10:51:05 +02:00
Dane Springmeyer
d7b6b5669b upgrade to latest mason and latest boost via mason 2016-05-19 19:37:31 -04:00
Dane Springmeyer
20a9112135 remove boost thread checking since it is no longer a dependency 2016-05-19 19:37:31 -04:00
Jiri Drbalek
fee0ad05ce update changelog 2016-05-18 20:06:31 +00:00
Dane Springmeyer
c8cc2670be update visual test data - refs mapnik/mapnik#3416 / mapnik/test-data-visual#34 2016-05-18 13:40:00 -04:00
Dane Springmeyer
44ea60ad5f fix #3431 2016-05-18 13:38:07 -04:00
Artem Pavlenko
536ea734e8 Merge pull request #3418 from mapycz/visual-tests-cairo-vectors 
visual tests: support for Cairo PS, PDF and SVG renderers
 2016-05-18 15:05:27 +02:00
Artem Pavlenko
aec5949d5a Merge pull request #3416 from mapycz/scale-factor-improvements 
Scale factor improvements
 2016-05-18 15:05:04 +02:00
Artem Pavlenko
26aa516ee7 Merge pull request #3429 from mapnik/topojson 
Topojson https://github.com/mapnik/mapnik/issues/3427
 2016-05-18 14:16:29 +02:00
artemp
7b3f607a01 remove omit directive as it breaks type deduction and insists on boost::optional<boost::variant<int, mapnik::json::coordinates> attribute signature (boost 1.61.0) 2016-05-18 13:13:25 +02:00
artemp
c85c0fd025 prealloc memory with reserve 2016-05-18 11:18:26 +02:00
artemp
c10c271430 dereference once 2016-05-18 10:35:58 +02:00
Even Rouault
b2cb39dec8 [GDAL plugin] Add support for non-alpha mask band 
GDAL can support non-alpha mask band, such as a TIFF IFD with
Subfile type=transparency mask. This can be typically used to
create a GeoTIFF with YCbCr JPEG compression for RGB bands and
DEFLATE compression for the mask band.
 2016-05-17 19:44:12 +02:00
artemp
7d72cc1930 more cleanups 2016-05-17 13:47:31 +02:00
artemp
de13582004 remove stderr 2016-05-17 13:45:05 +02:00
artemp
c66fd480b5 simplify rules 2016-05-17 13:05:53 +02:00
artemp
8f74de8525 remove stderr 2016-05-17 13:05:37 +02:00
artemp
4ca0c21d73 move phoenix functions into ctor 2016-05-17 13:00:03 +02:00
artemp
25217549f1 fix topojson parsing (work-in-progress) 2016-05-17 12:53:07 +02:00
artemp
6e326f035d minor formatting 2016-05-17 12:44:46 +02:00
artemp
dc84943575 Fixed https://github.com/mapbox/windows-builds/issues/88 
(inheriting constructors not working with msvc-14.0 2015)
 2016-05-13 15:23:47 +02:00
artemp
9e5b7a9b5e update test data 2016-05-13 12:51:46 +02:00
artemp
3ec25e36fe test geojson.cpp - add empty properties (ref #3426) 2016-05-13 12:48:56 +02:00
artemp
4e6aeaedfc handle empty arrays and objects ref #3426 2016-05-13 11:50:43 +02:00
artemp
4429155759 update test data 2016-05-12 18:54:48 +02:00
artemp
38ec14c739 topojson - use json.value directly 2016-05-12 18:52:05 +02:00