@opengis/gis 0.2.2 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,94 +1,89 @@
1
1
  const headers = {
2
- 'Content-Type': 'application/x-protobuf',
3
- 'Cache-Control': 'no-cache',
2
+ 'Content-Type': 'application/x-protobuf',
3
+ 'Cache-Control': 'no-cache',
4
4
  };
5
5
  import Sphericalmercator from '@mapbox/sphericalmercator';
6
+
6
7
  const mercator = new Sphericalmercator({ size: 256 });
7
- import { getColumnCLS, getTemplate, getMeta, getFilterSQL } from '@opengis/fastify-table/utils.js';
8
+ import {
9
+ getColumnCLS, getTemplate, getMeta, getFilterSQL, getSelect,
10
+ } from '@opengis/fastify-table/utils.js';
8
11
  import yaml from 'js-yaml';
9
12
 
10
13
  const propsCache = {};
11
14
 
12
- export default async function vtile({ params = {}, query, pg, user }, reply) {
13
- const { y, z } = params;
14
- const x = params.x.split('.')[0] - 0;
15
-
16
- // layer
17
- const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
18
-
19
- // service
20
- 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]);
21
-
22
- const geom = data?.geometry_column || 'geom';
23
- const table = data?.source_path;
24
- const style = typeof data?.style ==='object'?data?.style: yaml.load(data?.style) ;
25
- const filterList = data?.filters;
26
- const layerQuery = data?.query;
27
-
28
- // bbox
29
- const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
30
- const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
31
-
32
- const filterData = query.filter ? await getFilterSQL({
33
- filter: query.filter, table, filterList,
34
- }) : {};
35
-
36
- // meta
37
- const metaTable = await getMeta({ pg, table });
38
- if (metaTable.error) { return metaTable; }
39
- const { pk: pkey, columns } = metaTable;
40
-
41
- // props
42
- const columnsFiltered = columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
43
- const props = columnsFiltered.map(el => {
44
- return el.type?.[0] === '_' ? `${el.name}[1] as ${el.name}` : `${el.name}${['int4'].includes(el.type) ? '::text' : ''}`;
45
- });
46
-
47
- const obj = (data.card || []).concat(data.popup || []).filter(el => el.data).reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
48
-
49
- const propsWithCls = propsCache[layer] ?? await Promise.all(props.map(async (key, idx) => {
50
- const { name, type, sql } = getColumnCLS(table, key) || {};
51
- if (name && type === 'cls') {
52
- return `(select name from admin.cls where parent='${name}' and code::text="${key}"::text limit 1) as "${key}_text","${key}"::text`;
53
- }
54
- if (type === 'select' && sql) {
55
- const { fields = [] } = await pg.query(sql + ' limit 0');
56
- return `(select "${fields[1].name}" from (${sql})s${idx} where "${fields[0].name}"="${key}" limit 1) as "${key}_text","${key}"::text`
57
- }
58
-
59
- if (obj[key]) {
60
- const clsdata = await pg.query('select name, type, data as sql from admin.cls where name=$1', [obj[key]]).then(el => el.rows?.[0] || {});
61
- if (clsdata.name && clsdata.type === 'json') {
62
- return `(select name from admin.cls where parent='${clsdata.name}' and code::text="${key}"::text limit 1) as "${key}_text","${key}"::text`;
63
- }
64
- if (clsdata.type === 'sql' && clsdata.sql) {
65
- const { fields = [] } = await pg.query(clsdata.sql + ' limit 0');
66
- return `(select "${fields[1].name}" from (${clsdata.sql})s${idx} where "${fields[0].name}"="${key}" limit 1) as "${key}_text","${key}"::text`
67
- }
68
- }
69
- return `"${key}"::text`;
70
- }));
71
- if (!propsCache[layer]) { propsCache[layer] = propsWithCls; }
72
-
73
- const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
15
+ export default async function vtile({
16
+ params = {}, query, pg, user,
17
+ }, reply) {
18
+ const { y, z } = params;
19
+ const x = params.x.split('.')[0] - 0;
20
+
21
+ // layer
22
+ const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
23
+
24
+ // service
25
+ 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]);
26
+
27
+ const geom = data?.geometry_column || 'geom';
28
+ const table = data?.source_path;
29
+ const style = typeof data?.style === 'object' ? data?.style : yaml.load(data?.style);
30
+ const filterList = data?.filters;
31
+ const layerQuery = data?.query;
32
+
33
+ // bbox
34
+ const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
35
+ const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
36
+
37
+ const filterData = query.filter ? await getFilterSQL({
38
+ filter: query.filter, table, filterList,
39
+ }) : {};
40
+
41
+ // meta
42
+ const metaTable = await getMeta({ pg, table });
43
+ if (metaTable.error) { return metaTable; }
44
+ const { pk: pkey, columns } = metaTable;
45
+
46
+ // props
47
+ const props = !query.all ? data.popup || [] : columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
48
+ const cache = layer + (query.all ? '-all' : '');
49
+ const propsWithCls = propsCache[cache] ?? await Promise.all(props.map(async (col, idx) => {
50
+ const key = col.name;
51
+ const select = data.popup?.find(el => el.name === key);
52
+ // console.log(select);
53
+ const clsData = select?.data || col.data;
54
+ const cls = clsData ? await getSelect(clsData).then(el => ({ name: clsData, type: el.arr ? 'cls' : 'select', sql: el.sql })) : null;
55
+ const { name, type, sql } = cls || getColumnCLS(table, col.data || key) || {};
56
+ // console.log({ name, type, sql });
57
+ if (name && type === 'cls') {
58
+ return `(select name from admin.cls where parent='${name}' and code::text=${key}::text limit 1) as "${key}_text","${key}"::text`;
59
+ }
60
+ if (type === 'select' && sql) {
61
+ const { fields = [] } = await pg.query(`${sql} limit 0`);
62
+ return `(select "${fields[1].name}" from (${sql})s${idx} where "${fields[0].name}"::text="${key}"::text limit 1) as "${key}_text","${key}"::text`;
63
+ }
64
+ return `"${key}"::text`;
65
+ }));
66
+ propsCache[cache] = propsCache[cache] || propsWithCls;
67
+
68
+ const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
74
69
  || (parseInt(z, 10) < parseInt(query.pointZoom || style?.pointZoom || style?.iconZoom || '0', 10) ? `ST_Centroid(${geom})` : geom);
75
70
 
76
- const koef = {
77
- 10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
78
- }[z] || 0.0005;
71
+ const koef = {
72
+ 10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
73
+ }[z] || 0.0005;
79
74
 
80
- const { type } = query;
81
- const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
82
- const sql = ((query.clusterZoom - z) > 2
83
- ? `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
75
+ const { type } = query;
76
+ const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
77
+ const sql = ((query.clusterZoom - z) > 2
78
+ ? `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
84
79
  FROM (
85
80
  SELECT floor(random() * 100000 + 1)::int + row_number() over() as row, point_count, ST_AsMVTGeom(st_transform(geom,3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
86
81
  FROM (
87
82
  SELECT st_centroid(st_union(geom)) as geom, count(*) as point_count
88
83
  FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} ) j
89
- )q`: null
90
- ) || ((query.clusterZoom - z) > 0 ?
91
- `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
84
+ )q` : null
85
+ ) || ((query.clusterZoom - z) > 0
86
+ ? `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
92
87
  FROM (
93
88
  SELECT floor(random() * 100000 + 1)::int +row_number() over() as row, count(*) as point_count, ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
94
89
  FROM (
@@ -99,7 +94,7 @@ export default async function vtile({ params = {}, query, pg, user }, reply) {
99
94
  ORDER BY 1 DESC
100
95
  )q`
101
96
 
102
- : `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
97
+ : `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
103
98
  FROM (
104
99
  SELECT
105
100
 
@@ -125,8 +120,8 @@ export default async function vtile({ params = {}, query, pg, user }, reply) {
125
120
  limit 3000)q
126
121
  ) q`);
127
122
 
128
- if (query.sql === '1') { return sql; }
129
- const tile = await pg.query(sql);
130
- const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
131
- return reply.headers(headers).send(buffer);
132
- }
123
+ if (query.sql === '1') { return sql; }
124
+ const tile = await pg.query(sql);
125
+ const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
126
+ return reply.headers(headers).send(buffer);
127
+ }