Oceans as GeoJSON to avoid "blue" zones over lands.

docker-compose.yml

@@ -34,7 +34,7 @@ services:
       - "traefik.enable=true"
       - "traefik.port=8080"
       - "traefik.http.routers.maps-server.entrypoints=web"
-      - "traefik.http.routers.maps-server.rule=PathPrefix(`/tiles`)"
+      - "traefik.http.routers.maps-server.rule=PathPrefix(`/tiles`) || PathPrefix(`/oceans.geojson`)"
     #ports:
       #- "8083:80"
 
@@ -49,4 +49,4 @@ volumes:
   maps-importer:
   maps-postgis:
   maps-server:
-  
+

importer/lib/imposm/index.js

@@ -76,9 +76,6 @@ async function importOceansData(data) {
 async function importOsmFile() {
   const mappingFile = path.join(path.dirname(module.filename), 'mapping.yml');
 
-  // Data extracted from Natural Earth.
-  const oceansFile = path.join(path.dirname(module.filename), 'oceans.json');
-
   logger.info(`Reading ${CONFIG.osmFilePath}...`);
 
   await spawnImposm([
@@ -99,13 +96,6 @@ async function importOsmFile() {
     '-connection', CONFIG.postgisConnection,
   ], fs.createWriteStream(CONFIG.imposmLogFilePath, { flags: 'a' }));
 
-  logger.info('Import oceans...');
-
-  const oceanFileData = JSON.parse(fs.readFileSync(oceansFile));
-  const oceansGeoJson = oceanFileData.features[0].geometry;
-  await importOceansData(oceansGeoJson);
-
-
   logger.info('Deploy production tables...');
 
   await spawnImposm([

server/main.js

@@ -108,82 +108,115 @@ function genQuery(type, x, y, z) {
   `;
 }
 
-http.createServer(async (request, response) => {
-  try {
-    const res = /\/tiles\/(?<type>[a-z0-9_]+)\/(?<z>[0-9]+)\/(?<x>[0-9]+)\/(?<y>[0-9]+).pbf/.exec(request.url);
+async function serverTile(res, request, response) {
+  const pgClient = await pgPool.connect();
 
-    if (res) {
-      const pgClient = await pgPool.connect();
+  // ---- Check mtime from database.
+  const pgMtime = await getPgMtime(pgClient);
 
-      // ---- Check mtime from database.
-      const pgMtime = await getPgMtime(pgClient);
+  let done = false;
 
-      let done = false;
+  if (request.headers['if-modified-since']) {
+    const remoteMTime = new Date(request.headers['if-modified-since']).getTime();
 
-      if (request.headers['if-modified-since']) {
-        const remoteMTime = new Date(request.headers['if-modified-since']).getTime();
+    if (remoteMTime === pgMtime) {
+      response.writeHead(304, {
+        'Access-Control-Allow-Origin': '*',
+        'Last-Modified': new Date(pgMtime).toUTCString(),
+      });
 
-        if (remoteMTime === pgMtime) {
-          response.writeHead(304, {
-            'Access-Control-Allow-Origin': '*',
-            'Last-Modified': new Date(pgMtime).toUTCString(),
-          });
+      response.end();
 
-          response.end();
+      done = true;
+    }
+  }
 
-          done = true;
-        }
-      }
+  if (!done) {
+    const {
+      type, x, y, z,
+    } = res.groups;
 
-      if (!done) {
-        const {
-          type, x, y, z,
-        } = res.groups;
-
-        // ----- Check if tile is already in the cache.
-        const tilePath = path.join(CONFIG.cacheDir, `${type}/${z}/${x}/${y}.pbf`);
-
-        if (fs.existsSync(tilePath)) {
-          // ----- Send cached tile to to client.
-          const data = fs.readFileSync(tilePath);
-
-          response.writeHead(200, {
-            'Content-Type': 'application/octet-stream',
-            'Content-Length': data.length,
-            'Access-Control-Allow-Origin': '*',
-            'From-Cache' : true,
-            'Last-Modified': fs.statSync(tilePath).mtime.toUTCString(),
-          });
-
-          response.end(data, 'binary');
-        } else {
-          // ----- Get tile data from database.
-          const pgRes = await pgClient.query(genQuery(type, x, y, z));
-          const data = pgRes.rows[0].st_asmvt;
-
-          // ----- Send answer to client.
-          response.writeHead(200, {
-            'Content-Type': 'application/octet-stream',
-            'Content-Length': data.length,
-            'Access-Control-Allow-Origin': '*',
-            'From-Cache' : false,
-            'Last-Modified': new Date(pgMtime).toUTCString(),
-          });
-
-          response.end(data, 'binary');
-
-          // ----- Save generated tile in cache.
-          // Temporary name in case we have concurrent connection asking for the same tile.
-          const tmpTilePath = `${tilePath}.tmp_${new Date().getTime()}`;
-
-          mkdirp.sync(path.dirname(tilePath));
-          fs.writeFileSync(tmpTilePath, data, { encoding: 'binary' });
-          fs.renameSync(tmpTilePath, tilePath);
-        }
-      }
+    // ----- Check if tile is already in the cache.
+    const tilePath = path.join(CONFIG.cacheDir, `${type}/${z}/${x}/${y}.pbf`);
 
-      await pgClient.release();
+    if (fs.existsSync(tilePath)) {
+      // ----- Send cached tile to to client.
+      const data = fs.readFileSync(tilePath);
+
+      response.writeHead(200, {
+        'Content-Type': 'application/octet-stream',
+        'Content-Length': data.length,
+        'Access-Control-Allow-Origin': '*',
+        'From-Cache': true,
+        'Last-Modified': fs.statSync(tilePath).mtime.toUTCString(),
+      });
+
+      response.end(data, 'binary');
     } else {
+      // ----- Get tile data from database.
+      const pgRes = await pgClient.query(genQuery(type, x, y, z));
+      const data = pgRes.rows[0].st_asmvt;
+
+      // ----- Send answer to client.
+      response.writeHead(200, {
+        'Content-Type': 'application/octet-stream',
+        'Content-Length': data.length,
+        'Access-Control-Allow-Origin': '*',
+        'From-Cache': false,
+        'Last-Modified': new Date(pgMtime).toUTCString(),
+      });
+
+      response.end(data, 'binary');
+
+      // ----- Save generated tile in cache.
+      // Temporary name in case we have concurrent connection asking for the same tile.
+      const tmpTilePath = `${tilePath}.tmp_${new Date().getTime()}`;
+
+      mkdirp.sync(path.dirname(tilePath));
+      fs.writeFileSync(tmpTilePath, data, { encoding: 'binary' });
+      fs.renameSync(tmpTilePath, tilePath);
+    }
+  }
+
+  await pgClient.release();
+}
+
+async function serveOceans(res, request, response) {
+  // Data based on Natural Earth Data.
+  const filePath = './oceans.geojson';
+
+  const { size, mtime } = fs.statSync(filePath);
+
+  // ----- Send answer to client.
+  response.writeHead(200, {
+    'Content-Type': 'application/geo+json',
+    'Content-Length': size,
+    'Access-Control-Allow-Origin': '*',
+    'Last-Modified': mtime,
+  });
+
+  fs.createReadStream(filePath).pipe(response);
+}
+
+const controllers = [
+  [/\/tiles\/(?<type>[a-z0-9_]+)\/(?<z>[0-9]+)\/(?<x>[0-9]+)\/(?<y>[0-9]+).pbf/, serverTile],
+  [new RegExp('^/oceans.geojson$'), serveOceans],
+];
+
+http.createServer(async (request, response) => {
+  try {
+    let done = false;
+
+    for (const controller of controllers) {
+      const res = controller[0].exec(request.url);
+      if (res) {
+        await controller[1](res, request, response);
+        done = true;
+        break;
+      }
+    }
+
+    if (!done) {
       response.writeHead(404, { 'Content-Type': 'text/plain' });
       response.end(`404 ${http.STATUS_CODES[404]}`);
     }