@opengis/gis 0.2.0 → 0.2.2

package/server/routes/map/vtile1.js

@@ -4,37 +4,26 @@ const headers = {
 };
 import Sphericalmercator from '@mapbox/sphericalmercator';
 const mercator = new Sphericalmercator({ size: 256 });
-import { getTemplate, getMeta, getFilterSQL } from '@opengis/fastify-table/utils.js';
+import { getColumnCLS, getTemplate, getMeta, getFilterSQL } from '@opengis/fastify-table/utils.js';
 import yaml from 'js-yaml';
 
+const propsCache = {};
+
 export default async function vtile({ params = {}, query, pg, user }, reply) {
     const { y, z } = params;
     const x = params.x.split('.')[0] - 0;
 
     // layer
     const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
-    const data = await getTemplate('layer', layer);
+
     // service
-    const data1 = await pg.query(`select * from gis.services where is_active and ${!user?.uid ? 'is_public' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
-    if (!data && !data1) return { status: 404, message: 'not found' }
-
-    // style
-    const mapData = map ? await getTemplate('map', map) : {};
-    const mapStyle = mapData?.widgets?.find?.(el => el.type === 'attribute')?.config?.layer?.style;
-
-    const geom = data?.geometry_column
-        || data1?.geometry_column
-        || 'geom';
-    const table = data?.source_path
-        || data?.table_name
-        || data1?.source_path;
-    const style = mapStyle
-        || data?.style
-        || (data1?.style ? yaml.load(data1?.style) : null);
-    const filterList = data?.filters
-        || data?.filter_list
-        || data1?.filters;
-    const layerQuery = data?.query || data1?.query;
+    const data = await getTemplate('layer', layer) || await pg.query(`select * from gis.services where is_active and ${!user?.uid ? 'is_public' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
+
+    const geom = data?.geometry_column || 'geom';
+    const table = data?.source_path;
+    const style = typeof data?.style ==='object'?data?.style: yaml.load(data?.style) ;
+    const filterList = data?.filters;
+    const layerQuery = data?.query;
 
     // bbox
     const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
@@ -55,6 +44,32 @@ export default async function vtile({ params = {}, query, pg, user }, reply) {
         return el.type?.[0] === '_' ? `${el.name}[1] as ${el.name}` : `${el.name}${['int4'].includes(el.type) ? '::text' : ''}`;
     });
 
+    const obj = (data.card || []).concat(data.popup || []).filter(el => el.data).reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
+
+    const propsWithCls = propsCache[layer] ?? await Promise.all(props.map(async (key, idx) => {
+        const { name, type, sql } = getColumnCLS(table, key) || {};
+        if (name && type === 'cls') {
+            return `(select name from admin.cls where parent='${name}' and code::text="${key}"::text limit 1) as "${key}_text","${key}"::text`;
+        }
+        if (type === 'select' && sql) {
+            const { fields = [] } = await pg.query(sql + ' limit 0');
+            return `(select "${fields[1].name}" from (${sql})s${idx} where "${fields[0].name}"="${key}" limit 1) as "${key}_text","${key}"::text`
+        }
+
+        if (obj[key]) {
+            const clsdata = await pg.query('select name, type, data as sql from admin.cls where name=$1', [obj[key]]).then(el => el.rows?.[0] || {});
+            if (clsdata.name && clsdata.type === 'json') {
+                return `(select name from admin.cls where parent='${clsdata.name}' and code::text="${key}"::text limit 1) as "${key}_text","${key}"::text`;
+            }
+            if (clsdata.type === 'sql' && clsdata.sql) {
+                const { fields = [] } = await pg.query(clsdata.sql + ' limit 0');
+                return `(select "${fields[1].name}" from (${clsdata.sql})s${idx} where "${fields[0].name}"="${key}" limit 1) as "${key}_text","${key}"::text`
+            }
+        }
+        return `"${key}"::text`;
+    }));
+    if (!propsCache[layer]) { propsCache[layer] = propsWithCls; }
+
     const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
         || (parseInt(z, 10) < parseInt(query.pointZoom || style?.pointZoom || style?.iconZoom || '0', 10) ? `ST_Centroid(${geom})` : geom);
 
@@ -90,7 +105,7 @@ export default async function vtile({ params = {}, query, pg, user }, reply) {
 
                         floor(random() * 100000 + 1)::int + row_number() over() as row,
 
-                        ${props?.length ? `${props.map(el => `"${el}"::text`).join(',')},` : ''}
+                        ${props?.length ? `${propsWithCls.join(',')},` : ''}
 
                         ${pkey} as  id, 
                         ST_AsMVTGeom(st_transform(${geomCol},3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom

package/module/test/map/address/addr.yml

@@ -1,6 +0,0 @@
-label: Адреси
-source_path: data_address.address
-style:
-  color: "#555"
-  weight: 1.5
-visible: false

package/module/test/map/address/index.yml

@@ -1,22 +0,0 @@
----
-id: address
-name: address
-title: Адресний реєстр
-description: Адресний реєстр
-center:
-- 30.5234
-- 50.4501
-zoom: 12
-basemap: osm
-sources: []
-widgets:
-- type: legend
-  position: bottom-right
-  config:
-    items:
-    - label: Житлова зона
-      color: "#4caf50"
-    - label: Комерційна зона
-      color: "#2196f3"
-    - label: Промислова зона
-      color: "#f44336"

package/module/test/map/address/street.yml

@@ -1,16 +0,0 @@
-label: Вулиці
-source_path: data_address.street.table
-style:
-  attribute: type
-  colors:
-    "1": "#4caf50"
-    "2": "#2196f3"
-    "3": "#f44336"
-    "4": "#4caf50"
-    "5": "#2196f3"
-    "6": "#f44336"
-    "8": "#4caf50"
-    "9": "#2196f3"
-    "11": "#f44336"
-    "16": "#4caf50"
-visible: true

package/module/test/map/address2/addr.json

@@ -1,9 +0,0 @@
-{
-  "label": "Адреси",
-  "source_path": "data_address.address",
-  "style": {
-    "color": "#555",
-    "weight": 1.5
-  },
-  "visible": false
-}

package/module/test/map/address2/index.json

@@ -1,35 +0,0 @@
-{
-  "id": "address3",
-  "name": "address",
-  "title": "Адресний реєстр",
-  "description": "Адресний реєстр",
-  "center": [
-    30.5234,
-    50.4501
-  ],
-  "zoom": 12,
-  "basemap": "osm",
-  "sources": [],
-  "widgets": [
-    {
-      "type": "legend",
-      "position": "bottom-right",
-      "config": {
-        "items": [
-          {
-            "label": "Житлова зона",
-            "color": "#4caf50"
-          },
-          {
-            "label": "Комерційна зона",
-            "color": "#2196f3"
-          },
-          {
-            "label": "Промислова зона",
-            "color": "#f44336"
-          }
-        ]
-      }
-    }
-  ]
-}

package/module/test/map/address2/street.json

@@ -1,19 +0,0 @@
-{
-  "label": "Вулиці",
-  "source_path": "data_address.street.table",
-  "style": {
-    "attribute": "type",
-    "colors": {
-      "1": "#4caf50",
-      "2": "#2196f3",
-      "3": "#f44336",
-      "4": "#4caf50",
-      "5": "#2196f3",
-      "6": "#f44336",
-      "8": "#4caf50",
-      "9": "#2196f3",
-      "11": "#f44336",
-      "16": "#4caf50"
-    }
-  }
-}

package/module/test/map/address3.yml

@@ -1,52 +0,0 @@
----
-id: address1
-name: address1
-title: Адресний реєстр
-description: Адресний реєстр.
-center:
-- 30.5234
-- 50.4501
-zoom: 12
-basemap: osm
-sources: []
-layers:
-- id: address3
-  label: Адреси
-  source_path: data_address.address
-  style:
-    attribute: type
-    colors:
-      build: "Будівля / Споруда"
-      countrySeat: "Садибний / Садовий / Дачний будинок"
-      landPlot: "Земельна ділянка"
-      complex: "Комплекс будівель і споруд"
-      undergroundObject: "Підземний об’єкт"
-  visible: true
-- id: street3
-  label: Вулиці
-  source_path: data_address.street.table
-  style:
-    attribute: type
-    colors:
-      "1": "#4caf50"
-      "2": "#2196f3"
-      "3": "#f44336"
-      "4": "#4caf50"
-      "5": "#2196f3"
-      "6": "#f44336"
-      "8": "#4caf50"
-      "9": "#2196f3"
-      "11": "#f44336"
-      "16": "#4caf50"
-  visible: true
-widgets:
-- type: legend
-  position: bottom-right
-  config:
-    items:
-    - label: Житлова зона
-      color: "#4caf50"
-    - label: Комерційна зона
-      color: "#2196f3"
-    - label: Промислова зона
-      color: "#f44336"

package/module/test/map/address4.json

@@ -1,34 +0,0 @@
-{
-  "id": "address2",
-  "name": "address",
-  "title": "Адресний реєстр",
-  "description": "Адресний реєстр.",
-  "center": [
-    30.5234,
-    50.4501
-  ],
-  "zoom": 12,  
-  "layers": [],
-  "widgets": [
-    {
-      "type": "legend",
-      "position": "bottom-right",
-      "config": {
-        "items": [
-          {
-            "label": "Житлова зона",
-            "color": "#4caf50"
-          },
-          {
-            "label": "Комерційна зона",
-            "color": "#2196f3"
-          },
-          {
-            "label": "Промислова зона",
-            "color": "#f44336"
-          }
-        ]
-      }
-    }
-  ]
-}