@opengis/gis 0.2.120 → 0.2.122

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 (195) hide show
  1. package/README.md +148 -148
  2. package/dist/{CardIcon-Dx_myDwM.js → CardIcon-Bu_mm6QX.js} +1 -1
  3. package/dist/{EntityCreatePage-Ch8NU_Yw.js → EntityCreatePage-Da8XgBKU.js} +14 -14
  4. package/dist/{EntityEditPage-CRRcW7FL.js → EntityEditPage-QktKEAxz.js} +27 -27
  5. package/dist/{EntityTablePage-DY9v1aWL.js → EntityTablePage-BQKMFYxV.js} +26 -26
  6. package/dist/{ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-DgQHLSak.js → ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-CF1EEob3.js} +1 -1
  7. package/dist/{HeaderActions.vue_vue_type_script_setup_true_lang-BQ32ioLC.js → HeaderActions.vue_vue_type_script_setup_true_lang-B2ErIdAR.js} +30 -30
  8. package/dist/{MapSettings-CaGPr5uG.js → MapSettings-eE5rNSLf.js} +33 -33
  9. package/dist/{RastersTablePage-CJyO2DoI.js → RastersTablePage-B_vF9yl7.js} +29 -29
  10. package/dist/{cartocss-Bhat1m61.js → cartocss-DcepkzNt.js} +12 -12
  11. package/dist/{import-utils-BxeYqcn7.js → import-utils-CDIgsIUf.js} +33 -33
  12. package/dist/{index-Ba6SE4TN.js → index-CActL7Mw.js} +64 -64
  13. package/dist/index.css +1 -1
  14. package/dist/index.js +1 -1
  15. package/dist/index.umd.cjs +12 -12
  16. package/dist/{raster-Cbs1xR5Y.js → raster-BsBJMgM3.js} +101 -101
  17. package/dist/{register-D0AsH83v.js → register-BSlpAeRe.js} +8 -8
  18. package/dist/{service-C4nt_DBO.js → service-CbPCldfY.js} +11 -11
  19. package/dist/{vs-datatable-QG5b0CCL.js → vs-datatable-RkRQEa10.js} +28 -28
  20. package/module/cls.json +6 -6
  21. package/module/gis/card/gis.metadata.table/index.yml +22 -22
  22. package/module/gis/card/gis.metadata.table/main_info.hbs +20 -20
  23. package/module/gis/card/gis.metadata.table/metadata_info.hbs +27 -27
  24. package/module/gis/card/gis.metadata.table/other.hbs +25 -25
  25. package/module/gis/card/gis.rasters.table/index.yml +11 -11
  26. package/module/gis/card/gis.rasters.table/main_info.hbs +27 -27
  27. package/module/gis/card/gis.registers.table/cls.hbs +36 -36
  28. package/module/gis/card/gis.registers.table/columns.hbs +89 -89
  29. package/module/gis/card/gis.registers.table/filters.hbs +80 -80
  30. package/module/gis/card/gis.registers.table/index.yml +23 -23
  31. package/module/gis/card/gis.registers.table/main_info.hbs +35 -35
  32. package/module/gis/card/gis.registers.table/source.hbs +45 -45
  33. package/module/gis/card/gis.services.table/attributes.hbs +91 -91
  34. package/module/gis/card/gis.services.table/filters.hbs +83 -83
  35. package/module/gis/card/gis.services.table/index.yml +25 -25
  36. package/module/gis/card/gis.services.table/main_info.hbs +27 -27
  37. package/module/gis/card/gis.services.table/source.hbs +25 -25
  38. package/module/gis/cls/bool.yes_no.json +12 -12
  39. package/module/gis/cls/encoding.json +14 -14
  40. package/module/gis/cls/geom_type.json +14 -14
  41. package/module/gis/cls/gis.column_type.json +34 -34
  42. package/module/gis/cls/gis.column_view_type.json +26 -26
  43. package/module/gis/cls/gis.filter_type.json +22 -22
  44. package/module/gis/cls/language.json +10 -10
  45. package/module/gis/cls/meta.service_type.json +42 -42
  46. package/module/gis/cls/ogc.service.json +21 -21
  47. package/module/gis/cls/service_type.json +42 -42
  48. package/module/gis/cls/source_type.json +10 -10
  49. package/module/gis/cls/standarts.json +6 -6
  50. package/module/gis/cls/topic_category.json +106 -106
  51. package/module/gis/cls/update_frequency.json +29 -29
  52. package/module/gis/cls/view.json +21 -21
  53. package/module/gis/form/feedback.answer.form.json +10 -10
  54. package/module/gis/form/gis.cartocss.form.json +54 -54
  55. package/module/gis/form/gis.group_list.form.json +17 -17
  56. package/module/gis/form/gis.maps.form.json +61 -61
  57. package/module/gis/form/gis.metadata.form.json +240 -240
  58. package/module/gis/form/gis.metadata_new.form.json +195 -195
  59. package/module/gis/form/gis.ogc_service.form.json +51 -51
  60. package/module/gis/form/gis.rasters.form.json +76 -76
  61. package/module/gis/form/gis.registers.form.json +124 -124
  62. package/module/gis/form/gis.registers_column.form.json +84 -84
  63. package/module/gis/form/gis.registers_filter.form.json +65 -65
  64. package/module/gis/form/gis.services.form.json +111 -111
  65. package/module/gis/form/gis.services_attributes.form.json +75 -75
  66. package/module/gis/form/gis.services_filter.form.json +65 -65
  67. package/module/gis/menu.json +43 -43
  68. package/module/gis/select/admin.cls.name.sql +2 -2
  69. package/module/gis/select/layer_list.sql +7 -7
  70. package/module/gis/select/layer_list_text.sql +7 -7
  71. package/module/gis/select/pg.column_name.geometry.sql +12 -12
  72. package/module/gis/select/pg.columns.parent.sql +6 -6
  73. package/module/gis/select/pg.table_name.sql +17 -17
  74. package/module/gis/select/service_id.sql +1 -1
  75. package/module/gis/table/gis.cartocss.table.json +74 -74
  76. package/module/gis/table/gis.group_list.table.json +58 -58
  77. package/module/gis/table/gis.maps.table.json +110 -110
  78. package/module/gis/table/gis.metadata.table.json +70 -70
  79. package/module/gis/table/gis.metadata_new.table.json +137 -137
  80. package/module/gis/table/gis.ogc_service.table.json +100 -100
  81. package/module/gis/table/gis.rasters.table.json +101 -101
  82. package/module/gis/table/gis.registers.table.json +143 -143
  83. package/module/gis/table/gis.services.table.json +120 -120
  84. package/module/gis/table/site.gis.registers.table.json +88 -88
  85. package/module/gis/table/site.gis.services.table.json +106 -106
  86. package/module/gis/templates/ISO19136_2017_gml_template.xml +330 -330
  87. package/module/gis/tokens.yml +5 -5
  88. package/module/permissions/form/permissions.users.form.json +151 -151
  89. package/module/permissions/table/gis.permissions.table.json +97 -97
  90. package/module/test/cls/bp_build_type.json +37 -37
  91. package/module/test/cls/ts.temp_status.json +18 -18
  92. package/module/test/cls/ts.temp_structure.ts_class.json +49 -49
  93. package/module/test/cls/ts.temp_type.json +9 -9
  94. package/module/test/layer/bp.json +59 -59
  95. package/module/test/layer/bp1.yml +33 -33
  96. package/module/test/layer/individual.yml +53 -53
  97. package/module/test/layer/ts.linking_passport.yml +55 -55
  98. package/module/test/layer/ts.temp_structure.yml +50 -50
  99. package/module/test/map/addr.yml +21 -21
  100. package/module/test/map/bp_myo.json +43 -43
  101. package/module/test/map/bpf.json +43 -43
  102. package/module/test/map/main.json +37 -37
  103. package/module/test/map/mbd.json +92 -92
  104. package/module/test/map/ts.json +53 -53
  105. package/module/test/select/address_id.json +2 -2
  106. package/module/test/select/address_id.sql +7 -7
  107. package/module/test/table/data_address.street.table.json +69 -69
  108. package/module/test/table/data_bp_myo.bp.table.json +122 -122
  109. package/package.json +75 -75
  110. package/plugin.js +55 -55
  111. package/server/migrations/array_intersect.sql +13 -13
  112. package/server/migrations/cartocss.sql +27 -27
  113. package/server/migrations/group_list.sql +74 -74
  114. package/server/migrations/maps.sql +30 -30
  115. package/server/migrations/metadata.sql +415 -415
  116. package/server/migrations/ogc.sql +106 -106
  117. package/server/migrations/rasters.sql +265 -265
  118. package/server/migrations/services.sql +247 -247
  119. package/server/migrations/services_users_rel.sql +22 -22
  120. package/server/migrations/widgets.sql +20 -20
  121. package/server/plugins/crons.js +21 -21
  122. package/server/plugins/mapnik/funcs/checkRasterFile.js +109 -109
  123. package/server/plugins/mapnik/funcs/mapnik.js +146 -146
  124. package/server/plugins/mapnik/funcs/rootFolder.mjs +8 -8
  125. package/server/plugins/mapnik/map.proto +234 -234
  126. package/server/plugins/vite.js +74 -74
  127. package/server/routes/gis/cartocss/add.cartocss.js +42 -42
  128. package/server/routes/gis/cartocss/get.cartocss.js +50 -50
  129. package/server/routes/gis/checkXML.js +118 -118
  130. package/server/routes/gis/dashboard.js +29 -29
  131. package/server/routes/gis/index.mjs +87 -87
  132. package/server/routes/gis/metadata/editMetadata.js +34 -34
  133. package/server/routes/gis/metadata/metadataXML.js +13 -13
  134. package/server/routes/gis/ogc/map.info.point.js +124 -124
  135. package/server/routes/gis/registers/add.registry.js +35 -35
  136. package/server/routes/gis/registers/del.registry.js +14 -14
  137. package/server/routes/gis/registers/funcs/classifiers.js +100 -100
  138. package/server/routes/gis/registers/funcs/columns.js +4 -4
  139. package/server/routes/gis/registers/funcs/content.type.js +9 -9
  140. package/server/routes/gis/registers/funcs/get.info.js +89 -89
  141. package/server/routes/gis/registers/funcs/handleRegistryRequest.js +146 -146
  142. package/server/routes/gis/registers/gis.export.js +153 -153
  143. package/server/routes/gis/registers/gis.registry.js +64 -64
  144. package/server/routes/gis/registers/gis.registry.list.js +59 -59
  145. package/server/routes/gis/registers/insert.columns.js +107 -107
  146. package/server/routes/gis/registers/insert.filters.js +110 -110
  147. package/server/routes/gis/registers/map.registry.js +79 -79
  148. package/server/routes/gis/services/add.service.js +64 -64
  149. package/server/routes/gis/services/del.service.js +12 -12
  150. package/server/routes/gis/services/get.layer.geom.js +27 -27
  151. package/server/routes/gis/services/get.services.col.js +33 -33
  152. package/server/routes/gis/services/get.services.js +84 -84
  153. package/server/routes/gis/services/legend.auto.js +77 -77
  154. package/server/routes/map/controllers/clearTiles.js +34 -34
  155. package/server/routes/map/controllers/geojson.js +187 -187
  156. package/server/routes/map/controllers/jsonData.js +205 -205
  157. package/server/routes/map/controllers/layerList.js +102 -102
  158. package/server/routes/map/controllers/map.js +123 -123
  159. package/server/routes/map/controllers/mapCatalog.js +72 -72
  160. package/server/routes/map/controllers/mapCatalogAttribute.js +55 -55
  161. package/server/routes/map/controllers/mapFeatures.js +128 -128
  162. package/server/routes/map/controllers/mapFormat.js +222 -222
  163. package/server/routes/map/controllers/mapTiles.js +152 -152
  164. package/server/routes/map/controllers/maps.js +15 -15
  165. package/server/routes/map/controllers/marker_icon.js +43 -43
  166. package/server/routes/map/controllers/vtile.js +172 -172
  167. package/server/routes/map/index.mjs +169 -169
  168. package/server/routes/map/maps/add.map.js +43 -43
  169. package/server/routes/map/maps/del.map.js +18 -18
  170. package/server/routes/map/maps/get.map.js +112 -112
  171. package/server/routes/map/vtile1.js +179 -179
  172. package/server/routes/map/widgets/add.widget.js +38 -38
  173. package/server/routes/map/widgets/del.widget.js +22 -22
  174. package/server/routes/map/widgets/get.widget.js +40 -40
  175. package/server/routes/mapnik/controllers/clearTiles.js +106 -106
  176. package/server/routes/mapnik/controllers/createXml.js +67 -67
  177. package/server/routes/mapnik/controllers/createXmlMulti.js +76 -76
  178. package/server/routes/mapnik/controllers/fileSearch.js +38 -38
  179. package/server/routes/mapnik/controllers/fileStat.js +28 -28
  180. package/server/routes/mapnik/controllers/mapnikLogger.js +29 -29
  181. package/server/routes/mapnik/controllers/mapnikStat.js +20 -20
  182. package/server/routes/mapnik/controllers/rasterInfo.js +54 -54
  183. package/server/routes/mapnik/controllers/readDir.js +22 -22
  184. package/server/routes/mapnik/controllers/rtile.js +150 -150
  185. package/server/routes/mapnik/controllers/uploadRaster.js +157 -157
  186. package/server/routes/mapnik/functions/cartoBounds.js +28 -28
  187. package/server/routes/mapnik/functions/uploadXML.js +110 -110
  188. package/server/routes/mapnik/index.js +27 -27
  189. package/server/routes/permissions/controllers/catalog.permissions.edit.js +22 -22
  190. package/server/routes/permissions/controllers/catalog.permissions.js +7 -7
  191. package/server/routes/permissions/controllers/gis.catalog.js +80 -80
  192. package/server/routes/permissions/controllers/utils/get.permissions.js +59 -59
  193. package/server/routes/permissions/index.mjs +18 -18
  194. package/server/routes/root.mjs +3 -3
  195. package/utils.js +13 -13
@@ -1,113 +1,113 @@
1
- import {
2
- getMeta, getTemplate, pgClients, getTemplates, yml2json,
3
- } from '@opengis/fastify-table/utils.js';
4
-
5
- const table = 'gis.maps';
6
-
7
- const columnType = {
8
- text: 'text',
9
- date: 'date',
10
- bool: 'yes/no',
11
- numeric: 'number',
12
- integer: 'number',
13
- 'timestamp without time zone': 'date',
14
- 'timestamp with time zone': 'date',
15
- };
16
-
17
- export default async function getMap({ params = {}, pg = pgClients.client }, reply) {
18
- const { columns = [] } = await getMeta({ pg, table }) || {};
19
-
20
- const fields = columns.map(({ name, dataTypeID, title }) => ({
21
- name,
22
- type: columnType[pg.pgType?.[dataTypeID] || 'text'],
23
- label: title || name
24
- }));
25
-
26
- const mapList = getTemplates('map').map(el => el[0]);
27
-
28
- const rows = pg.pk?.['gis.maps'] ? await pg.query(
29
- `SELECT map_id as id, * FROM gis.maps where ${params.id ? '$1 in (map_id,map_key)' : '1=1'}`,
30
- [params.id].filter(Boolean),
31
- ).then(el => el.rows || []) : [];
32
-
33
- if (params.id && !mapList?.includes(params.id) && !rows[0]) {
34
- return reply.status(404).send({ status: 404, message: 'map not found' });
35
- }
36
-
37
- const totals = pg.queryCache ? await pg.queryCache('select json_object_agg(oid::regclass, reltuples) from pg_class')
38
- .then(el => el.rows?.[0]?.json_object_agg || {}) : {};
39
-
40
- const maps = pg.pk?.['gis.maps'] ? await pg.query(
41
- 'SELECT map_id as id, map_key as slug, name FROM gis.maps where is_active and is_public order by name',
42
- ).then(el => el.rows || []) : [];
43
-
44
- if (params.id) {
45
- const map = rows[0] || {};
46
- const loadTemplate = await getTemplate('map', params.id) || await getTemplate('map', map.map_key);
47
- const obj = loadTemplate || map;
48
-
49
- const rawIds = [
50
- ...(Array.isArray(obj?.layers) ? obj.layers : []),
51
- ...(Array.isArray(obj?.ogc) ? obj.ogc : []),
52
- ...(Array.isArray(obj?.cartocss) ? obj.cartocss : []),
53
- ...(Array.isArray(obj?.rasters) ? obj.rasters : [])
54
- ];
55
- const layerIds = [...new Set(rawIds.map(id => id?.toString().trim()).filter(Boolean))];
56
-
57
- let layers = [];
58
-
59
- if (layerIds.length > 0) {
60
- const [resServices, resOgc, resRasters, resCarto] = await Promise.all([
61
- 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]),
62
- 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]),
63
- 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]),
64
- 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])
65
- ]);
66
-
67
- const allFetchedLayers = [
68
- ...resServices.rows.map(row => ({ ...row, type: row.service_type || 'layer' })),
69
- ...resOgc.rows.map(row => ({ ...row, type: 'ogc', source_path: row.table_name })),
70
- ...resRasters.rows.map(row => ({ ...row, type: 'raster' })),
71
- ...resCarto.rows.map(row => ({ ...row, type: 'cartocss' }))
72
- ];
73
-
74
- const dbLayersMap = new Map(allFetchedLayers.map(l => [String(l.id), l]));
75
-
76
- const layersResults = await Promise.all(layerIds.map(async (id) => {
77
- const idStr = String(id);
78
-
79
- if (!dbLayersMap.has(idStr)) {
80
- return null;
81
- }
82
-
83
- const dbData = dbLayersMap.get(idStr);
84
- const templateData = await getTemplate('layer', idStr);
85
-
86
- const layerData = { ...dbData, ...(templateData || {}) };
87
-
88
- layerData.count = totals[layerData.source_path || ''] || 0;
89
- layerData.visible = true;
90
-
91
- if (layerData.style && typeof layerData.style === 'string') {
92
- if (layerData.type === 'cartocss') {
93
- layerData.style = layerData.style.replace(/\s+/g, ' ').trim();
94
- } else if (layerData.type !== 'ogc') {
95
- layerData.style = yml2json(layerData.style);
96
- }
97
- }
98
-
99
- return layerData;
100
- }));
101
-
102
- layers = layersResults.filter(Boolean);
103
- }
104
-
105
- return reply.status(200).send({ maps, ...obj, layers });
106
- }
107
-
108
- if (params.id && !rows.length) {
109
- return reply.status(404).send('map not found');
110
- }
111
-
112
- return reply.status(200).send(params.id ? { ...rows[0], fields } : { rows, fields });
1
+ import {
2
+ getMeta, getTemplate, pgClients, getTemplates, yml2json,
3
+ } from '@opengis/fastify-table/utils.js';
4
+
5
+ const table = 'gis.maps';
6
+
7
+ const columnType = {
8
+ text: 'text',
9
+ date: 'date',
10
+ bool: 'yes/no',
11
+ numeric: 'number',
12
+ integer: 'number',
13
+ 'timestamp without time zone': 'date',
14
+ 'timestamp with time zone': 'date',
15
+ };
16
+
17
+ export default async function getMap({ params = {}, pg = pgClients.client }, reply) {
18
+ const { columns = [] } = await getMeta({ pg, table }) || {};
19
+
20
+ const fields = columns.map(({ name, dataTypeID, title }) => ({
21
+ name,
22
+ type: columnType[pg.pgType?.[dataTypeID] || 'text'],
23
+ label: title || name
24
+ }));
25
+
26
+ const mapList = getTemplates('map').map(el => el[0]);
27
+
28
+ const rows = pg.pk?.['gis.maps'] ? await pg.query(
29
+ `SELECT map_id as id, * FROM gis.maps where ${params.id ? '$1 in (map_id,map_key)' : '1=1'}`,
30
+ [params.id].filter(Boolean),
31
+ ).then(el => el.rows || []) : [];
32
+
33
+ if (params.id && !mapList?.includes(params.id) && !rows[0]) {
34
+ return reply.status(404).send({ status: 404, message: 'map not found' });
35
+ }
36
+
37
+ const totals = pg.queryCache ? await pg.queryCache('select json_object_agg(oid::regclass, reltuples) from pg_class')
38
+ .then(el => el.rows?.[0]?.json_object_agg || {}) : {};
39
+
40
+ const maps = pg.pk?.['gis.maps'] ? await pg.query(
41
+ 'SELECT map_id as id, map_key as slug, name FROM gis.maps where is_active and is_public order by name',
42
+ ).then(el => el.rows || []) : [];
43
+
44
+ if (params.id) {
45
+ const map = rows[0] || {};
46
+ const loadTemplate = await getTemplate('map', params.id) || await getTemplate('map', map.map_key);
47
+ const obj = loadTemplate || map;
48
+
49
+ const rawIds = [
50
+ ...(Array.isArray(obj?.layers) ? obj.layers : []),
51
+ ...(Array.isArray(obj?.ogc) ? obj.ogc : []),
52
+ ...(Array.isArray(obj?.cartocss) ? obj.cartocss : []),
53
+ ...(Array.isArray(obj?.rasters) ? obj.rasters : [])
54
+ ];
55
+ const layerIds = [...new Set(rawIds.map(id => id?.toString().trim()).filter(Boolean))];
56
+
57
+ let layers = [];
58
+
59
+ if (layerIds.length > 0) {
60
+ const [resServices, resOgc, resRasters, resCarto] = await Promise.all([
61
+ 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]),
62
+ 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]),
63
+ 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]),
64
+ 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])
65
+ ]);
66
+
67
+ const allFetchedLayers = [
68
+ ...resServices.rows.map(row => ({ ...row, type: row.service_type || 'layer' })),
69
+ ...resOgc.rows.map(row => ({ ...row, type: 'ogc', source_path: row.table_name })),
70
+ ...resRasters.rows.map(row => ({ ...row, type: 'raster' })),
71
+ ...resCarto.rows.map(row => ({ ...row, type: 'cartocss' }))
72
+ ];
73
+
74
+ const dbLayersMap = new Map(allFetchedLayers.map(l => [String(l.id), l]));
75
+
76
+ const layersResults = await Promise.all(layerIds.map(async (id) => {
77
+ const idStr = String(id);
78
+
79
+ if (!dbLayersMap.has(idStr)) {
80
+ return null;
81
+ }
82
+
83
+ const dbData = dbLayersMap.get(idStr);
84
+ const templateData = await getTemplate('layer', idStr);
85
+
86
+ const layerData = { ...dbData, ...(templateData || {}) };
87
+
88
+ layerData.count = totals[layerData.source_path || ''] || 0;
89
+ layerData.visible = true;
90
+
91
+ if (layerData.style && typeof layerData.style === 'string') {
92
+ if (layerData.type === 'cartocss') {
93
+ layerData.style = layerData.style.replace(/\s+/g, ' ').trim();
94
+ } else if (layerData.type !== 'ogc') {
95
+ layerData.style = yml2json(layerData.style);
96
+ }
97
+ }
98
+
99
+ return layerData;
100
+ }));
101
+
102
+ layers = layersResults.filter(Boolean);
103
+ }
104
+
105
+ return reply.status(200).send({ maps, ...obj, layers });
106
+ }
107
+
108
+ if (params.id && !rows.length) {
109
+ return reply.status(404).send('map not found');
110
+ }
111
+
112
+ return reply.status(200).send(params.id ? { ...rows[0], fields } : { rows, fields });
113
113
  }
@@ -1,179 +1,179 @@
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, nottl,
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
- // layer
45
- const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
46
-
47
- // service
48
- 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]);
49
- const style = typeof data?.style === 'object' ? data?.style : yaml.load(data?.style);
50
-
51
- const cacheZoom = style?.cacheZoom || 13;
52
- const ttl = typeof style?.ttl === 'number' && style.ttl >= 0 ? style.ttl : 86400000;
53
-
54
- if (existsSync(filepath) && +z < cacheZoom && !nocache && !sql && process.env.NODE_ENV !== 'test') {
55
- const { birthtimeMs = Date.now() } = await stat(filepath);
56
- const ageInMs = Date.now() - birthtimeMs;
57
- if (ageInMs < ttl) {
58
- const buffer = await readFile(filepath);
59
- return reply.status(200).headers(headers).send(buffer);
60
- }
61
- }
62
-
63
- const geom = data?.geometry_column || 'geom';
64
- const table = data?.source_path;
65
- const filterList = data?.filters;
66
- const layerQuery = data?.query;
67
-
68
- // bbox
69
- const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
70
- const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
71
-
72
- const filterData = query.filter ? await getFilterSQL({
73
- filter: query.filter, table, filterList,
74
- }) : {};
75
-
76
- // meta
77
- const metaTable = await getMeta({ pg, table });
78
- if (metaTable.error) { return metaTable; }
79
- const { pk: pkey = data.key, columns } = metaTable; // if view - specify via template
80
-
81
- // props
82
- const statusColumn = style?.colorAttr || style?.iconAttr ? columns.filter(col => col.name === style.colorAttr || style?.iconAttr) : [];
83
- const props = !query.all ? (statusColumn || []).concat(data.popup || []).concat(data.card || []) : columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
84
-
85
- const cache = layer + (query.all ? '-all' : '') + JSON.stringify(data.popup || []).length;
86
- const propsWithCls = propsCache[cache] ?? await Promise.all(props.map(async (col, idx) => {
87
- const key = col.name;
88
- const select = data.popup?.find(el => el.name === key);
89
- // console.log(select);
90
- const clsData = select?.data || col.data;
91
- const cls = clsData ? await getSelect(clsData).then(el => {
92
- if (!el) {
93
- console.error('gis vtile: cls not found', clsData);
94
- return null;
95
- }
96
- return { name: clsData, type: el.arr ? 'cls' : 'select', sql: el.sql };
97
- }) : null;
98
- const { name, type: type1, sql: sql1 } = cls || getColumnCLS(table, col.data || key) || {};
99
- // console.log({ name, type, sql });
100
- if (name && type1 === 'cls') {
101
- return `(select name from admin.cls where parent='${name}' and code::text=q.${key}::text limit 1) as "${key}_text","${key}"::text`;
102
- }
103
- if (type1 === 'select' && sql1) {
104
- const { fields = [] } = await pg.query(`${sql1} limit 0`);
105
- return `(select "${fields[1].name}" from (${sql1})s${idx} where "${fields[0].name}"::text=q."${key}"::text limit 1) as "${key}_text","${key}"::text`;
106
- }
107
- return `"${key}"::text`;
108
- }));
109
- propsCache[cache] = propsCache[cache] || propsWithCls;
110
-
111
- const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
112
- || (parseInt(z, 10) < parseInt(query.pointZoom || style?.pointZoom || style?.iconZoom || '0', 10) ? `ST_Centroid(${geom})` : geom);
113
-
114
- const koef = {
115
- 10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
116
- }[z] || 0.0005;
117
-
118
- const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
119
- const clusterZoom1 = style?.clusterZoom || clusterZoom;
120
- const queryMode = ((clusterZoom1 - z) > 2 ? 1 : null) || ((clusterZoom1 - z) > 0 ? 2 : null) || 3;
121
- // console.log(z, clusterZoom, queryMode);
122
- const props1 = props.filter((el, idx, arr) => idx === arr.findIndex(item => item.name === el.name));
123
- const q = {
124
- 1: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
125
- FROM (
126
- 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
127
- FROM (
128
- SELECT st_centroid(st_union(geom)) as geom, count(*) as point_count
129
- FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} ) j
130
- )q`,
131
- 2: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
132
- FROM (
133
- SELECT floor(random() * 100000 + 1)::int +row_number() over() as row, count(*) as point_count,
134
- ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
135
- FROM (
136
- SELECT geom, ST_ClusterDBSCAN(geom,${koef},1) OVER () AS cluster
137
- FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} ) j
138
- WHERE cluster IS NOT NULL
139
- GROUP BY cluster
140
- ORDER BY 1 DESC
141
- )q`,
142
- 3: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
143
- FROM (
144
- SELECT
145
-
146
- floor(random() * 100000 + 1)::int + row_number() over() as row,
147
-
148
- ${props?.length ? `${propsWithCls.join(',')},` : ''}
149
-
150
- ${pkey} as id,
151
- ST_AsMVTGeom(st_transform(${geomCol},3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
152
-
153
- FROM (select * from ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}
154
-
155
- and ${geom} is not null and st_srid(${geom}) >0
156
-
157
-
158
-
159
- ${types[type] ? ` and ST_GeometryType(geom) = any ('{ ${types[type]} }') ` : ''}
160
-
161
- and ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${data?.filter || '1=1'}
162
-
163
- ${(style?.type || data?.geometry_type) === 'polygon' ? `order by st_area(st_transform(${geom},3857)) desc` : ''}
164
-
165
- limit 3000)q
166
- ) q`,
167
- }[queryMode];
168
-
169
- if (query.sql === '1') { return q; }
170
- const tile = await pg.query(q);
171
- const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
172
-
173
- if (!nocache) {
174
- await mkdir(path.dirname(filepath), { recursive: true });
175
- await writeFile(filepath, buffer, 'binary');
176
- }
177
-
178
- return reply.headers({ ...headers, 'Cache-Control': nocache || nottl ? 'no-cache' : headers['Cache-Control'] }).send(buffer);
179
- }
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, nottl,
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
+ // layer
45
+ const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
46
+
47
+ // service
48
+ 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]);
49
+ const style = typeof data?.style === 'object' ? data?.style : yaml.load(data?.style);
50
+
51
+ const cacheZoom = style?.cacheZoom || 13;
52
+ const ttl = typeof style?.ttl === 'number' && style.ttl >= 0 ? style.ttl : 86400000;
53
+
54
+ if (existsSync(filepath) && +z < cacheZoom && !nocache && !sql && process.env.NODE_ENV !== 'test') {
55
+ const { birthtimeMs = Date.now() } = await stat(filepath);
56
+ const ageInMs = Date.now() - birthtimeMs;
57
+ if (ageInMs < ttl) {
58
+ const buffer = await readFile(filepath);
59
+ return reply.status(200).headers(headers).send(buffer);
60
+ }
61
+ }
62
+
63
+ const geom = data?.geometry_column || 'geom';
64
+ const table = data?.source_path;
65
+ const filterList = data?.filters;
66
+ const layerQuery = data?.query;
67
+
68
+ // bbox
69
+ const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
70
+ const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
71
+
72
+ const filterData = query.filter ? await getFilterSQL({
73
+ filter: query.filter, table, filterList,
74
+ }) : {};
75
+
76
+ // meta
77
+ const metaTable = await getMeta({ pg, table });
78
+ if (metaTable.error) { return metaTable; }
79
+ const { pk: pkey = data.key, columns } = metaTable; // if view - specify via template
80
+
81
+ // props
82
+ const statusColumn = style?.colorAttr || style?.iconAttr ? columns.filter(col => col.name === style.colorAttr || style?.iconAttr) : [];
83
+ const props = !query.all ? (statusColumn || []).concat(data.popup || []).concat(data.card || []) : columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
84
+
85
+ const cache = layer + (query.all ? '-all' : '') + JSON.stringify(data.popup || []).length;
86
+ const propsWithCls = propsCache[cache] ?? await Promise.all(props.map(async (col, idx) => {
87
+ const key = col.name;
88
+ const select = data.popup?.find(el => el.name === key);
89
+ // console.log(select);
90
+ const clsData = select?.data || col.data;
91
+ const cls = clsData ? await getSelect(clsData).then(el => {
92
+ if (!el) {
93
+ console.error('gis vtile: cls not found', clsData);
94
+ return null;
95
+ }
96
+ return { name: clsData, type: el.arr ? 'cls' : 'select', sql: el.sql };
97
+ }) : null;
98
+ const { name, type: type1, sql: sql1 } = cls || getColumnCLS(table, col.data || key) || {};
99
+ // console.log({ name, type, sql });
100
+ if (name && type1 === 'cls') {
101
+ return `(select name from admin.cls where parent='${name}' and code::text=q.${key}::text limit 1) as "${key}_text","${key}"::text`;
102
+ }
103
+ if (type1 === 'select' && sql1) {
104
+ const { fields = [] } = await pg.query(`${sql1} limit 0`);
105
+ return `(select "${fields[1].name}" from (${sql1})s${idx} where "${fields[0].name}"::text=q."${key}"::text limit 1) as "${key}_text","${key}"::text`;
106
+ }
107
+ return `"${key}"::text`;
108
+ }));
109
+ propsCache[cache] = propsCache[cache] || propsWithCls;
110
+
111
+ const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
112
+ || (parseInt(z, 10) < parseInt(query.pointZoom || style?.pointZoom || style?.iconZoom || '0', 10) ? `ST_Centroid(${geom})` : geom);
113
+
114
+ const koef = {
115
+ 10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
116
+ }[z] || 0.0005;
117
+
118
+ const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
119
+ const clusterZoom1 = style?.clusterZoom || clusterZoom;
120
+ const queryMode = ((clusterZoom1 - z) > 2 ? 1 : null) || ((clusterZoom1 - z) > 0 ? 2 : null) || 3;
121
+ // console.log(z, clusterZoom, queryMode);
122
+ const props1 = props.filter((el, idx, arr) => idx === arr.findIndex(item => item.name === el.name));
123
+ const q = {
124
+ 1: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
125
+ FROM (
126
+ 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
127
+ FROM (
128
+ SELECT st_centroid(st_union(geom)) as geom, count(*) as point_count
129
+ FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} ) j
130
+ )q`,
131
+ 2: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
132
+ FROM (
133
+ SELECT floor(random() * 100000 + 1)::int +row_number() over() as row, count(*) as point_count,
134
+ ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
135
+ FROM (
136
+ SELECT geom, ST_ClusterDBSCAN(geom,${koef},1) OVER () AS cluster
137
+ FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} ) j
138
+ WHERE cluster IS NOT NULL
139
+ GROUP BY cluster
140
+ ORDER BY 1 DESC
141
+ )q`,
142
+ 3: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
143
+ FROM (
144
+ SELECT
145
+
146
+ floor(random() * 100000 + 1)::int + row_number() over() as row,
147
+
148
+ ${props?.length ? `${propsWithCls.join(',')},` : ''}
149
+
150
+ ${pkey} as id,
151
+ ST_AsMVTGeom(st_transform(${geomCol},3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
152
+
153
+ FROM (select * from ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}
154
+
155
+ and ${geom} is not null and st_srid(${geom}) >0
156
+
157
+
158
+
159
+ ${types[type] ? ` and ST_GeometryType(geom) = any ('{ ${types[type]} }') ` : ''}
160
+
161
+ and ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${data?.filter || '1=1'}
162
+
163
+ ${(style?.type || data?.geometry_type) === 'polygon' ? `order by st_area(st_transform(${geom},3857)) desc` : ''}
164
+
165
+ limit 3000)q
166
+ ) q`,
167
+ }[queryMode];
168
+
169
+ if (query.sql === '1') { return q; }
170
+ const tile = await pg.query(q);
171
+ const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
172
+
173
+ if (!nocache) {
174
+ await mkdir(path.dirname(filepath), { recursive: true });
175
+ await writeFile(filepath, buffer, 'binary');
176
+ }
177
+
178
+ return reply.headers({ ...headers, 'Cache-Control': nocache || nottl ? 'no-cache' : headers['Cache-Control'] }).send(buffer);
179
+ }