upgraded modules for watergis's packages

Author: Jin IGARASHI

config.js

@@ -21,7 +21,7 @@ module.exports = {
     ghpages:{
       tiles: export_dir + '/public/tiles'
     },
-    mbtiles: export_dir + '/narok.mbtiles',
+    mbtiles: export_dir + '/data/narok.mbtiles',
     minzoom: 10,
     maxzoom: 16,
     layers : [

docker-compose.yml

@@ -1,11 +1,12 @@
 version: '2'
 services:
   nodejs:
-    image: narwassco/vt-map:v0.0.2
+    image: narwassco/vt-map:v0.0.3
     #build: .
     env_file:
       - ./app-docker.env
     volumes:
       - ./public:/tmp/src/vt-map/public
+      - ./data:/tmp/src/vt-map/data
       - ./config.js:/tmp/src/vt-map/config.js
       - ./config-search.js:/tmp/src/vt-map/config-search.js   

index.js

@@ -1,27 +1,26 @@
-const postgis2mbtiles = require('postgis2mbtiles');
-const {Mbtiles2Pbf, FileExtension} = require('@watergis/mbtiles2pbf');
+const {postgis2vectortiles} = require('@watergis/postgis2vectortiles');
 const {postgis2geojson} = require('@watergis/postgis2geojson');
 const config = require('./config');
 const configSearch = require('./config-search');
 
 const VtMapCreator = () =>{
     console.time('vt-map');
-    //create geojson file for search function
-    createGeoJSONSearch();
-
-    const pg2mbtiles = new postgis2mbtiles(config);
-    const mbtiles2pbf = new Mbtiles2Pbf(config.mbtiles, config.ghpages.tiles, FileExtension.MVT);
-    pg2mbtiles.run()
-    .then(res=>{return mbtiles2pbf.run()})
-    .catch(err=>{console.log(err);}).finally(()=>{
+    const pg2vt = new postgis2vectortiles(config);
+    pg2vt.create(config.ghpages.tiles)
+    .then(res=>{
+        console.log(`Created ${res.no_tiles} vectortiles under folder: ${res.output}`);
+        //create geojson file for search function
+        const pg2json = new postgis2geojson(configSearch);
+        return pg2json.run();
+    })
+    .then(files=>{files.forEach(f=>{
+        console.log(`Created GeoJSON file:${f}`);
+        console.log('Now you are ready to command "npm run deploy" to push vectortiles to gh-pages.');
+    });})
+    .catch(err=>{console.log(err);})
+    .finally(()=>{
         console.timeEnd('vt-map');
     })
 };
 
-const createGeoJSONSearch = async() =>{
-    const pg2json = new postgis2geojson(configSearch);
-    const files = await pg2json.run();
-    files.forEach(f=>{console.log(f)});
-}
-
 module.exports = VtMapCreator();

package-lock.json

@@ -19,10 +19,9 @@
   },
   "homepage": "https://github.com/narwassco/vt-map#readme",
   "dependencies": {
-    "@watergis/mbtiles2pbf": "^0.0.2",
-    "@watergis/postgis2geojson": "^0.1.1",
-    "dotenv": "^8.2.0",
-    "postgis2mbtiles": "git+https://github.com/narwassco/postgis2mbtiles.git"
+    "@watergis/postgis2geojson": "^0.1.6",
+    "@watergis/postgis2vectortiles": "^0.1.3",
+    "dotenv": "^8.2.0"
   },
   "devDependencies": {
     "gh-pages": "^3.0.0"