@opengis/gis 0.2.83 → 0.2.85

package/module/gis/table/gis.registers.table.json

@@ -45,7 +45,8 @@
       "ua": "Група сервісу",
       "name": "group_id",
       "data": "gis.group_list",
-      "format": "badge"
+      "format": "badge",
+      "width": 300
     },
     {
       "ua": "Шар на мапі",
@@ -69,8 +70,7 @@
     {
       "ua": "Таблиця в базі даних",
       "name": "table_name",
-      "format": "text",
-      "width": 350
+      "format": "text"
     },
     {
       "ua": "Публічний",

package/module/gis/table/gis.services.table.json

@@ -41,7 +41,8 @@
       "ua": "Група",
       "name": "group_id",
       "data": "gis.group_list",
-      "format": "badge"
+      "format": "badge",
+      "width": 300
     },
     {
       "ua": "Ключові слова",
@@ -52,7 +53,6 @@
     {
       "ua": "Джерело",
       "name": "source_path",
-      "width": 100,
       "slot" : "<span class='text-ellipsis'>{{data.source_path}}</span>",
       "format": "slot"
     },

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.83",
+  "version": "0.2.85",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -19,8 +19,9 @@
     "migrate": "MIGRATE=true bun ./node_modules/@opengis/fastify-table/dist/script/migrate.js",
     "start": "bun server",
     "start:kyiv-demo": "bun --env-file=.env.kyiv-demo server",
-    "start:kamyanske": "bun --env-file=.env.kamyanske server",
+    "kamyanske": "bun --env-file=.env.kamyanske server",
     "start:kr": "bun --env-file=.env.kr server",
+    "poltava": "bun --env-file=.env.poltava --hot server",
     "dev:kyiv-demo": "bun --env-file=.env.kyiv-demo --hot server",
     "dev:kamyanske": "bun --env-file=.env.kamyanske --hot server",
     "dev:kr": "bun --env-file=.env.kr --hot server",

package/server/routes/map/maps/get.map.js

@@ -59,8 +59,8 @@ export default async function getMap({ params = {}, pg = pgClients.client }, rep
     if (layerIds.length > 0) {
       const [resServices, resOgc, resRasters, resCarto] = await Promise.all([
         pg.query(`SELECT service_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center FROM gis.services WHERE is_active = true AND is_public = true AND service_id::text = ANY($1)`, [layerIds]),
-        pg.query(`SELECT ogc_service_id::text as id, url as service_url, * FROM gis.ogc_service WHERE enabled = true AND isadmin = false AND ogc_service_id::text = ANY($1)`, [layerIds]),
-        pg.query(`SELECT raster_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center FROM gis.rasters WHERE is_active = true AND ispublic = true AND isadmin = false AND raster_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT ogc_service_id::text as id, url as service_url, * FROM gis.ogc_service WHERE enabled = true AND ispublic = true AND ogc_service_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT raster_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center FROM gis.rasters WHERE is_active = true AND is_public = true AND isadmin = false AND raster_id::text = ANY($1)`, [layerIds]),
         pg.query(`SELECT cartocss_id::text as id, *, st_asgeojson(geom)::json as bbox FROM gis.cartocss WHERE enabled = true AND is_public = true AND cartocss_id::text = ANY($1)`, [layerIds])
       ]);
 

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

@@ -80,14 +80,16 @@ export default async function rtile({
             ? Buffer.from(raster.source_path).toString('base64url')
             : undefined;
 
-        const data = await RenderTile({
+        const param = {
             path: cartoExists ? null : raster.source_path, // for rasters only
             name: cartoExists && carto.source_path ? `vector/${carto.source_path}` : id, // required for cartocss
             width: 256,
             bbox,
             ttl,
             debug: query.debug,
-        });
+        };
+        // console.log(param);
+        const data = await RenderTile(param);
 
         if (query.debug) {
             return {