Enable all platforms again

.dockerignore

@@ -0,0 +1,8 @@
+.vscode
+.git
+build
+build-tmp*
+node_modules
+package-lock.json
+vcpkg
+lib/binding

.github/workflows/npm-publish-github-packages.yml

@@ -0,0 +1,81 @@
+name: Node.js Package
+
+on:
+  release:
+    types: [created]
+
+env:
+  VCPKG_SHA: 5ef52b5b75887fb150711f5effb221dd98b99e6f,
+  NUGET_REGISTRY: https://nuget.pkg.github.com/mathisloge/index.json
+  NUGET_USERNAME: mathisloge
+  VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
+  VCPKG_NUGET_REPOSITORY: https://github.com/mathisloge/vcpkg-nuget.git
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          #- os: windows-latest
+          #  architecture: x64
+          #  node_version: 16
+
+          - os: ubuntu-latest
+            mono: mono
+            architecture: x64
+            node_version: 16
+
+          #- os: macos-latest
+          #  mono: mono
+          #  architecture: x64
+          #  node_version: 16
+
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - uses: ilammy/msvc-dev-cmd@v1
+
+      - uses: actions/checkout@v2
+
+      - name: checkout vcpkg
+        uses: actions/checkout@v2
+        with:
+          repository: "dg0yt/vcpkg"
+          ref: gdal-paths
+          path: vcpkg
+
+      - name: "Setup vcpkg"
+        shell: bash
+        run: ./vcpkg/bootstrap-vcpkg.sh
+
+      - name: "Setup NuGet Credentials"
+        shell: "bash"
+        run: >
+          ${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1`
+          sources add
+          -source "${{ env.NUGET_REGISTRY }}"
+          -storepasswordincleartext
+          -name "GitHub"
+          -username "${{ env.NUGET_USERNAME }}"
+          -password "${{ secrets.NUGET_REGISTRY_PAT }}"
+
+      - name: "Setup NuGet apikey"
+        shell: "bash"
+        run: >
+          ${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1`
+          setapikey "${{ secrets.NUGET_REGISTRY_PAT }}" -Source "${{ env.NUGET_REGISTRY }}"
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node_version }}
+          architecture: ${{ matrix.architecture }}
+          registry-url: 'https://registry.npmjs.org'
+
+      - run: npm install
+
+      - name: upload release assets
+        run: npm run postpublish
+        env:
+          NODE_PRE_GYP_GITHUB_TOKEN: ${{secrets.NUGET_REGISTRY_PAT}}

.github/workflows/npm-test.yml

@@ -0,0 +1,83 @@
+name: Node.js Test
+
+on:
+  push:
+
+env:
+  VCPKG_SHA: 5ef52b5b75887fb150711f5effb221dd98b99e6f
+  NUGET_REGISTRY: https://nuget.pkg.github.com/mathisloge/index.json
+  NUGET_USERNAME: mathisloge
+  VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
+  VCPKG_NUGET_REPOSITORY: https://github.com/mathisloge/vcpkg-nuget.git
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          #- os: windows-latest
+          #  architecture: x64
+          #  node_version: 16
+
+          - os: ubuntu-latest
+            mono: mono
+            architecture: x64
+            node_version: 16
+
+          #- os: macos-latest
+          #  mono: mono
+          #  architecture: x64
+          #  node_version: 16
+
+    steps:
+      - name: Install required system packages
+        shell: "bash"
+        run: |
+          sudo apt-get install -y gperf libxxf86vm-dev ninja-build make
+      - uses: ilammy/msvc-dev-cmd@v1
+
+      - uses: actions/checkout@v2
+
+      - name: checkout vcpkg
+        uses: actions/checkout@v2
+        with:
+          repository: "mathisloge/vcpkg"
+          ref: test/mapnik-static
+          path: vcpkg
+
+      - name: "Setup vcpkg"
+        shell: bash
+        run: ./vcpkg/bootstrap-vcpkg.sh
+
+      - name: "Setup NuGet Credentials"
+        shell: "bash"
+        run: >
+          ${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1`
+          sources add
+          -source "${{ env.NUGET_REGISTRY }}"
+          -storepasswordincleartext
+          -name "GitHub"
+          -username "${{ env.NUGET_USERNAME }}"
+          -password "${{ secrets.NUGET_REGISTRY_PAT }}"
+
+      - name: "Setup NuGet apikey"
+        shell: "bash"
+        run: >
+          ${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1`
+          setapikey "${{ secrets.NUGET_REGISTRY_PAT }}" -Source "${{ env.NUGET_REGISTRY }}"
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node_version }}
+          architecture: ${{ matrix.architecture }}
+          registry-url: 'https://registry.npmjs.org'
+
+      - run: npm install --build-from-source
+      #- run: npm test
+
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: vcpkg-logs
+          path: vcpkg/buildtrees/**/*.log
+          retention-days: 2

.gitignore

@@ -1,6 +1,8 @@
 .DS_Store
 archive
 build
+build-tmp*
+build-cmake
 lib/binding
 lib/mapnik_settings.js
 node_modules
@@ -27,3 +29,5 @@ mason-postgis-config.env
 local-postgres/
 postgres.log
 local-unix-socket/
+package-lock.json
+prebuilds/

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "deps/wagyu"]
-	path = deps/wagyu
-	url = https://github.com/mapbox/wagyu.git
 [submodule "deps/geometry"]
 	path = deps/geometry
 	url = https://github.com/mapbox/geometry.hpp.git
 [submodule "deps/protozero"]
 	path = deps/protozero
 	url = https://github.com/mapbox/protozero.git
+[submodule "deps/wagyu"]
+	path = deps/wagyu
+	url = https://github.com/mapbox/wagyu.git

.npmignore

@@ -7,6 +7,7 @@ bench
 node_modules
 lib/binding
 build
+build-tmp*
 test
 benchmark
 configure
@@ -37,3 +38,5 @@ deps/protozero/test
 mason-postgis-config.env
 local.env
 postgres.log
+vcpkg
+.vscode

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "files.associations": {
+        "iosfwd": "cpp"
+    },
+    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
+    "cmake.configureOnEdit": false
+}

CMakeLists.txt

@@ -0,0 +1,143 @@
+cmake_minimum_required(VERSION 3.15)
+set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake")
+project(node-mapnik)
+
+set(MAPBOX_WAGYU_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/deps/wagyu/include" CACHE INTERNAL "wagyu include dir")
+set(BUILD_TESTING OFF)
+set(MAPNIK_VECTOR_TILE_ENABLE_INSTALL OFF)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+find_package(Threads REQUIRED)
+find_package(PkgConfig)
+pkg_check_modules(Cairo REQUIRED IMPORTED_TARGET cairo)
+pkg_check_modules(PROJ REQUIRED IMPORTED_TARGET proj)
+find_package(Protobuf REQUIRED)
+find_package(mapnik CONFIG REQUIRED COMPONENTS shapeindex mapnik-index)
+
+include(FetchContent)
+FetchContent_Declare(
+  napi_modules
+  GIT_REPOSITORY https://github.com/mathisloge/cmake-napi.git
+  GIT_TAG        cdc5203c12f7e44ccb260b315256590d54b574af
+)
+FetchContent_Declare(
+  mapnik_vector_tile
+  GIT_REPOSITORY https://github.com/mathisloge/mapnik-vector-tile.git
+  GIT_TAG        4ad96069d5241a592d326ee0eca1ce89cf33372f
+  GIT_SUBMODULES "src" # https://gitlab.kitware.com/cmake/cmake/-/issues/20579
+)
+FetchContent_MakeAvailable(mapnik_vector_tile napi_modules)
+FetchContent_GetProperties(napi_modules SOURCE_DIR napi_src)
+list(APPEND CMAKE_MODULE_PATH "${napi_src}/modules")
+include(napi-gyp)
+
+
+execute_process(COMMAND node -p "require('node-addon-api').include"
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE NODE_ADDON_API_DIR
+)
+string(REPLACE "\n" "" NODE_ADDON_API_DIR ${NODE_ADDON_API_DIR})
+string(REPLACE "\"" "" NODE_ADDON_API_DIR ${NODE_ADDON_API_DIR})
+
+add_subdirectory(deps)
+mapnik_find_plugin_dir(MAPNIK_PLUGINS_DIR)
+message(STATUS "Using plugins from ${MAPNIK_PLUGINS_DIR}")
+
+add_library(node-mapnik MODULE
+    src/mapnik_logger.cpp
+    src/node_mapnik.cpp
+    src/blend.cpp
+    src/mapnik_map.cpp
+    src/mapnik_map_load.cpp
+    src/mapnik_map_from_string.cpp
+    src/mapnik_map_render.cpp
+    src/mapnik_map_query_point.cpp
+    src/mapnik_color.cpp
+    src/mapnik_geometry.cpp
+    src/mapnik_feature.cpp
+    src/mapnik_image.cpp
+    src/mapnik_image_encode.cpp
+    src/mapnik_image_open.cpp
+    src/mapnik_image_fill.cpp
+    src/mapnik_image_save.cpp
+    src/mapnik_image_from_bytes.cpp
+    src/mapnik_image_from_svg.cpp
+    src/mapnik_image_solid.cpp
+    src/mapnik_image_multiply.cpp
+    src/mapnik_image_clear.cpp
+    src/mapnik_image_copy.cpp
+    src/mapnik_image_resize.cpp
+    src/mapnik_image_compositing.cpp
+    src/mapnik_image_filter.cpp
+    src/mapnik_image_view.cpp
+    src/mapnik_grid.cpp
+    src/mapnik_grid_view.cpp
+    src/mapnik_palette.cpp
+    src/mapnik_projection.cpp
+    src/mapnik_layer.cpp
+    src/mapnik_datasource.cpp
+    src/mapnik_featureset.cpp
+    src/mapnik_expression.cpp
+    src/mapnik_cairo_surface.cpp
+    src/mapnik_vector_tile.cpp
+    src/mapnik_vector_tile_data.cpp
+    src/mapnik_vector_tile_query.cpp
+    src/mapnik_vector_tile_json.cpp
+    src/mapnik_vector_tile_info.cpp
+    src/mapnik_vector_tile_simple_valid.cpp
+    src/mapnik_vector_tile_render.cpp
+    src/mapnik_vector_tile_clear.cpp
+    src/mapnik_vector_tile_image.cpp
+    src/mapnik_vector_tile_composite.cpp
+)
+set_target_properties(node-mapnik PROPERTIES PREFIX "" OUTPUT_NAME "mapnik" SUFFIX ".node")
+target_include_directories(node-mapnik PRIVATE 
+    ${NODE_ADDON_API_DIR}
+)
+
+target_compile_definitions(node-mapnik PRIVATE 
+    _USE_MATH_DEFINES 
+    MAPNIK_GIT_REVISION=1 
+)
+
+if(MSVC)
+    target_compile_definitions(node-mapnik PRIVATE /wd4068)
+endif()
+
+target_link_libraries(node-mapnik 
+    mapnik::core
+    mapnik::json
+    mapnik::wkt
+    mapnik::mapnik
+    mapbox-geometry
+    mapbox-wagyu
+    mapbox-protozero
+    node::napi
+    mapnik::mapnik-vector-tile
+)
+
+# post build
+file(GENERATE 
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>_copy.cmake" 
+    INPUT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/post_build.cmake"
+)
+
+# installation
+macro(install_variable var)
+    install(CODE "set(${var} \"${${var}}\")")
+endmacro()
+
+install(TARGETS node-mapnik 
+    RUNTIME_DEPENDENCY_SET node-mapnik-deps
+    RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}"
+    LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}"
+)
+install_variable(MAPNIK_FONTS_DIR)
+install_variable(MAPNIK_PLUGINS_DIR)
+install_variable(VCPKG_INSTALLED_DIR)
+install_variable(VCPKG_TARGET_TRIPLET)
+install(CODE "set(SOURCE_DIR \"${CMAKE_CURRENT_SOURCE_DIR}\")")
+install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>_copy.cmake)

Dockerfile

@@ -0,0 +1,9 @@
+FROM ghcr.io/mathisloge/mapnik:docker
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && apt install -y nodejs npm git libprotobuf-dev protobuf-compiler && mkdir /nodemapnik
+
+WORKDIR /nodemapnik
+COPY . .
+RUN npm install && rm -rf build*
+RUN npm run test