merge master

.gitignore

@@ -0,0 +1,3 @@
+node_modules
+npm-debug.log
+.DS_Store

.npmignore

@@ -0,0 +1,8 @@
+.gitignore
+.npmignore
+node_modules
+npm-debug.log
+test
+.DS_Store
+.travis.yml
+appveyor.yml

.travis.yml

@@ -1,19 +1,25 @@
+
 language: node_js
+
 node_js:
 - '0.10'
+
 os:
 - linux
 - osx
+
 before_install:
 - platform=$(uname -s | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/")
  # upgrade libstdc++ to support C++11
 - if [[ ${platform} == 'linux' ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;sudo apt-get update -y;sudo apt-get install -y libstdc++6; fi;
+
 before_script:
 - echo "$TRAVIS_SECURE_ENV_VARS"
 - echo "$TRAVIS_PULL_REQUEST"
 - echo "$TRAVIS_BRANCH"
 - echo "$TRAVIS_COMMIT"
 - echo "$TRAVIS_REPO_SLUG"
+
 script:
 - npm test
 - npm run coverage

CHANGELOG.md

@@ -0,0 +1,8 @@
+
+# Changelog
+
+## 2.2.1
+
+ - Updated node-mapnik to 3.1.1
+ - Updated node-gdal to 0.3.1
+ - Updated node-srs to 0.4.5

README.md

@@ -2,7 +2,9 @@
 Node module that returns metadata of spatial files.
 Version format follows [Semantic Version](http://semver.org/)
 
-[![Build Status](https://travis-ci.org/mapbox/mapnik-omnivore.svg?branch=master)](https://travis-ci.org/mapbox/mapnik-omnivore) [![Coverage Status](https://coveralls.io/repos/mapbox/mapnik-omnivore/badge.png)](https://coveralls.io/r/mapbox/mapnik-omnivore)
+[![Build Status](https://travis-ci.org/mapbox/mapnik-omnivore.svg?branch=master)](https://travis-ci.org/mapbox/mapnik-omnivore)
+[![Build status](https://ci.appveyor.com/api/projects/status/kr1qems47ex9wp3a?svg=true)](https://ci.appveyor.com/project/Mapbox/mapnik-omnivore)
+[![Coverage Status](https://coveralls.io/repos/mapbox/mapnik-omnivore/badge.png)](https://coveralls.io/r/mapbox/mapnik-omnivore)
 
 Currently supports the following file types:
 - geojson/topojson

appveyor.yml

@@ -1,17 +1,39 @@
 environment:
   matrix:
     - nodejs_version: 0.10
-    # https://github.com/naturalatlas/node-gdal/issues/66
-    #- nodejs_version: 0.11
+      msvs_toolset: 12
+      platform: x64
+    - nodejs_version: 0.10.33
+      msvs_toolset: 14
+      platform: x86
+    - nodejs_version: 0.10.33
+      msvs_toolset: 14
+      platform: x64
+    # node v0.11.x broken by https://github.com/joyent/node/issues/8527
 
-platform:
-  - x64
+shallow_clone: true
 
 install:
-  - ps: Install-Product node $env:nodejs_version $env:Platform
-  - ps: Start-FileDownload "https://mapnik.s3.amazonaws.com/dist/dev/VS-2014-runtime/vcredist_$env:Platform.exe"
+  # find and remove default node.exe to avoid conflicts
+  - node -e "console.log(process.execPath)" > node_path.txt
+  - SET /p NODE_EXE_PATH=<node_path.txt
+  - del node_path.txt
+  - del /q /s "%NODE_EXE_PATH%"
+  # add local node to path (since we install it for msvs_toolset == 14)
+  - SET PATH=%CD%;%PATH%;
+  - SET ARCHPATH=
+  - if %platform% == x64 (SET ARCHPATH=x64/)
+  - if "%msvs_toolset%" == "12" powershell Install-Product node $env:nodejs_version $env:platform
+  - if "%msvs_toolset%" == "14" powershell Write-Output "fetching https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/${env:ARCHPATH}node.exe"
+  - if "%msvs_toolset%" == "14" powershell Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/${env:ARCHPATH}node.exe"
+  - powershell Write-Output "https://mapbox.s3.amazonaws.com/node-cpp11/vcredist_$env:platform.exe"
+  - powershell Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/vcredist_$env:platform.exe"
   - .\vcredist_%platform%.exe /q /norestart
-  - npm install
+  - node -v
+  - node -e "console.log(process.argv,process.execPath,process.arch)"
+  - npm -v
+  - if "%msvs_toolset%" == "12" npm install --fallback-to-build=false
+  - if "%msvs_toolset%" == "14" npm install --fallback-to-build=false --toolset=v140
   - npm test
 
 build: OFF

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapnik-omnivore",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "description": "Node module that returns metadata of spatial files.",
   "main": "index.js",
   "keywords": [
@@ -9,10 +9,10 @@
     "geodata"
   ],
   "dependencies": {
-    "srs": "~0.4.3",
-    "mapnik": "3.1.x",
-    "sphericalmercator": "1.0.2",
-    "gdal": "0.2.0"
+    "srs": "~0.4.5",
+    "mapnik": "~3.1.2",
+    "sphericalmercator": "~1.0.2",
+    "gdal": "0.3.1"
   },
   "repository": {
     "type": "git",