Eliminate large JSON file processing in Serge

Author: lilitkarapetyan

data/atlantic-cells-15k.json

@@ -13,8 +13,7 @@
   "pkg": {
     "assets": [
       "../client/build/**/*",
-      "../server/**/*",
-      "../data/*"
+      "../server/**/*"
     ],
     "scripts": [
       "../server/addons/**/*"

data/atlantic-cells-6k.json

@@ -13,7 +13,6 @@ const fs = require('fs')
 const root = './serge/'
 const dbDir = './serge/db/'
 const imgDir = './serge/img/'
-const dataDir = './serge/data/'
 const remoteServer = process.argv[2] || null
 
 if (!fs.existsSync(root)) {
@@ -28,10 +27,6 @@ if (!fs.existsSync(imgDir)) {
   fs.mkdirSync(imgDir)
 }
 
-if (!fs.existsSync(dataDir)) {
-  fs.mkdirSync(dataDir)
-}
-
 const extract = (src, dest) => {
   if (!fs.existsSync(dest)) {
     const dbData = fs.readFileSync(src)
@@ -49,19 +44,6 @@ fs.readdir(dbPath, (err, dbs) => {
   })
 })
 
-const dataPath = path.join(__dirname, '..', 'data')
-fs.readdir(dataPath, (err, data) => {
-  if (err) {
-    throw err
-  }
-  data.forEach(json => {
-    if (json === 'package.json') {
-      return
-    }
-    extract(`${dataPath}/${json}`, `${dataDir}/${json}`)
-  })
-})
-
 const onAppInitListeningAddons = []
 const onAppStartListeningAddons = []
 
@@ -93,7 +75,6 @@ setTimeout(() => {
       ]
     },
     imgDir, // images directory
-    dataDir,
     process.env.PORT || 8080, // port
     remoteServer, // remote server path
     onAppInitListeningAddons,

data/atlantic-coarse.json

@@ -35,7 +35,6 @@ server(
     ]
   },
   './img', // images directory
-  '',
   process.env.PORT || 8080, // port
   null, // remote server path
   onAppInitListeningAddons,

data/atlantic-polygons.json

@@ -2,7 +2,6 @@ const runServer = (
   pouchOptions,
   corsOptions,
   imgDir,
-  dataDir,
   port,
   remoteServer,
   onAppInitListeningAddons,
@@ -117,26 +116,6 @@ const runServer = (
     res.status(200).send({ ip: req.ip })
   })
 
-  app.get('/cells/:filename', (req, res) => {
-    if (dataDir) {
-      return res.sendFile(
-        path.join(process.cwd(), dataDir, req.params.filename)
-      )
-    }
-    res.sendFile(path.join(__dirname, '../', 'data', req.params.filename))
-  })
-
-  app.get('/tiles/:folder/:z/:y/:x', (req, res) => {
-    const { folder, z, y, x } = req.params
-    if (dataDir) {
-      return res.sendFile(
-        path.join(process.cwd(), dataDir, folder, z, y, x)
-      )
-    }
-
-    res.sendFile(path.join(__dirname, '../', 'data', folder, z, y, x))
-  })
-
   app.use(
     '/saveIcon',
     express.raw({ type: ['image/png', 'image/svg+xml'], limit: '20kb' })