@opengis/gis 0.2.128 → 0.2.129

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.128",
+  "version": "0.2.129",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

package/server/routes/mapnik/controllers/pretile.js

@@ -7,6 +7,7 @@ import {
 import convertBoundToTile from '../functions/convertBoundToTile.js';
 import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 import cartoBounds from '../functions/cartoBounds.js';
+import rasterInfo from './rasterInfo.js';
 
 const { RenderTile } = mapnik();
 
@@ -46,8 +47,8 @@ export default async function pretile({
     return reply.status(422).send({ error: 'Error: querystring/max must be > querystring/zoom', code: 422 });
   }
 
-  const data = await pg.query(`select *, geom::box2d as bounds, 'raster' as source_type from gis.rasters where raster_id=$1`, [params.id]).then(el => el.rows?.[0])
-    || await pg.query(`select *, geom::box2d as bounds, 'css' as source_type from gis.cartocss where cartocss_id=$1`, [params.id]).then(el => el.rows?.[0]);
+  const data = await pg.query(`select *, 'raster' as source_type from gis.rasters where raster_id=$1`, [params.id]).then(el => el.rows?.[0])
+    || await pg.query(`select *, 'css' as source_type from gis.cartocss where cartocss_id=$1`, [params.id]).then(el => el.rows?.[0]);
 
   if (!data) {
     return reply.status(404).send({ error: 'not found', code: 404 });
@@ -62,7 +63,7 @@ export default async function pretile({
     // refresh extent
     const bounds = data.source_type === 'css'
       ? await cartoBounds({ id: data.cartocss_id, dataset: data.config/* , table: data.card_table */ }, pg)
-      : data.bounds?.replace?.(')', '').substr(4).split(/[, ]/g).map((el) => el - 0);
+      : await rasterInfo({ pg, params: { id: data.raster_id }, query: {} }).then(el => el?.extent); // data.bounds?.replace?.(')', '').substr(4).split(/[, ]/g).map((el) => el - 0)
 
     send(`start: ${data.name} ${params.id} ${bounds} ${data.srid} ${data.proj4}`);
 

package/server/routes/mapnik/controllers/rasterInfo.js

@@ -16,7 +16,7 @@ export default async function rasterInfo({
     }
 
     const raster = pg.pk?.['gis.rasters']
-        ? await pg.query('select raster_id, source_path, name, description, raster_key, is_active, is_public, srid, proj4 from gis.rasters where raster_id=$1::text', [params.id])
+        ? await pg.query('select raster_id, source_path, name, description, raster_key, is_active, is_public, srid, proj4, geom from gis.rasters where raster_id=$1::text', [params.id])
             .then(el => el.rows?.[0] || {})
         : {};
 
@@ -42,6 +42,10 @@ export default async function rasterInfo({
         return { data, cache, raster };
     }
 
+    if (!raster.geom && Array.isArray(data?.extent)) {
+        await pg.query(`update gis.rasters set geom = ST_MakeEnvelope(${data.extent.join(',')}) where raster_id = $1`, [raster.raster_id]);
+    }
+
     return {
         time: Date.now() - time,
         ...data || {},