Merge branch 'master' of github.com:mapnik/node-mapnik into lazy-pbf

mapnik · Sep 1, 2015 · 8b9ff76 · 8b9ff76
2 parents 5633f69 + 52c5f2a
commit 8b9ff76
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -49,7 +49,7 @@ matrix:
 env:
   global:
    - JOBS: "8"
-   - MAPNIK_GIT: v3.0.3
+   - MAPNIK_GIT: v3.0.4
    - secure: F42vcZEgWgCMDvQXlmyYmWwFo86fUjlJbsvXEwyliaMfasjCNsbmeILU61aScn8daiCGD+vRUaRlmv+XxUSS2G8FaoI8ZjwgMo2guMwthAQJ1ohTvf4bZI0JqVYKnnZpzhGPv2zD0DTdt31l30qn2GZnnGrF4yFpPU1HW2HcMuE=
    - secure: WRWrn3KjCaevRo2htdvn26euALTZNCDtcSlQvtH6Bc7yLdhlH5apj+qSuWqlN59f1cprFH+5aQ2zmBkVmAV2DT4IbsfszMIR6k6EetuY6VOugo/qsPW2x/MQbpFgjCbl95bYty4eUH9Bcf70Pz/S+XVewABXHWikJiLUiZBbLyE=
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## 3.4.5
+
+ - Rebuilt against Mapnik 3.0.4
+
+Notable changes in Mapnik SDK include:
+
+ - CSV.input: plug-in has been refactored to minimise memory usage and to improve handling of larger input.
+   (NOTE: [large_csv](https://github.com/mapnik/mapnik/tree/large_csv) branch adds experimental trunsduction parser with deferred string initialisation)
+ - CSV.input: added internal spatial index (boost::geometry::index::tree) for fast `bounding box` queries (https://github.com/mapnik/mapnik/pull/3010)
+ - Fixed deadlock in recursive datasource registration via @zerebubuth (https://github.com/mapnik/mapnik/pull/3038)
+
+## 3.4.4
+
+ - Rebuilt against updated Mapnik SDK to fix mysterious zlib related build issue.
+
 ## 3.4.3
 
  - Upgrade to mapnik-vector-tile@0.9.2
@@ -11,12 +26,12 @@
 
 Notable changes in the Mapnik SDK include:
 
-- Fixed an issue with fields over size of `int32` in `OGR` plugin (https://github.com/mapnik/node-mapnik/issues/499)
-- Added 3 new image-filters to simulate types of colorblindness (`color-blind-protanope`,`color-blind-deuteranope`,`color-blind-tritanope`)
-- Fix so that null text boxes have no bounding boxes when attempting placement ( 162f82cba5b0fb984c425586c6a4b354917abc47 )
-- Patch to add legacy method for setting JPEG quality in images ( #3024 )
-- Added `filter_image` method which can modify an image in place or return a new image that is filtered
-- Added missing typedef's in `mapnik::geometry` to allow experimenting with different containers
+ - Fixed an issue with fields over size of `int32` in `OGR` plugin (https://github.com/mapnik/node-mapnik/issues/499)
+ - Added 3 new image-filters to simulate types of colorblindness (`color-blind-protanope`,`color-blind-deuteranope`,`color-blind-tritanope`)
+ - Fix so that null text boxes have no bounding boxes when attempting placement ( 162f82cba5b0fb984c425586c6a4b354917abc47 )
+ - Patch to add legacy method for setting JPEG quality in images ( #3024 )
+ - Added `filter_image` method which can modify an image in place or return a new image that is filtered
+ - Added missing typedef's in `mapnik::geometry` to allow experimenting with different containers
 
 ## 3.4.2
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 environment:
-  MAPNIK_GIT: 3.0.3
+  MAPNIK_GIT: 3.0.4
   node_pre_gyp_accessKeyId:
     secure: 7DrSVc5eIGtmMcki5H+iRft+Tk3MJTwDBQEUuJHWaQ4=
   node_pre_gyp_secretAccessKey:

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "url": "http://github.com/mapnik/node-mapnik",
   "homepage": "http://mapnik.org",
   "author": "Dane Springmeyer <dane@mapbox.com> (mapnik.org)",
-  "version": "3.4.3",
+  "version": "3.4.5",
   "main": "./lib/mapnik.js",
   "binary": {
     "module_name": "mapnik",