Comparing version 3.5.13 to 3.5.14
# Changelog | ||
## 3.5.14 | ||
- Added support for node v6.x | ||
- Now persisting image buffer in `mapnik.Image.fromBufferSync` to prevent undefined behavior if buffer were to go out of scope (#677) | ||
- Upgraded to mapnik-vector-tile@1.2.2 | ||
- Upgraded to protozero@1.4.2 | ||
- Added `typeName()` to `mapnik.Geometry`. This returns the GeoJSON type name of a geometry (@davidtheclark). | ||
- Fixed potential unsigned integer overflow in `mapnik.blend` | ||
- Binaries compiled with clang-3.8 and now requiring >= GLIBCXX_3.4.20 from libstdc++ (https://github.com/mapnik/node-mapnik#depends) | ||
- Binaries updated to use mapnik `v3.0.12`, see [changelog](https://github.com/mapnik/mapnik/blob/master/CHANGELOG.md#3012). | ||
- Binaries updated to use mapnik-packaging@7862fb9: | ||
- icu 56.1 | ||
- boost 1.61.0 | ||
- sqlite 3140100 | ||
- freetype 2.6.5 | ||
- harfbuzz 1.3.0 | ||
- proj 4.9.2 | ||
- libpng 1.6.24 | ||
- libtiff 4.0.6 | ||
- webp 0.5.1 | ||
- jpeg-turbo 1.5.0 | ||
- libpq 9.4.5 | ||
- cairo 1.14.6 | ||
- pixman 0.34.0 | ||
- gdal 2.1.1 | ||
- expat 2.2.0 | ||
## 3.5.13 | ||
- Updated to mapnik-vector-tile `1.2.0`, includes a fix for rare decoding situation in vector tiles where a tile would be incorrectly considered invalid. | ||
- Still using mapnik `v3.0.11` | ||
@@ -10,2 +38,3 @@ ## 3.5.12 | ||
- Fix performance regression when passing raster through vector tile (via upgrade to mapnik-vector-tile@1.1.2) | ||
- Still using mapnik `v3.0.11` | ||
@@ -16,2 +45,3 @@ ## 3.5.11 | ||
- Added new exception handling for toGeoJSON | ||
- Still using mapnik `v3.0.11` | ||
@@ -21,2 +51,3 @@ ## 3.5.10 | ||
- Fix for a segfault in the vector tile clipping library | ||
- Still using mapnik `v3.0.11` | ||
@@ -28,2 +59,3 @@ ## 3.5.9 | ||
- Validation of vector tiles is now optional when using `setData` and `addData` | ||
- Still using mapnik `v3.0.11` | ||
@@ -33,2 +65,3 @@ ## 3.5.8 | ||
- Updated to mapnik-vector-tile `1.0.6` which includes a speedup on simplification for mapnik-vector-tile | ||
- Still using mapnik `v3.0.11` | ||
@@ -35,0 +68,0 @@ ## 3.5.7 |
@@ -11,16 +11,12 @@ # Contributing | ||
Node Mapnik is documented with [JSDoc](http://usejsdoc.org/) comments embedded | ||
in the C++ code and formatted into HTML with [documentationjs](http://documentation.js.org/). You can install DocumentationJS via `npm install -g documentation`. | ||
Please update the inline documentation when adding/editing functionality. All documentation is generated dynamically with [documentationjs](http://documentation.js.org/). Node Mapnik docs are located at mapnik.org/documentation/node-mapnik/. | ||
API Documentation is versioned down to the **minor** patch, like `3.5`. Each version has its own directory within `/documentation`. Patch updates of Node Mapnik should overwrite current API docs. Any new minor releases should generate a new directory. | ||
All documentation is updated on a daily basis if there have been changes to the `master` branch. To view your documentation changes locally: | ||
To update the [hosted documentation](http://mapnik.org/node-mapnik/documentation/): | ||
```bash | ||
npm run docs | ||
python -m SimpleHTTPServer # localhost:8000/documentation/<version> | ||
``` | ||
* Clone the Node Mapnik Theme repository `git clone git@github.com:mapnik/node-mapnik-theme.git` | ||
* Make changes to JSDoc comments | ||
* Regenerate/generate documentation depending on if you are updating a minor patch or creating a new one: `documentation build src/*.cpp --polyglot -f html -o documentation/<version>/ --github --name "Node Mapnik <version>" -t /path/to/node-mapnik-theme -c documentation/config.json`. This should be done on your own branch. | ||
* Merge changes into `master` | ||
* Switch to the `gh-pages` branch: `git checkout gh-pages` | ||
* merge changes from `master` into `gh-pages` | ||
* commit those changes and push to Github | ||
*Note: since mapnik.org has a specific theme for documentationjs, it will look different than viewing locally.* | ||
@@ -118,3 +114,3 @@ ## Testing | ||
- Publishing new binaries for a non-alpha version like `3.1.5`. So you'd want to merge your branch and then edit the `version` value in package json back to a decent value for release. | ||
- Create a github tag like `git tag --annotate 3.1.5 -m "v3.1.5"` | ||
- Create a github tag like `git tag --annotate v3.1.5 -m "v3.1.5"` | ||
- Push new tags `git push --tags` | ||
@@ -121,0 +117,0 @@ - Optional: Test mapnik-swoop again for your new tagged version |
@@ -89,2 +89,29 @@ "use strict"; | ||
function getGeometryType(mapnikType) { | ||
switch (mapnikType) { | ||
case mapnik.Geometry.Point: | ||
return 'Point'; | ||
case mapnik.Geometry.LineString: | ||
return 'LineString'; | ||
case mapnik.Geometry.Polygon: | ||
return 'Polygon'; | ||
case mapnik.Geometry.MultiPoint: | ||
return 'MultiPoint'; | ||
case mapnik.Geometry.MultiLineString: | ||
return 'MultiLineString'; | ||
case mapnik.Geometry.MultiPolygon: | ||
return 'MultiPolygon'; | ||
case mapnik.Geometry.GeometryCollection: | ||
return 'GeometryCollection'; | ||
case mapnik.Geometry.Unknown: | ||
return 'Unknown'; | ||
default: | ||
return 'Unknown'; | ||
} | ||
} | ||
mapnik.Geometry.prototype.typeName = function() { | ||
return getGeometryType(this.type()); | ||
}; | ||
mapnik.Feature.prototype.toWKB = function() { | ||
@@ -91,0 +118,0 @@ return this.geometry().toWKB(); |
@@ -7,4 +7,4 @@ { | ||
"author": "Dane Springmeyer <dane@mapbox.com> (mapnik.org)", | ||
"version": "3.5.13", | ||
"mapnik_version":"3.0.11", | ||
"version": "3.5.14", | ||
"mapnik_version":"v3.0.12", | ||
"main": "./lib/mapnik.js", | ||
@@ -45,6 +45,6 @@ "binary": { | ||
"dependencies": { | ||
"mapnik-vector-tile": "1.2.0", | ||
"nan": "~2.2.0", | ||
"node-pre-gyp": "~0.6.25", | ||
"protozero": "~1.3.0" | ||
"mapnik-vector-tile": "~1.2.2", | ||
"nan": "~2.4.0", | ||
"node-pre-gyp": "~0.6.30", | ||
"protozero": "~1.4.2" | ||
}, | ||
@@ -61,3 +61,3 @@ "bin": { | ||
"install": "node-pre-gyp install --fallback-to-build", | ||
"docs": "documentation src/*.cpp --polyglot -o documentation -f html --github --name Mapnik" | ||
"docs": "documentation build src/*.cpp --polyglot -o documentation -f html --github --name Mapnik" | ||
}, | ||
@@ -64,0 +64,0 @@ "devDependencies": { |
@@ -72,18 +72,22 @@ # node-mapnik | ||
* Node v0.10.x or v0.12.x (v0.12.x support requires node-mapnik >= v3.1.6) | ||
* C++11 compatible C++ runtime library | ||
OS|Node.js|C++ minimum requirements|OS versions | ||
---|---|---|--- | ||
Mac|v0.10.x, v4, v5, v6|C++11|Mac OS X > 10.10 | ||
Linux|v0.10.x, v4, v5, v6|C++11|Ubuntu Linux > 16.04 or other Linux distributions with g++ >= 5 toolchain (>= GLIBCXX_3.4.20 from libstdc++) | ||
Windows|v0.10.x, v4, v5|C++11|See the [Windows requirements](https://github.com/mapnik/node-mapnik#windows-specific) section | ||
An installation error like below indicates your system does not have a modern enough libstdc++/gcc-base toolchain: | ||
## Troubleshooting | ||
``` | ||
Error: /usr/lib/x86_64-linux-gnu/libstdc++.so.6: version GLIBCXX_3.4.20 not found (required by /node_modules/osrm/lib/binding/osrm.node) | ||
``` | ||
If you hit an error like: | ||
If you are running Ubuntu older than 16.04 you can easily upgrade your libstdc++ version like: | ||
Error: /usr/lib/x86_64-linux-gnu/libstdc++.so.6: version `GLIBCXX_3.4.18' not found | ||
``` | ||
sudo add-apt-repository ppa:ubuntu-toolchain-r/test | ||
sudo apt-get update -y | ||
sudo apt-get install -y libstdc++-5-dev | ||
``` | ||
This means your Linux distributions libstdc++ library is too old (for example you are running Ubuntu Precise rather than Trusty). To work around this upgrade libstdc++: | ||
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test | ||
sudo apt-get update -q | ||
sudo apt-get install -y libstdc++6 | ||
To upgrade libstdc++ on travis (without sudo) you can do: | ||
@@ -101,3 +105,3 @@ | ||
packages: | ||
- libstdc++6 # upgrade libstdc++ on linux to support C++11 | ||
- libstdc++-5-dev # upgrade libstdc++ on linux to support C++11 | ||
``` | ||
@@ -104,0 +108,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
999352
318
177
64
+ Addedmapnik-vector-tile@1.2.2(transitive)
+ Addednan@2.4.0(transitive)
+ Addedprotozero@1.4.5(transitive)
- Removedmapnik-vector-tile@1.2.0(transitive)
- Removednan@2.2.1(transitive)
- Removedprotozero@1.3.0(transitive)
Updatedmapnik-vector-tile@~1.2.2
Updatednan@~2.4.0
Updatednode-pre-gyp@~0.6.30
Updatedprotozero@~1.4.2