@opengis/gis 0.2.103 → 0.2.105

package/module/test/cls/doc_status.json

@@ -1,32 +1,32 @@
-[
-    {
-        "id": "1",
-        "text": "Діючий",
-        "color": "#1ab394"
-    },
-    {
-        "id": "2",
-        "text": "Зупинений",
-        "color": "#ed82c8"
-    },
-    {
-        "id": "3",
-        "text": "Скасований",
-        "color": "#4a4a4a"
-    },
-    {
-        "id": "5",
-        "text": "Проектний",
-        "color": "#6495ed"
-    },
-    {
-        "id": "7",
-        "text": "Очікує розгляду",
-        "color": "#92b8ef"
-    },
-    {
-        "id": "10",
-        "text": "Архівний",
-        "color": "#d48428"
-    }
+[
+    {
+        "id": "1",
+        "text": "Діючий",
+        "color": "#1ab394"
+    },
+    {
+        "id": "2",
+        "text": "Зупинений",
+        "color": "#ed82c8"
+    },
+    {
+        "id": "3",
+        "text": "Скасований",
+        "color": "#4a4a4a"
+    },
+    {
+        "id": "5",
+        "text": "Проектний",
+        "color": "#6495ed"
+    },
+    {
+        "id": "7",
+        "text": "Очікує розгляду",
+        "color": "#92b8ef"
+    },
+    {
+        "id": "10",
+        "text": "Архівний",
+        "color": "#d48428"
+    }
 ]

package/module/test/select/core.user_uid.sql

@@ -1 +1 @@
-select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users
+select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users

package/package.json

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

package/server/plugins/mapnik/map.proto

@@ -33,6 +33,7 @@ message RenderTileRequest {
     int32 width = 4;
     string ttl = 5; // "5m", "1h", "1d" or "0"
     string debug = 6;
+    optional bool skipSubdir = 7;
 }
 
 message RenderTileOut {
@@ -114,6 +115,7 @@ message CreateXMLRequest {
     string debug = 7;
     string nocache = 8;
     string proj4 = 9;
+    bool skipSubdir = 10;
 }
 
 message UploadXMLRequest {
@@ -185,6 +187,7 @@ message GetRasterInfoRequest {
     string ttl = 2;
     int64 srid = 3;
     string proj4 = 4;
+    bool skipSubdir = 5;
 }
 
 message FileItem {

package/server/routes/gis/cartocss/get.cartocss.js

@@ -18,7 +18,7 @@ export default async function checkCarto({
     }
 
     // extract all columns, migrations-agnostic
-    const cartocss = await pg.query('select *, ARRAY[ST_XMin(geom), ST_YMin(geom),  ST_XMax(geom),  ST_YMax(geom)] as bounds, st_asgeojson(geom)::json as geom from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
+    const cartocss = await pg.query('select *, ARRAY[ST_XMin(geom), ST_YMin(geom),  ST_XMax(geom),  ST_YMax(geom)] as bounds, st_asgeojson(geom)::json as geom, source_path from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
 
     if (!cartocss) {
         return reply.status(404).send({ error: `cartocss not found: ${params.id}`, code: 404 });
@@ -28,14 +28,15 @@ export default async function checkCarto({
     Object.keys(cartocss).filter(key => exclude.includes(key)).forEach(key => delete cartocss[key]);
 
     const rtile = await RenderTile({
-        name: params.id,
+        name: cartocss.source_path ? `vector/${cartocss.source_path}` : params.id, // required for cartocss
         width: 256,
         bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427],
         ttl: '0',
         // debug: query.debug,
     }).catch(err => ({ err: err.toString() }));
 
-    const bounds = cartocss.bounds || await cartoBounds({ id: params.id, dataset: cartocss.config }, pg);
+    // skip empty bounds[null,null,null,null]
+    const bounds = cartocss.bounds && cartocss.geom ? cartocss.bounds : await cartoBounds({ id: params.id, dataset: cartocss.config, table: cartocss.card_table }, pg);
 
     return {
         time: Date.now() - time,

package/server/routes/mapnik/functions/cartoBounds.js

@@ -1,12 +1,17 @@
 import { pgClients } from "@opengis/fastify-table/utils.js";
 
-export default async function cartoBounds({ id, dataset }, pg = pgClients.client) {
-    const sqlBounds = dataset.map(el => ({ tbl: el.table.replace(/"/g, "").split('.'), geom: el.gcol || 'geom' })).map(({ tbl, geom }) => `select ST_EstimatedExtent('${tbl[0]}','${tbl[1]}', '${geom}')`);
-    // const sqlBounds = dataset.map(el => ({ srid: el.srid || 4326, tbl: el.table.split('.'), geom: el.gcol || 'geom' })).map(({ tbl, geom, srid }) => `select st_transform(st_setsrid(ST_EstimatedExtent('${tbl[0]}','${tbl[1]}', '${geom}'),${srid}),4326) as st_estimatedextent`);
+export default async function cartoBounds({ id, dataset, table }, pg = pgClients.client) {
+    if (!dataset?.length && !table) {
+        return [-180, -85.05112877980659, 180, 85.05112877980659];
+    }
+
+    const sqlBounds = dataset
+        ? dataset.map(el => ({ tbl: el.table.replace(/"/g, "").split('.'), geom: el.gcol || 'geom' })).map(({ tbl, geom }) => `select ST_Transform(ST_SetSRID( ST_EstimatedExtent('${tbl[0]}','${tbl[1]}', '${geom}'), (SELECT st_srid(${geom}) from ${tbl.join('.')} limit 1)),4326)`)
+        : [`select ST_Transform(ST_SetSRID(ST_EstimatedExtent('${table.split('.')[0]}', '${table.split('.')[1]}', 'geom'),(SELECT st_srid(geom) from ${table} limit 1)),4326)`];
 
     const geom = await pg.query(
         `update gis.cartocss set             
-        geom=(select st_extent(st_estimatedextent) from ( ${sqlBounds.join(' union all ')})q )
+        geom=(select st_extent(st_transform) from ( ${sqlBounds.join(' union all ')})q )
         where cartocss_id=$1 returning geom::box2d`,
         [id],
     ).then(e => e.rows?.[0]?.geom);

package/server/routes/mapnik/functions/uploadXML.js

@@ -91,8 +91,8 @@ export default async function uploadXML({
         }],
     };
 
-    // generate
-    const res = new carto.Renderer().render(configJson);
+    // generate  mapnik_version: 3,
+    const res = new carto.Renderer({ mapnik_version: 3, cache_resources: true, strict: false }).render(configJson);
     const xmlFileText = typeof res === 'string' ? res : res?.data;
     if (!xmlFileText) {
         throw new Error('xml generation error');