@opengis/gis 0.2.20 → 0.2.22

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.
Files changed (155) hide show
  1. package/README.md +5 -5
  2. package/dist/index.css +1 -1
  3. package/dist/index.js +1691 -1663
  4. package/dist/index.umd.cjs +20 -20
  5. package/module/cls.json +6 -6
  6. package/module/gis/card/gis.maps.table/index.yml +14 -14
  7. package/module/gis/card/gis.maps.table/main_info.hbs +25 -25
  8. package/module/gis/card/gis.maps.table/maps_layers.hbs +19 -19
  9. package/module/gis/card/gis.metadata.table/index.yml +22 -22
  10. package/module/gis/card/gis.metadata.table/main_info.hbs +20 -20
  11. package/module/gis/card/gis.metadata.table/metadata_info.hbs +27 -27
  12. package/module/gis/card/gis.metadata.table/other.hbs +25 -25
  13. package/module/gis/card/gis.rasters.table/index.yml +11 -11
  14. package/module/gis/card/gis.rasters.table/main_info.hbs +27 -27
  15. package/module/gis/card/gis.registers.table/cls.hbs +36 -36
  16. package/module/gis/card/gis.registers.table/columns.hbs +89 -89
  17. package/module/gis/card/gis.registers.table/filters.hbs +80 -80
  18. package/module/gis/card/gis.registers.table/index.yml +23 -23
  19. package/module/gis/card/gis.registers.table/main_info.hbs +35 -35
  20. package/module/gis/card/gis.registers.table/source.hbs +45 -45
  21. package/module/gis/card/gis.services.table/attributes.hbs +91 -91
  22. package/module/gis/card/gis.services.table/filters.hbs +83 -83
  23. package/module/gis/card/gis.services.table/index.yml +25 -25
  24. package/module/gis/card/gis.services.table/main_info.hbs +27 -27
  25. package/module/gis/card/gis.services.table/source.hbs +25 -25
  26. package/module/gis/cls/bool.yes_no.json +12 -12
  27. package/module/gis/cls/encoding.json +14 -14
  28. package/module/gis/cls/geom_type.json +14 -14
  29. package/module/gis/cls/gis.column_type.json +34 -34
  30. package/module/gis/cls/gis.column_view_type.json +26 -26
  31. package/module/gis/cls/gis.filter_type.json +22 -22
  32. package/module/gis/cls/language.json +10 -10
  33. package/module/gis/cls/meta.service_type.json +42 -42
  34. package/module/gis/cls/ogc.service.json +21 -21
  35. package/module/gis/cls/service_type.json +42 -42
  36. package/module/gis/cls/source_type.json +10 -10
  37. package/module/gis/cls/standarts.json +6 -6
  38. package/module/gis/cls/topic_category.json +106 -106
  39. package/module/gis/cls/update_frequency.json +29 -29
  40. package/module/gis/cls/view.json +21 -21
  41. package/module/gis/form/gis.cartocss.form.json +46 -0
  42. package/module/gis/form/gis.group_list.form.json +17 -17
  43. package/module/gis/form/gis.maps.form.json +64 -64
  44. package/module/gis/form/gis.metadata.form.json +240 -240
  45. package/module/gis/form/gis.ogc_service.form.json +40 -40
  46. package/module/gis/form/gis.rasters.form.json +99 -99
  47. package/module/gis/form/gis.registers.form.json +110 -110
  48. package/module/gis/form/gis.registers_column.form.json +84 -84
  49. package/module/gis/form/gis.registers_filter.form.json +65 -65
  50. package/module/gis/form/gis.services.form.json +120 -120
  51. package/module/gis/form/gis.services_attributes.form.json +75 -75
  52. package/module/gis/form/gis.services_filter.form.json +65 -65
  53. package/module/gis/menu.json +43 -43
  54. package/module/gis/select/pg.columns.parent.sql +6 -6
  55. package/module/gis/select/pg.table_name.sql +17 -17
  56. package/module/gis/select/service_id.sql +1 -1
  57. package/module/gis/table/gis.cartocss.table.json +61 -0
  58. package/module/gis/table/gis.group_list.table.json +35 -35
  59. package/module/gis/table/gis.maps.table.json +69 -69
  60. package/module/gis/table/gis.metadata.table.json +70 -70
  61. package/module/gis/table/gis.ogc_service.table.json +97 -97
  62. package/module/gis/table/gis.rasters.table.json +97 -97
  63. package/module/gis/table/gis.registers.table.json +79 -79
  64. package/module/gis/table/gis.services.table.json +99 -99
  65. package/module/gis/table/site.gis.registers.table.json +88 -88
  66. package/module/gis/table/site.gis.services.table.json +106 -106
  67. package/module/gis/templates/ISO19136_2017_gml_template.xml +330 -330
  68. package/module/gis/tokens.yml +5 -5
  69. package/module/test/cls/bp_build_type.json +37 -37
  70. package/module/test/cls/doc_status.json +31 -31
  71. package/module/test/cls/ts.temp_status.json +18 -18
  72. package/module/test/cls/ts.temp_structure.ts_class.json +49 -49
  73. package/module/test/cls/ts.temp_type.json +9 -9
  74. package/module/test/layer/bp.json +59 -59
  75. package/module/test/layer/bp1.yml +33 -33
  76. package/module/test/layer/individual.yml +53 -53
  77. package/module/test/layer/ts.linking_passport.yml +55 -55
  78. package/module/test/layer/ts.temp_structure.yml +50 -50
  79. package/module/test/map/addr.yml +21 -21
  80. package/module/test/map/bp_myo.json +43 -43
  81. package/module/test/map/bpf.json +43 -43
  82. package/module/test/map/main.json +36 -36
  83. package/module/test/map/mbd.json +91 -91
  84. package/module/test/map/ts.json +52 -52
  85. package/module/test/select/address_id.json +2 -2
  86. package/module/test/select/address_id.sql +7 -7
  87. package/module/test/select/core.user_uid.sql +1 -1
  88. package/module/test/table/data_address.street.table.json +69 -69
  89. package/module/test/table/data_bp_myo.bp.table.json +122 -122
  90. package/package.json +69 -69
  91. package/plugin.js +44 -44
  92. package/server/migrations/maps.sql +30 -30
  93. package/server/migrations/ogc.sql +106 -106
  94. package/server/migrations/rasters.sql +263 -263
  95. package/server/migrations/services.sql +247 -247
  96. package/server/migrations/widgets.sql +20 -20
  97. package/server/plugins/crons.js +21 -21
  98. package/server/plugins/mapnik/funcs/createXML.js +72 -72
  99. package/server/plugins/mapnik/funcs/gdalWrapper.js +72 -72
  100. package/server/plugins/mapnik/funcs/map.proto +241 -241
  101. package/server/plugins/mapnik/funcs/mapnik.js +106 -106
  102. package/server/plugins/mapnik/funcs/rasterConfig.js +11 -11
  103. package/server/plugins/mapnik/funcs/rasterExists.js +20 -20
  104. package/server/plugins/mapnik/funcs/rasterInfo.js +109 -109
  105. package/server/plugins/mapnik/funcs/rasterVrt.js +55 -55
  106. package/server/plugins/mapnik/funcs/rasterXML.js +65 -65
  107. package/server/plugins/mapnik/funcs/rootFolder.mjs +8 -8
  108. package/server/plugins/mapnik/utils/map.proto +241 -241
  109. package/server/plugins/vite.js +74 -74
  110. package/server/routes/gis/dashboard.js +29 -0
  111. package/server/routes/gis/index.mjs +61 -59
  112. package/server/routes/gis/metadata/metadataXML.js +13 -13
  113. package/server/routes/gis/ogc/map.info.point.js +124 -124
  114. package/server/routes/gis/registers/add.registry.js +35 -35
  115. package/server/routes/gis/registers/del.registry.js +14 -14
  116. package/server/routes/gis/registers/funcs/classifiers.js +100 -100
  117. package/server/routes/gis/registers/funcs/columns.js +4 -4
  118. package/server/routes/gis/registers/funcs/content.type.js +9 -9
  119. package/server/routes/gis/registers/funcs/get.info.js +89 -89
  120. package/server/routes/gis/registers/funcs/handleRegistryRequest.js +133 -122
  121. package/server/routes/gis/registers/gis.export.js +148 -148
  122. package/server/routes/gis/registers/gis.registry.js +70 -38
  123. package/server/routes/gis/registers/gis.registry.list.js +59 -59
  124. package/server/routes/gis/registers/insert.columns.js +107 -107
  125. package/server/routes/gis/registers/insert.filters.js +110 -110
  126. package/server/routes/gis/registers/map.registry.js +79 -79
  127. package/server/routes/gis/services/add.service.js +64 -64
  128. package/server/routes/gis/services/del.service.js +12 -12
  129. package/server/routes/gis/services/get.layer.geom.js +27 -27
  130. package/server/routes/gis/services/get.services.col.js +33 -33
  131. package/server/routes/gis/services/get.services.js +84 -84
  132. package/server/routes/gis/services/legend.auto.js +77 -77
  133. package/server/routes/map/controllers/geojson.js +187 -0
  134. package/server/routes/map/controllers/jsonData.js +205 -0
  135. package/server/routes/map/controllers/layerList.js +60 -60
  136. package/server/routes/map/controllers/map.js +123 -123
  137. package/server/routes/map/controllers/mapCatalog.js +72 -72
  138. package/server/routes/map/controllers/mapCatalogAttribute.js +55 -55
  139. package/server/routes/map/controllers/mapFeatures.js +128 -128
  140. package/server/routes/map/controllers/mapFormat.js +83 -83
  141. package/server/routes/map/controllers/mapTiles.js +152 -152
  142. package/server/routes/map/controllers/maps.js +15 -15
  143. package/server/routes/map/controllers/marker_icon.js +43 -43
  144. package/server/routes/map/controllers/rtile.js +134 -134
  145. package/server/routes/map/controllers/vtile.js +172 -172
  146. package/server/routes/map/index.mjs +142 -129
  147. package/server/routes/map/maps/add.map.js +41 -41
  148. package/server/routes/map/maps/del.map.js +18 -18
  149. package/server/routes/map/maps/get.map.js +86 -86
  150. package/server/routes/map/vtile1.js +170 -170
  151. package/server/routes/map/widgets/add.widget.js +38 -38
  152. package/server/routes/map/widgets/del.widget.js +22 -22
  153. package/server/routes/map/widgets/get.widget.js +40 -40
  154. package/server/routes/root.mjs +3 -3
  155. package/utils.js +11 -11
@@ -1,170 +1,170 @@
1
- const headers = {
2
- 'Content-Type': 'application/x-protobuf',
3
- 'Cache-Control': '86400',
4
- };
5
-
6
- import path from 'node:path';
7
- import { existsSync } from 'node:fs';
8
- import { createHash } from 'node:crypto';
9
- import {
10
- readFile, stat, mkdir, writeFile,
11
- } from 'node:fs/promises';
12
-
13
- import Sphericalmercator from '@mapbox/sphericalmercator';
14
-
15
- const mercator = new Sphericalmercator({ size: 256 });
16
-
17
- // import { SphericalMercator } from '@mapbox/sphericalmercator';
18
- // const mercator = new SphericalMercator({ size: 256 });
19
-
20
- import {
21
- getColumnCLS, getTemplate, getMeta, getFilterSQL, getSelect,
22
- } from '@opengis/fastify-table/utils.js';
23
- import yaml from 'js-yaml';
24
- import rootFolder from '../../plugins/mapnik/funcs/rootFolder.mjs';
25
-
26
- const propsCache = {};
27
-
28
- export default async function vtile({
29
- params = {}, query, pg, user,
30
- }, reply) {
31
- const { y, z } = params;
32
- const x = params.x.split('.')[0] - 0;
33
- const {
34
- type, nocache, sql, clusterZoom, filter,
35
- } = query;
36
-
37
- const hash = [type, clusterZoom, filter].join();
38
-
39
- const filepath = path.join(
40
- rootFolder,
41
- `/vtile/${params.layer}/${hash ? `${createHash('md5').update(hash).digest('hex')}/` : ''}${z}/${x}/${y}.vmt`,
42
- );
43
-
44
- if (existsSync(filepath) && +z < 13 && !nocache && !sql && process.env.NODE_ENV !== 'test') {
45
- const { birthtimeMs = Date.now() } = await stat(filepath);
46
- const ageInMs = Date.now() - birthtimeMs;
47
- if (ageInMs < 86400000) {
48
- const buffer = await readFile(filepath);
49
- return reply.status(200).headers(headers).send(buffer);
50
- }
51
- }
52
-
53
- // layer
54
- const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
55
-
56
- // service
57
- const data = await getTemplate('layer', layer) || await pg.query(`select * from gis.services where ${!user?.uid ? 'is_public and is_active' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
58
-
59
- const geom = data?.geometry_column || 'geom';
60
- const table = data?.source_path;
61
- const style = typeof data?.style === 'object' ? data?.style : yaml.load(data?.style);
62
- const filterList = data?.filters;
63
- const layerQuery = data?.query;
64
-
65
- // bbox
66
- const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
67
- const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
68
-
69
- const filterData = query.filter ? await getFilterSQL({
70
- filter: query.filter, table, filterList,
71
- }) : {};
72
-
73
- // meta
74
- const metaTable = await getMeta({ pg, table });
75
- if (metaTable.error) { return metaTable; }
76
- const { pk: pkey = data.key, columns } = metaTable; // if view - specify via template
77
-
78
- // props
79
-
80
- const props = !query.all ? (data.popup || []).concat(data.card || []) : columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
81
-
82
- const cache = layer + (query.all ? '-all' : '') + JSON.stringify(data.popup || []).length;
83
- const propsWithCls = propsCache[cache] ?? await Promise.all(props.map(async (col, idx) => {
84
- const key = col.name;
85
- const select = data.popup?.find(el => el.name === key);
86
- // console.log(select);
87
- const clsData = select?.data || col.data;
88
- const cls = clsData ? await getSelect(clsData).then(el => ({ name: clsData, type: el.arr ? 'cls' : 'select', sql: el.sql })) : null;
89
- const { name, type: type1, sql: sql1 } = cls || getColumnCLS(table, col.data || key) || {};
90
- // console.log({ name, type, sql });
91
- if (name && type1 === 'cls') {
92
- return `(select name from admin.cls where parent='${name}' and code::text=q.${key}::text limit 1) as "${key}_text","${key}"::text`;
93
- }
94
- if (type1 === 'select' && sql1) {
95
- const { fields = [] } = await pg.query(`${sql1} limit 0`);
96
- return `(select "${fields[1].name}" from (${sql1})s${idx} where "${fields[0].name}"::text=q."${key}"::text limit 1) as "${key}_text","${key}"::text`;
97
- }
98
- return `"${key}"::text`;
99
- }));
100
- propsCache[cache] = propsCache[cache] || propsWithCls;
101
-
102
- const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
103
- || (parseInt(z, 10) < parseInt(query.pointZoom || style?.pointZoom || style?.iconZoom || '0', 10) ? `ST_Centroid(${geom})` : geom);
104
-
105
- const koef = {
106
- 10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
107
- }[z] || 0.0005;
108
-
109
- const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
110
- const queryMode = ((clusterZoom - z) > 2 ? 1 : null) || ((clusterZoom - z) > 0 ? 2 : null) || 3;
111
- // console.log(z, clusterZoom, queryMode);
112
- const props1 = props.filter((el, idx, arr) => idx === arr.findIndex(item => item.name === el.name));
113
- const q = {
114
- 1: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
115
- FROM (
116
- 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
117
- FROM (
118
- SELECT st_centroid(st_union(geom)) as geom, count(*) as point_count
119
- FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} ) j
120
- )q`,
121
- 2: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
122
- FROM (
123
- SELECT floor(random() * 100000 + 1)::int +row_number() over() as row, count(*) as point_count,
124
- ${props?.length ? `${props1.map(prop => `case when count(*)=1 then min(${prop.name.replace(/'/g, "''")}) else null end as "${prop.name.replace(/'/g, "''")}"`).join(',')},` : ''}
125
- ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
126
- FROM (
127
- SELECT ${props?.length ? `${props1.map(prop => prop.name).join(',')},` : ''} geom, ST_ClusterDBSCAN(geom,${koef},1) OVER () AS cluster
128
- FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} ) j
129
- WHERE cluster IS NOT NULL
130
- GROUP BY cluster
131
- ORDER BY 1 DESC
132
- )q`,
133
- 3: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
134
- FROM (
135
- SELECT
136
-
137
- floor(random() * 100000 + 1)::int + row_number() over() as row,
138
-
139
- ${props?.length ? `${propsWithCls.join(',')},` : ''}
140
-
141
- ${pkey} as id,
142
- ST_AsMVTGeom(st_transform(${geomCol},3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
143
-
144
- FROM (select * from ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}
145
-
146
- and ${geom} is not null and st_srid(${geom}) >0
147
-
148
-
149
-
150
- ${types[type] ? ` and ST_GeometryType(geom) = any ('{ ${types[type]} }') ` : ''}
151
-
152
- and ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${data?.filter || '1=1'}
153
-
154
- ${(style?.type || data?.geometry_type) === 'polygon' ? `order by st_area(st_transform(${geom},3857)) desc` : ''}
155
-
156
- limit 3000)q
157
- ) q`,
158
- }[queryMode];
159
-
160
- if (query.sql === '1') { return q; }
161
- const tile = await pg.query(q);
162
- const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
163
-
164
- if (!nocache) {
165
- await mkdir(path.dirname(filepath), { recursive: true });
166
- await writeFile(filepath, buffer, 'binary');
167
- }
168
-
169
- return reply.headers({ ...headers, 'Cache-Control': nocache ? 'no-cache' : headers['Cache-Control'] }).send(buffer);
170
- }
1
+ const headers = {
2
+ 'Content-Type': 'application/x-protobuf',
3
+ 'Cache-Control': '86400',
4
+ };
5
+
6
+ import path from 'node:path';
7
+ import { existsSync } from 'node:fs';
8
+ import { createHash } from 'node:crypto';
9
+ import {
10
+ readFile, stat, mkdir, writeFile,
11
+ } from 'node:fs/promises';
12
+
13
+ import Sphericalmercator from '@mapbox/sphericalmercator';
14
+
15
+ const mercator = new Sphericalmercator({ size: 256 });
16
+
17
+ // import { SphericalMercator } from '@mapbox/sphericalmercator';
18
+ // const mercator = new SphericalMercator({ size: 256 });
19
+
20
+ import {
21
+ getColumnCLS, getTemplate, getMeta, getFilterSQL, getSelect,
22
+ } from '@opengis/fastify-table/utils.js';
23
+ import yaml from 'js-yaml';
24
+ import rootFolder from '../../plugins/mapnik/funcs/rootFolder.mjs';
25
+
26
+ const propsCache = {};
27
+
28
+ export default async function vtile({
29
+ params = {}, query, pg, user,
30
+ }, reply) {
31
+ const { y, z } = params;
32
+ const x = params.x.split('.')[0] - 0;
33
+ const {
34
+ type, nocache, sql, clusterZoom, filter,
35
+ } = query;
36
+
37
+ const hash = [type, clusterZoom, filter].join();
38
+
39
+ const filepath = path.join(
40
+ rootFolder,
41
+ `/vtile/${params.layer}/${hash ? `${createHash('md5').update(hash).digest('hex')}/` : ''}${z}/${x}/${y}.vmt`,
42
+ );
43
+
44
+ if (existsSync(filepath) && +z < 13 && !nocache && !sql && process.env.NODE_ENV !== 'test') {
45
+ const { birthtimeMs = Date.now() } = await stat(filepath);
46
+ const ageInMs = Date.now() - birthtimeMs;
47
+ if (ageInMs < 86400000) {
48
+ const buffer = await readFile(filepath);
49
+ return reply.status(200).headers(headers).send(buffer);
50
+ }
51
+ }
52
+
53
+ // layer
54
+ const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
55
+
56
+ // service
57
+ const data = await getTemplate('layer', layer) || await pg.query(`select * from gis.services where ${!user?.uid ? 'is_public and is_active' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
58
+
59
+ const geom = data?.geometry_column || 'geom';
60
+ const table = data?.source_path;
61
+ const style = typeof data?.style === 'object' ? data?.style : yaml.load(data?.style);
62
+ const filterList = data?.filters;
63
+ const layerQuery = data?.query;
64
+
65
+ // bbox
66
+ const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
67
+ const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
68
+
69
+ const filterData = query.filter ? await getFilterSQL({
70
+ filter: query.filter, table, filterList,
71
+ }) : {};
72
+
73
+ // meta
74
+ const metaTable = await getMeta({ pg, table });
75
+ if (metaTable.error) { return metaTable; }
76
+ const { pk: pkey = data.key, columns } = metaTable; // if view - specify via template
77
+
78
+ // props
79
+
80
+ const props = !query.all ? (data.popup || []).concat(data.card || []) : columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
81
+
82
+ const cache = layer + (query.all ? '-all' : '') + JSON.stringify(data.popup || []).length;
83
+ const propsWithCls = propsCache[cache] ?? await Promise.all(props.map(async (col, idx) => {
84
+ const key = col.name;
85
+ const select = data.popup?.find(el => el.name === key);
86
+ // console.log(select);
87
+ const clsData = select?.data || col.data;
88
+ const cls = clsData ? await getSelect(clsData).then(el => ({ name: clsData, type: el.arr ? 'cls' : 'select', sql: el.sql })) : null;
89
+ const { name, type: type1, sql: sql1 } = cls || getColumnCLS(table, col.data || key) || {};
90
+ // console.log({ name, type, sql });
91
+ if (name && type1 === 'cls') {
92
+ return `(select name from admin.cls where parent='${name}' and code::text=q.${key}::text limit 1) as "${key}_text","${key}"::text`;
93
+ }
94
+ if (type1 === 'select' && sql1) {
95
+ const { fields = [] } = await pg.query(`${sql1} limit 0`);
96
+ return `(select "${fields[1].name}" from (${sql1})s${idx} where "${fields[0].name}"::text=q."${key}"::text limit 1) as "${key}_text","${key}"::text`;
97
+ }
98
+ return `"${key}"::text`;
99
+ }));
100
+ propsCache[cache] = propsCache[cache] || propsWithCls;
101
+
102
+ const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
103
+ || (parseInt(z, 10) < parseInt(query.pointZoom || style?.pointZoom || style?.iconZoom || '0', 10) ? `ST_Centroid(${geom})` : geom);
104
+
105
+ const koef = {
106
+ 10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
107
+ }[z] || 0.0005;
108
+
109
+ const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
110
+ const clusterZoom1 = style?.clusterZoom || clusterZoom;
111
+ const queryMode = ((clusterZoom1 - z) > 2 ? 1 : null) || ((clusterZoom1 - z) > 0 ? 2 : null) || 3;
112
+ // console.log(z, clusterZoom, queryMode);
113
+ const props1 = props.filter((el, idx, arr) => idx === arr.findIndex(item => item.name === el.name));
114
+ const q = {
115
+ 1: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
116
+ FROM (
117
+ 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
118
+ FROM (
119
+ SELECT st_centroid(st_union(geom)) as geom, count(*) as point_count
120
+ FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} ) j
121
+ )q`,
122
+ 2: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
123
+ FROM (
124
+ SELECT floor(random() * 100000 + 1)::int +row_number() over() as row, count(*) as point_count,
125
+ ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
126
+ FROM (
127
+ SELECT geom, ST_ClusterDBSCAN(geom,${koef},1) OVER () AS cluster
128
+ FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} ) j
129
+ WHERE cluster IS NOT NULL
130
+ GROUP BY cluster
131
+ ORDER BY 1 DESC
132
+ )q`,
133
+ 3: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
134
+ FROM (
135
+ SELECT
136
+
137
+ floor(random() * 100000 + 1)::int + row_number() over() as row,
138
+
139
+ ${props?.length ? `${propsWithCls.join(',')},` : ''}
140
+
141
+ ${pkey} as id,
142
+ ST_AsMVTGeom(st_transform(${geomCol},3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
143
+
144
+ FROM (select * from ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}
145
+
146
+ and ${geom} is not null and st_srid(${geom}) >0
147
+
148
+
149
+
150
+ ${types[type] ? ` and ST_GeometryType(geom) = any ('{ ${types[type]} }') ` : ''}
151
+
152
+ and ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${data?.filter || '1=1'}
153
+
154
+ ${(style?.type || data?.geometry_type) === 'polygon' ? `order by st_area(st_transform(${geom},3857)) desc` : ''}
155
+
156
+ limit 3000)q
157
+ ) q`,
158
+ }[queryMode];
159
+
160
+ if (query.sql === '1') { return q; }
161
+ const tile = await pg.query(q);
162
+ const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
163
+
164
+ if (!nocache) {
165
+ await mkdir(path.dirname(filepath), { recursive: true });
166
+ await writeFile(filepath, buffer, 'binary');
167
+ }
168
+
169
+ return reply.headers({ ...headers, 'Cache-Control': nocache ? 'no-cache' : headers['Cache-Control'] }).send(buffer);
170
+ }
@@ -1,39 +1,39 @@
1
- import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
2
- export default async function addWidget({
3
- method, params = {}, body, pg = pgClients.client, user = {},
4
- }, reply) {
5
- const { uid } = user;
6
-
7
- if (!uid) {
8
- return reply.status(401).send('unauthorized');
9
- }
10
-
11
- if (!params.map) {
12
- return reply.status(400).send('not enough params: map id');
13
- }
14
-
15
- if (method === 'PUT' && !params.id) {
16
- return reply.status(400).send('not enough params: id');
17
- }
18
-
19
- if (method === 'POST') {
20
- Object.assign(body, { map_id: params.map });
21
- const { rows = [] } = await dataInsert({
22
- pg,
23
- id: params.id,
24
- table: 'gis.widgets',
25
- data: body,
26
- uid,
27
- });
28
- return reply.status(200).send(rows[0]);
29
- }
30
-
31
- const row = await dataUpdate({
32
- pg,
33
- id: params.id,
34
- table: 'gis.widgets',
35
- data: body,
36
- uid,
37
- });
38
- return reply.status(200).send(row);
1
+ import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
2
+ export default async function addWidget({
3
+ method, params = {}, body, pg = pgClients.client, user = {},
4
+ }, reply) {
5
+ const { uid } = user;
6
+
7
+ if (!uid) {
8
+ return reply.status(401).send('unauthorized');
9
+ }
10
+
11
+ if (!params.map) {
12
+ return reply.status(400).send('not enough params: map id');
13
+ }
14
+
15
+ if (method === 'PUT' && !params.id) {
16
+ return reply.status(400).send('not enough params: id');
17
+ }
18
+
19
+ if (method === 'POST') {
20
+ Object.assign(body, { map_id: params.map });
21
+ const { rows = [] } = await dataInsert({
22
+ pg,
23
+ id: params.id,
24
+ table: 'gis.widgets',
25
+ data: body,
26
+ uid,
27
+ });
28
+ return reply.status(200).send(rows[0]);
29
+ }
30
+
31
+ const row = await dataUpdate({
32
+ pg,
33
+ id: params.id,
34
+ table: 'gis.widgets',
35
+ data: body,
36
+ uid,
37
+ });
38
+ return reply.status(200).send(row);
39
39
  }
@@ -1,23 +1,23 @@
1
- import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
2
-
3
- export default async function delWidget({
4
- params = {}, pg = pgClients.client, user = {},
5
- }, reply) {
6
- const { uid } = user;
7
-
8
- if (!uid) {
9
- return reply.status(401).send('unauthorized');
10
- }
11
-
12
- if (!params.map) {
13
- return reply.status(400).send('not enough params: map id');
14
- }
15
-
16
- const row = await dataDelete({
17
- pg,
18
- id: params.id,
19
- table: 'gis.widgets',
20
- uid,
21
- });
22
- return reply.status(200).send(row);
1
+ import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
2
+
3
+ export default async function delWidget({
4
+ params = {}, pg = pgClients.client, user = {},
5
+ }, reply) {
6
+ const { uid } = user;
7
+
8
+ if (!uid) {
9
+ return reply.status(401).send('unauthorized');
10
+ }
11
+
12
+ if (!params.map) {
13
+ return reply.status(400).send('not enough params: map id');
14
+ }
15
+
16
+ const row = await dataDelete({
17
+ pg,
18
+ id: params.id,
19
+ table: 'gis.widgets',
20
+ uid,
21
+ });
22
+ return reply.status(200).send(row);
23
23
  }
@@ -1,41 +1,41 @@
1
- import { getMeta, pgClients } from "@opengis/fastify-table/utils.js";
2
-
3
- const table = 'gis.widgets';
4
-
5
- const columnType = {
6
- text: 'text',
7
- date: 'date',
8
- bool: 'yes/no',
9
- numeric: 'number',
10
- integer: 'number',
11
- 'timestamp without time zone': 'date',
12
- 'timestamp with time zone': 'date',
13
- };
14
-
15
- export default async function getWidget({ params = {}, pg = pgClients.client }, reply) {
16
- if (!params.map) {
17
- return reply.status(400).send('not enough params: map id');
18
- }
19
-
20
- const { columns = [] } = await getMeta({ pg, table }) || {};
21
-
22
- const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
23
-
24
- const rows = pg.pk?.['gis.maps'] && pg.pk?.['gis.widgets'] ? await pg.query(
25
- `SELECT widget_id as id, * FROM gis.widgets where map_id=$1 and ${params.id ? 'widget_id=$2' : '1=1'}`,
26
- [params.map, params.id].filter(Boolean),
27
- ).then(el => el.rows || []) : [];
28
-
29
- if (params.id && !rows.length) {
30
- return reply.status(404).send('widget not found');
31
- }
32
-
33
- if (params.id) {
34
- return reply.status(200).send({ ...rows[0], fields });
35
- }
36
-
37
- return reply.status(200).send({
38
- rows,
39
- fields,
40
- });
1
+ import { getMeta, pgClients } from "@opengis/fastify-table/utils.js";
2
+
3
+ const table = 'gis.widgets';
4
+
5
+ const columnType = {
6
+ text: 'text',
7
+ date: 'date',
8
+ bool: 'yes/no',
9
+ numeric: 'number',
10
+ integer: 'number',
11
+ 'timestamp without time zone': 'date',
12
+ 'timestamp with time zone': 'date',
13
+ };
14
+
15
+ export default async function getWidget({ params = {}, pg = pgClients.client }, reply) {
16
+ if (!params.map) {
17
+ return reply.status(400).send('not enough params: map id');
18
+ }
19
+
20
+ const { columns = [] } = await getMeta({ pg, table }) || {};
21
+
22
+ const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
23
+
24
+ const rows = pg.pk?.['gis.maps'] && pg.pk?.['gis.widgets'] ? await pg.query(
25
+ `SELECT widget_id as id, * FROM gis.widgets where map_id=$1 and ${params.id ? 'widget_id=$2' : '1=1'}`,
26
+ [params.map, params.id].filter(Boolean),
27
+ ).then(el => el.rows || []) : [];
28
+
29
+ if (params.id && !rows.length) {
30
+ return reply.status(404).send('widget not found');
31
+ }
32
+
33
+ if (params.id) {
34
+ return reply.status(200).send({ ...rows[0], fields });
35
+ }
36
+
37
+ return reply.status(200).send({
38
+ rows,
39
+ fields,
40
+ });
41
41
  }
@@ -1,3 +1,3 @@
1
- export default async function (fastify, opts) {
2
- fastify.get(`/test`, () => { return { test: true } });
3
- }
1
+ export default async function (fastify, opts) {
2
+ fastify.get(`/test`, () => { return { test: true } });
3
+ }
package/utils.js CHANGED
@@ -1,11 +1,11 @@
1
- import gisRegistry from './server/routes/gis/registers/gis.registry.js';
2
- import gisRegistryList from './server/routes/gis/registers/gis.registry.list.js';
3
- import mapRegistry from './server/routes/gis/registers/map.registry.js';
4
- import rootFolder from './server/plugins/mapnik/funcs/rootFolder.mjs';
5
-
6
- export {
7
- gisRegistry,
8
- gisRegistryList,
9
- mapRegistry,
10
- rootFolder,
11
- };
1
+ import gisRegistry from './server/routes/gis/registers/gis.registry.js';
2
+ import gisRegistryList from './server/routes/gis/registers/gis.registry.list.js';
3
+ import mapRegistry from './server/routes/gis/registers/map.registry.js';
4
+ import rootFolder from './server/plugins/mapnik/funcs/rootFolder.mjs';
5
+
6
+ export {
7
+ gisRegistry,
8
+ gisRegistryList,
9
+ mapRegistry,
10
+ rootFolder,
11
+ };