@opengis/gis 0.2.52 → 0.2.53
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.
- package/README.md +5 -5
- package/dist/index.css +1 -1
- package/dist/index.js +145 -145
- package/dist/index.umd.cjs +3 -3
- package/module/cls.json +6 -6
- package/module/gis/card/gis.metadata.table/index.yml +22 -22
- package/module/gis/card/gis.metadata.table/main_info.hbs +20 -20
- package/module/gis/card/gis.metadata.table/metadata_info.hbs +27 -27
- package/module/gis/card/gis.metadata.table/other.hbs +25 -25
- package/module/gis/card/gis.rasters.table/index.yml +11 -11
- package/module/gis/card/gis.rasters.table/main_info.hbs +27 -27
- package/module/gis/card/gis.registers.table/cls.hbs +36 -36
- package/module/gis/card/gis.registers.table/columns.hbs +89 -89
- package/module/gis/card/gis.registers.table/filters.hbs +80 -80
- package/module/gis/card/gis.registers.table/index.yml +23 -23
- package/module/gis/card/gis.registers.table/main_info.hbs +35 -35
- package/module/gis/card/gis.registers.table/source.hbs +45 -45
- package/module/gis/card/gis.services.table/attributes.hbs +91 -91
- package/module/gis/card/gis.services.table/filters.hbs +83 -83
- package/module/gis/card/gis.services.table/index.yml +25 -25
- package/module/gis/card/gis.services.table/main_info.hbs +27 -27
- package/module/gis/card/gis.services.table/source.hbs +25 -25
- package/module/gis/cls/bool.yes_no.json +12 -12
- package/module/gis/cls/encoding.json +14 -14
- package/module/gis/cls/geom_type.json +14 -14
- package/module/gis/cls/gis.column_type.json +34 -34
- package/module/gis/cls/gis.column_view_type.json +26 -26
- package/module/gis/cls/gis.filter_type.json +22 -22
- package/module/gis/cls/language.json +10 -10
- package/module/gis/cls/meta.service_type.json +42 -42
- package/module/gis/cls/ogc.service.json +21 -21
- package/module/gis/cls/service_type.json +42 -42
- package/module/gis/cls/source_type.json +10 -10
- package/module/gis/cls/standarts.json +6 -6
- package/module/gis/cls/topic_category.json +106 -106
- package/module/gis/cls/update_frequency.json +29 -29
- package/module/gis/cls/view.json +21 -21
- package/module/gis/form/gis.cartocss.form.json +45 -45
- package/module/gis/form/gis.group_list.form.json +17 -17
- package/module/gis/form/gis.maps.form.json +61 -61
- package/module/gis/form/gis.metadata.form.json +240 -240
- package/module/gis/form/gis.ogc_service.form.json +45 -45
- package/module/gis/form/gis.rasters.form.json +76 -76
- package/module/gis/form/gis.registers.form.json +124 -124
- package/module/gis/form/gis.registers_column.form.json +84 -84
- package/module/gis/form/gis.registers_filter.form.json +65 -65
- package/module/gis/form/gis.services.form.json +111 -111
- package/module/gis/form/gis.services_attributes.form.json +75 -75
- package/module/gis/form/gis.services_filter.form.json +65 -65
- package/module/gis/menu.json +43 -43
- package/module/gis/select/pg.columns.parent.sql +6 -6
- package/module/gis/select/pg.table_name.sql +17 -17
- package/module/gis/select/service_id.sql +1 -1
- package/module/gis/table/gis.cartocss.table.json +62 -62
- package/module/gis/table/gis.group_list.table.json +35 -35
- package/module/gis/table/gis.maps.table.json +108 -108
- package/module/gis/table/gis.metadata.table.json +70 -70
- package/module/gis/table/gis.ogc_service.table.json +98 -98
- package/module/gis/table/gis.rasters.table.json +101 -101
- package/module/gis/table/gis.registers.table.json +144 -144
- package/module/gis/table/gis.services.table.json +121 -121
- package/module/gis/table/site.gis.registers.table.json +88 -88
- package/module/gis/table/site.gis.services.table.json +106 -106
- package/module/gis/templates/ISO19136_2017_gml_template.xml +330 -330
- package/module/gis/tokens.yml +5 -5
- package/module/test/cls/bp_build_type.json +37 -37
- package/module/test/cls/doc_status.json +31 -31
- package/module/test/cls/ts.temp_status.json +18 -18
- package/module/test/cls/ts.temp_structure.ts_class.json +49 -49
- package/module/test/cls/ts.temp_type.json +9 -9
- package/module/test/layer/bp.json +59 -59
- package/module/test/layer/bp1.yml +33 -33
- package/module/test/layer/individual.yml +53 -53
- package/module/test/layer/ts.linking_passport.yml +55 -55
- package/module/test/layer/ts.temp_structure.yml +50 -50
- package/module/test/map/addr.yml +21 -21
- package/module/test/map/bp_myo.json +43 -43
- package/module/test/map/bpf.json +43 -43
- package/module/test/map/main.json +36 -36
- package/module/test/map/mbd.json +91 -91
- package/module/test/map/ts.json +52 -52
- package/module/test/select/address_id.json +2 -2
- package/module/test/select/address_id.sql +7 -7
- package/module/test/select/core.user_uid.sql +1 -1
- package/module/test/table/data_address.street.table.json +69 -69
- package/module/test/table/data_bp_myo.bp.table.json +122 -122
- package/package.json +75 -75
- package/plugin.js +45 -45
- package/server/migrations/cartocss.sql +20 -20
- package/server/migrations/maps.sql +30 -30
- package/server/migrations/ogc.sql +106 -106
- package/server/migrations/rasters.sql +263 -263
- package/server/migrations/services.sql +247 -247
- package/server/migrations/widgets.sql +20 -20
- package/server/plugins/crons.js +21 -21
- package/server/plugins/mapnik/funcs/checkRasterFile.js +92 -92
- package/server/plugins/mapnik/funcs/mapnik.js +146 -146
- package/server/plugins/mapnik/funcs/rootFolder.mjs +8 -8
- package/server/plugins/mapnik/map.proto +187 -188
- package/server/plugins/vite.js +74 -74
- package/server/routes/gis/cartocss/add.cartocss.js +29 -29
- package/server/routes/gis/cartocss/get.cartocss.js +12 -12
- package/server/routes/gis/dashboard.js +29 -29
- package/server/routes/gis/index.mjs +73 -73
- package/server/routes/gis/metadata/metadataXML.js +13 -13
- package/server/routes/gis/ogc/map.info.point.js +124 -124
- package/server/routes/gis/registers/add.registry.js +35 -35
- package/server/routes/gis/registers/del.registry.js +14 -14
- package/server/routes/gis/registers/funcs/classifiers.js +100 -100
- package/server/routes/gis/registers/funcs/columns.js +4 -4
- package/server/routes/gis/registers/funcs/content.type.js +9 -9
- package/server/routes/gis/registers/funcs/get.info.js +89 -89
- package/server/routes/gis/registers/funcs/handleRegistryRequest.js +145 -145
- package/server/routes/gis/registers/gis.export.js +148 -148
- package/server/routes/gis/registers/gis.registry.js +64 -64
- package/server/routes/gis/registers/gis.registry.list.js +59 -59
- package/server/routes/gis/registers/insert.columns.js +107 -107
- package/server/routes/gis/registers/insert.filters.js +110 -110
- package/server/routes/gis/registers/map.registry.js +79 -79
- package/server/routes/gis/services/add.service.js +64 -64
- package/server/routes/gis/services/del.service.js +12 -12
- package/server/routes/gis/services/get.layer.geom.js +27 -27
- package/server/routes/gis/services/get.services.col.js +33 -33
- package/server/routes/gis/services/get.services.js +84 -84
- package/server/routes/gis/services/legend.auto.js +77 -77
- package/server/routes/map/controllers/geojson.js +187 -187
- package/server/routes/map/controllers/jsonData.js +205 -205
- package/server/routes/map/controllers/layerList.js +60 -60
- package/server/routes/map/controllers/map.js +123 -123
- package/server/routes/map/controllers/mapCatalog.js +72 -72
- package/server/routes/map/controllers/mapCatalogAttribute.js +55 -55
- package/server/routes/map/controllers/mapFeatures.js +128 -128
- package/server/routes/map/controllers/mapFormat.js +85 -85
- package/server/routes/map/controllers/mapTiles.js +152 -152
- package/server/routes/map/controllers/maps.js +15 -15
- package/server/routes/map/controllers/marker_icon.js +43 -43
- package/server/routes/map/controllers/vtile.js +172 -172
- package/server/routes/map/index.mjs +142 -142
- package/server/routes/map/maps/add.map.js +43 -43
- package/server/routes/map/maps/del.map.js +18 -18
- package/server/routes/map/maps/get.map.js +80 -80
- package/server/routes/map/vtile1.js +170 -170
- package/server/routes/map/widgets/add.widget.js +38 -38
- package/server/routes/map/widgets/del.widget.js +22 -22
- package/server/routes/map/widgets/get.widget.js +40 -40
- package/server/routes/mapnik/controllers/checkCarto.js +40 -40
- package/server/routes/mapnik/controllers/createXml.js +63 -63
- package/server/routes/mapnik/controllers/mapnikLogger.js +23 -23
- package/server/routes/mapnik/controllers/mapnikStat.js +20 -20
- package/server/routes/mapnik/controllers/rasterInfo.js +36 -36
- package/server/routes/mapnik/controllers/rtile.js +96 -96
- package/server/routes/mapnik/controllers/rtileMBD.js +91 -91
- package/server/routes/mapnik/controllers/uploadRaster.js +157 -157
- package/server/routes/mapnik/functions/cartoBounds.js +22 -22
- package/server/routes/mapnik/functions/uploadXML.js +106 -106
- package/server/routes/mapnik/index.js +21 -21
- package/server/routes/root.mjs +3 -3
- package/utils.js +13 -13
|
@@ -1,157 +1,157 @@
|
|
|
1
|
-
import path from 'node:path';
|
|
2
|
-
import { ListObjectsV2Command } from '@aws-sdk/client-s3';
|
|
3
|
-
|
|
4
|
-
/* eslint-disable no-await-in-loop */
|
|
5
|
-
import {
|
|
6
|
-
config, isFileExists, logger, pgClients, eventStream, downloadFile, s3Client,
|
|
7
|
-
} from '@opengis/fastify-table/utils.js';
|
|
8
|
-
|
|
9
|
-
import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
|
|
10
|
-
|
|
11
|
-
const { UploadRaster, GetRasterStatus } = mapnik();
|
|
12
|
-
|
|
13
|
-
const CHUNK_SIZE = 1024 * 1024; // 1 MB per chunk
|
|
14
|
-
|
|
15
|
-
function sequence(files, data, fn) {
|
|
16
|
-
return files.reduce(
|
|
17
|
-
(promise, relpath) => promise.then(() => fn({
|
|
18
|
-
...data,
|
|
19
|
-
relpath, // allow upload multiple to one directory for vrt
|
|
20
|
-
})),
|
|
21
|
-
Promise.resolve(),
|
|
22
|
-
);
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
async function uploadRasterFile({
|
|
26
|
-
id, prefix, relpath: relpathOriginal, callback = () => { },
|
|
27
|
-
}) {
|
|
28
|
-
const metadata = await isFileExists(relpathOriginal);
|
|
29
|
-
const relpath = relpathOriginal.replace(config.folder, '').replace(prefix, '');
|
|
30
|
-
|
|
31
|
-
let offset = 0;
|
|
32
|
-
|
|
33
|
-
try {
|
|
34
|
-
const uploadStatus = await GetRasterStatus({ path: relpath, md5: true });
|
|
35
|
-
|
|
36
|
-
if (uploadStatus.finished) {
|
|
37
|
-
callback(`Already uploaded: ${relpath}`);
|
|
38
|
-
return { message: 'already uploaded', status: 200 };
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
if (!metadata || !metadata.ContentLength) {
|
|
42
|
-
callback(`File not found at s3: ${relpath}`);
|
|
43
|
-
return { error: `File not found at s3: ${relpath}`, code: 404 };
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
offset = uploadStatus.exists ? +uploadStatus.size : 0;
|
|
47
|
-
|
|
48
|
-
if (offset === metadata.ContentLength) {
|
|
49
|
-
callback(`Already uploaded: ${relpath}`);
|
|
50
|
-
return { message: 'already uploaded', status: 200 };
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
while (offset < metadata.ContentLength) {
|
|
54
|
-
const end = Math.min(offset + CHUNK_SIZE - 1, metadata.ContentLength - 1);
|
|
55
|
-
const Range = `bytes=${offset}-${end}`;
|
|
56
|
-
|
|
57
|
-
callback(`Uploading chunk ${(end / 1024 / 1024).toFixed(0)}/${(metadata.ContentLength / 1024 / 1024).toFixed(0)} MB...`);
|
|
58
|
-
|
|
59
|
-
const chunk = await downloadFile(relpathOriginal, { Range, fallback: false });
|
|
60
|
-
// const { Body: chunk } = await s3Client.send(new GetObjectCommand({ Bucket, Key, Range }));
|
|
61
|
-
const bufferPart = chunk ? await chunk.transformToByteArray() : [];
|
|
62
|
-
|
|
63
|
-
if (!bufferPart.length) {
|
|
64
|
-
callback(`Server error: file not found / zero bytes: ${relpath}`);
|
|
65
|
-
break;
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
const result = await UploadRaster({
|
|
69
|
-
path: relpath,
|
|
70
|
-
filesize: metadata.ContentLength,
|
|
71
|
-
data: bufferPart,
|
|
72
|
-
chunked: true,
|
|
73
|
-
});
|
|
74
|
-
|
|
75
|
-
if (result.finished) {
|
|
76
|
-
callback(`Upload completed: ${relpath}`);
|
|
77
|
-
break;
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
if (!result.uploaded) {
|
|
81
|
-
callback(`Chunked upload error: ${relpath}`);
|
|
82
|
-
break;
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
offset = +result.uploaded;
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
return null;
|
|
89
|
-
}
|
|
90
|
-
catch (err) {
|
|
91
|
-
logger.file('mapnik/upload/error', { error: err.toString(), stack: err.stack });
|
|
92
|
-
callback(config.local ? err.toString() : `Upload error: ${relpath}`);
|
|
93
|
-
return null;
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
export default async function uploadRaster({
|
|
98
|
-
pg = pgClients.client, params,
|
|
99
|
-
}, reply) {
|
|
100
|
-
if (!UploadRaster || !GetRasterStatus) {
|
|
101
|
-
return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
const { id } = params;
|
|
105
|
-
|
|
106
|
-
if (!id) {
|
|
107
|
-
return reply.status(400).send({ error: 'not enough params: id', code: 400 });
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
const data = pg.pk?.['gis.rasters']
|
|
111
|
-
? await pg.query('select raster_id as id, source_path from gis.rasters where raster_id=$1::text', [id])
|
|
112
|
-
.then(el => el.rows?.[0])
|
|
113
|
-
: null;
|
|
114
|
-
|
|
115
|
-
if (!data?.id) {
|
|
116
|
-
return reply.status(404).send({ error: 'raster not found', code: 404 });
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
if (!data.source_path) {
|
|
120
|
-
return reply.status(400).send({ error: 'raster source_path not set', code: 400 });
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
const prefix = '/map/raster';
|
|
124
|
-
const relpath = `${prefix}/${data.source_path}`;
|
|
125
|
-
|
|
126
|
-
if (!path.extname(relpath)) {
|
|
127
|
-
const metadata = await s3Client.send(new ListObjectsV2Command({
|
|
128
|
-
Bucket: config.s3?.containerName || 'work',
|
|
129
|
-
Prefix: path.join(config.folder, relpath).replace(/\\/g, '/'),
|
|
130
|
-
}));
|
|
131
|
-
if (!metadata.Contents?.length) {
|
|
132
|
-
return reply.status(404).send({
|
|
133
|
-
error: 'invalid: raster source_path: not found / empty directory',
|
|
134
|
-
code: 404,
|
|
135
|
-
});
|
|
136
|
-
}
|
|
137
|
-
|
|
138
|
-
// list rasters, skip preview subdir content, skip folders from s3 directory name of which only starts with same characters, but does not exactly match
|
|
139
|
-
const files = metadata.Contents.map(file => file.Key).filter((file) => path.basename(path.dirname(file)) === path.basename(relpath) && !path.basename(path.dirname(file)).startsWith('preview') && path.extname(file).toLowerCase() === '.tif');
|
|
140
|
-
|
|
141
|
-
if (!files.length) {
|
|
142
|
-
return reply.status(400).send({
|
|
143
|
-
error: 'invalid: raster source_path: no raster files at directory',
|
|
144
|
-
code: 400,
|
|
145
|
-
});
|
|
146
|
-
}
|
|
147
|
-
const callback = eventStream(reply);
|
|
148
|
-
await sequence(files, { id, prefix, callback }, uploadRasterFile);
|
|
149
|
-
return callback('finish', 1);
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
const callback = eventStream(reply);
|
|
153
|
-
await uploadRasterFile({
|
|
154
|
-
id, prefix, callback, relpath,
|
|
155
|
-
});
|
|
156
|
-
return callback('finish', 1);
|
|
157
|
-
}
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
import { ListObjectsV2Command } from '@aws-sdk/client-s3';
|
|
3
|
+
|
|
4
|
+
/* eslint-disable no-await-in-loop */
|
|
5
|
+
import {
|
|
6
|
+
config, isFileExists, logger, pgClients, eventStream, downloadFile, s3Client,
|
|
7
|
+
} from '@opengis/fastify-table/utils.js';
|
|
8
|
+
|
|
9
|
+
import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
|
|
10
|
+
|
|
11
|
+
const { UploadRaster, GetRasterStatus } = mapnik();
|
|
12
|
+
|
|
13
|
+
const CHUNK_SIZE = 1024 * 1024; // 1 MB per chunk
|
|
14
|
+
|
|
15
|
+
function sequence(files, data, fn) {
|
|
16
|
+
return files.reduce(
|
|
17
|
+
(promise, relpath) => promise.then(() => fn({
|
|
18
|
+
...data,
|
|
19
|
+
relpath, // allow upload multiple to one directory for vrt
|
|
20
|
+
})),
|
|
21
|
+
Promise.resolve(),
|
|
22
|
+
);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
async function uploadRasterFile({
|
|
26
|
+
id, prefix, relpath: relpathOriginal, callback = () => { },
|
|
27
|
+
}) {
|
|
28
|
+
const metadata = await isFileExists(relpathOriginal);
|
|
29
|
+
const relpath = relpathOriginal.replace(config.folder, '').replace(prefix, '');
|
|
30
|
+
|
|
31
|
+
let offset = 0;
|
|
32
|
+
|
|
33
|
+
try {
|
|
34
|
+
const uploadStatus = await GetRasterStatus({ path: relpath, md5: true });
|
|
35
|
+
|
|
36
|
+
if (uploadStatus.finished) {
|
|
37
|
+
callback(`Already uploaded: ${relpath}`);
|
|
38
|
+
return { message: 'already uploaded', status: 200 };
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
if (!metadata || !metadata.ContentLength) {
|
|
42
|
+
callback(`File not found at s3: ${relpath}`);
|
|
43
|
+
return { error: `File not found at s3: ${relpath}`, code: 404 };
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
offset = uploadStatus.exists ? +uploadStatus.size : 0;
|
|
47
|
+
|
|
48
|
+
if (offset === metadata.ContentLength) {
|
|
49
|
+
callback(`Already uploaded: ${relpath}`);
|
|
50
|
+
return { message: 'already uploaded', status: 200 };
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
while (offset < metadata.ContentLength) {
|
|
54
|
+
const end = Math.min(offset + CHUNK_SIZE - 1, metadata.ContentLength - 1);
|
|
55
|
+
const Range = `bytes=${offset}-${end}`;
|
|
56
|
+
|
|
57
|
+
callback(`Uploading chunk ${(end / 1024 / 1024).toFixed(0)}/${(metadata.ContentLength / 1024 / 1024).toFixed(0)} MB...`);
|
|
58
|
+
|
|
59
|
+
const chunk = await downloadFile(relpathOriginal, { Range, fallback: false });
|
|
60
|
+
// const { Body: chunk } = await s3Client.send(new GetObjectCommand({ Bucket, Key, Range }));
|
|
61
|
+
const bufferPart = chunk ? await chunk.transformToByteArray() : [];
|
|
62
|
+
|
|
63
|
+
if (!bufferPart.length) {
|
|
64
|
+
callback(`Server error: file not found / zero bytes: ${relpath}`);
|
|
65
|
+
break;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
const result = await UploadRaster({
|
|
69
|
+
path: relpath,
|
|
70
|
+
filesize: metadata.ContentLength,
|
|
71
|
+
data: bufferPart,
|
|
72
|
+
chunked: true,
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
if (result.finished) {
|
|
76
|
+
callback(`Upload completed: ${relpath}`);
|
|
77
|
+
break;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
if (!result.uploaded) {
|
|
81
|
+
callback(`Chunked upload error: ${relpath}`);
|
|
82
|
+
break;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
offset = +result.uploaded;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
catch (err) {
|
|
91
|
+
logger.file('mapnik/upload/error', { error: err.toString(), stack: err.stack });
|
|
92
|
+
callback(config.local ? err.toString() : `Upload error: ${relpath}`);
|
|
93
|
+
return null;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
export default async function uploadRaster({
|
|
98
|
+
pg = pgClients.client, params,
|
|
99
|
+
}, reply) {
|
|
100
|
+
if (!UploadRaster || !GetRasterStatus) {
|
|
101
|
+
return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
const { id } = params;
|
|
105
|
+
|
|
106
|
+
if (!id) {
|
|
107
|
+
return reply.status(400).send({ error: 'not enough params: id', code: 400 });
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
const data = pg.pk?.['gis.rasters']
|
|
111
|
+
? await pg.query('select raster_id as id, source_path from gis.rasters where raster_id=$1::text', [id])
|
|
112
|
+
.then(el => el.rows?.[0])
|
|
113
|
+
: null;
|
|
114
|
+
|
|
115
|
+
if (!data?.id) {
|
|
116
|
+
return reply.status(404).send({ error: 'raster not found', code: 404 });
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
if (!data.source_path) {
|
|
120
|
+
return reply.status(400).send({ error: 'raster source_path not set', code: 400 });
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
const prefix = '/map/raster';
|
|
124
|
+
const relpath = `${prefix}/${data.source_path}`;
|
|
125
|
+
|
|
126
|
+
if (!path.extname(relpath)) {
|
|
127
|
+
const metadata = await s3Client.send(new ListObjectsV2Command({
|
|
128
|
+
Bucket: config.s3?.containerName || 'work',
|
|
129
|
+
Prefix: path.join(config.folder, relpath).replace(/\\/g, '/'),
|
|
130
|
+
}));
|
|
131
|
+
if (!metadata.Contents?.length) {
|
|
132
|
+
return reply.status(404).send({
|
|
133
|
+
error: 'invalid: raster source_path: not found / empty directory',
|
|
134
|
+
code: 404,
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
// list rasters, skip preview subdir content, skip folders from s3 directory name of which only starts with same characters, but does not exactly match
|
|
139
|
+
const files = metadata.Contents.map(file => file.Key).filter((file) => path.basename(path.dirname(file)) === path.basename(relpath) && !path.basename(path.dirname(file)).startsWith('preview') && path.extname(file).toLowerCase() === '.tif');
|
|
140
|
+
|
|
141
|
+
if (!files.length) {
|
|
142
|
+
return reply.status(400).send({
|
|
143
|
+
error: 'invalid: raster source_path: no raster files at directory',
|
|
144
|
+
code: 400,
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
const callback = eventStream(reply);
|
|
148
|
+
await sequence(files, { id, prefix, callback }, uploadRasterFile);
|
|
149
|
+
return callback('finish', 1);
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
const callback = eventStream(reply);
|
|
153
|
+
await uploadRasterFile({
|
|
154
|
+
id, prefix, callback, relpath,
|
|
155
|
+
});
|
|
156
|
+
return callback('finish', 1);
|
|
157
|
+
}
|
|
@@ -1,22 +1,22 @@
|
|
|
1
|
-
import { pgClients } from "@opengis/fastify-table/utils.js";
|
|
2
|
-
|
|
3
|
-
export default async function cartoBounds({ id, dataset }, pg = pgClients.client) {
|
|
4
|
-
const sqlBounds = dataset.map(el => ({ tbl: el.table.split('.'), geom: el.gcol || 'geom' })).map(({ tbl, geom }) => `select ST_EstimatedExtent('${tbl[0]}','${tbl[1]}', '${geom}')`);
|
|
5
|
-
|
|
6
|
-
const geom = await pg.query(
|
|
7
|
-
`update gis.cartocss set
|
|
8
|
-
geom=(select st_extent(st_estimatedextent) from ( ${sqlBounds.join(' union all ')})q )
|
|
9
|
-
where cartocss_id=$1 returning geom::box2d`,
|
|
10
|
-
[id],
|
|
11
|
-
).then(e => e.rows?.[0]?.geom);
|
|
12
|
-
|
|
13
|
-
const bounds = geom
|
|
14
|
-
? geom.replace(/[A-Z\)\(]+/g, '').split(/[ ,]+/).map(el => el - 0)
|
|
15
|
-
: null;
|
|
16
|
-
|
|
17
|
-
if (!bounds) {
|
|
18
|
-
// throw new Error('empty bounds');
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
return bounds || [-180, -85.05112877980659, 180, 85.05112877980659];
|
|
22
|
-
}
|
|
1
|
+
import { pgClients } from "@opengis/fastify-table/utils.js";
|
|
2
|
+
|
|
3
|
+
export default async function cartoBounds({ id, dataset }, pg = pgClients.client) {
|
|
4
|
+
const sqlBounds = dataset.map(el => ({ tbl: el.table.split('.'), geom: el.gcol || 'geom' })).map(({ tbl, geom }) => `select ST_EstimatedExtent('${tbl[0]}','${tbl[1]}', '${geom}')`);
|
|
5
|
+
|
|
6
|
+
const geom = await pg.query(
|
|
7
|
+
`update gis.cartocss set
|
|
8
|
+
geom=(select st_extent(st_estimatedextent) from ( ${sqlBounds.join(' union all ')})q )
|
|
9
|
+
where cartocss_id=$1 returning geom::box2d`,
|
|
10
|
+
[id],
|
|
11
|
+
).then(e => e.rows?.[0]?.geom);
|
|
12
|
+
|
|
13
|
+
const bounds = geom
|
|
14
|
+
? geom.replace(/[A-Z\)\(]+/g, '').split(/[ ,]+/).map(el => el - 0)
|
|
15
|
+
: null;
|
|
16
|
+
|
|
17
|
+
if (!bounds) {
|
|
18
|
+
// throw new Error('empty bounds');
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
return bounds || [-180, -85.05112877980659, 180, 85.05112877980659];
|
|
22
|
+
}
|
|
@@ -1,106 +1,106 @@
|
|
|
1
|
-
import carto from 'carto';
|
|
2
|
-
|
|
3
|
-
import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
|
|
4
|
-
|
|
5
|
-
const { UploadXML } = mapnik();
|
|
6
|
-
|
|
7
|
-
const srsList = {};
|
|
8
|
-
|
|
9
|
-
const getGeomColumn = (geoms, customColumn) => {
|
|
10
|
-
if (customColumn && geoms.includes(customColumn)) {
|
|
11
|
-
return customColumn;
|
|
12
|
-
}
|
|
13
|
-
if (geoms.includes('geom')) {
|
|
14
|
-
return 'geom';
|
|
15
|
-
}
|
|
16
|
-
return geoms[0];
|
|
17
|
-
};
|
|
18
|
-
|
|
19
|
-
import cartoBounds from './cartoBounds.js';
|
|
20
|
-
|
|
21
|
-
function cartoData(el, extent, pg) {
|
|
22
|
-
const minzoom = el.zoom ? (+el.zoom || 5) : 5;
|
|
23
|
-
const maxzoom = el.maxzoom ? (+el.maxzoom || 22) : 22;
|
|
24
|
-
const view = `(select ${el.columns || '1'}, ${el.gcol} from ${el.table} where ${el.query || 'true'} ) as data`;
|
|
25
|
-
const layerBound = extent || [-180, -85, 180, 85];
|
|
26
|
-
|
|
27
|
-
return {
|
|
28
|
-
id: el.caption,
|
|
29
|
-
name: el.caption,
|
|
30
|
-
properties: { minzoom, maxzoom },
|
|
31
|
-
srs: el.proj4text || '+proj=longlat +datum=WGS84 +no_defs',
|
|
32
|
-
Datasource: {
|
|
33
|
-
simplify_geometries: true,
|
|
34
|
-
type: 'postgis',
|
|
35
|
-
extent: layerBound.join(','),
|
|
36
|
-
table: view,
|
|
37
|
-
geometry_field: el.gcol,
|
|
38
|
-
host: pg.options?.host || 'localhost',
|
|
39
|
-
dbname: pg.options?.database || 'postgres',
|
|
40
|
-
port: pg.options?.port || 5432,
|
|
41
|
-
user: pg.options?.user || 'postgres',
|
|
42
|
-
password: pg.options?.password || 'postgres',
|
|
43
|
-
},
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
export default async function uploadXML({ id, dataset, style }, pg) {
|
|
48
|
-
if (!id || !dataset?.length || Array.isArray(dataset) === false) {
|
|
49
|
-
return null;
|
|
50
|
-
}
|
|
51
|
-
await Promise.all(dataset.filter((el) => el.active !== false).map(async el => {
|
|
52
|
-
const { table } = el;
|
|
53
|
-
|
|
54
|
-
const geoms = await pg.query(`SELECT json_agg(attname) as geoms FROM pg_attribute
|
|
55
|
-
where attrelid = to_regclass($1::text)
|
|
56
|
-
and attnum > 0
|
|
57
|
-
AND NOT attisdropped
|
|
58
|
-
and atttypid::regtype::text ='geometry'`, [table]).then(e => e.rows?.[0]?.geoms || []);
|
|
59
|
-
|
|
60
|
-
const gcol = getGeomColumn(geoms, el.gcol);
|
|
61
|
-
Object.assign(el, { gcol });
|
|
62
|
-
|
|
63
|
-
const srid = el.srid ? el.srid
|
|
64
|
-
: await pg.query(`select st_srid(${gcol}) as srid from ${table} where ${gcol} is not null limit 1`).then(e => e.rows[0]?.srid);
|
|
65
|
-
|
|
66
|
-
if (srid && !srsList[srid] && (srid - 0 > 0)) {
|
|
67
|
-
srsList[srid] = await pg.query(`SELECT proj4text from spatial_ref_sys where srid=$1`, [srid])
|
|
68
|
-
.then(e => e.rows[0]?.proj4text);
|
|
69
|
-
}
|
|
70
|
-
Object.assign(el, { gcol, proj4text: srsList[srid] });
|
|
71
|
-
}));
|
|
72
|
-
|
|
73
|
-
const bounds = await cartoBounds({ id, dataset }, pg);
|
|
74
|
-
|
|
75
|
-
const arrayLayers = dataset.filter((el) => el.active !== false).map((el) => cartoData(el, bounds, pg));
|
|
76
|
-
|
|
77
|
-
const configJson = {
|
|
78
|
-
format: 'png',
|
|
79
|
-
Layer: arrayLayers.reverse(),
|
|
80
|
-
srs: '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over',
|
|
81
|
-
bounds,
|
|
82
|
-
'maximum-extent': '-20037508.34,-20037508.34,20037508.34,20037508.34',
|
|
83
|
-
center: [0, 0, 2],
|
|
84
|
-
minzoom: 1,
|
|
85
|
-
maxzoom: 25,
|
|
86
|
-
Stylesheet: [{
|
|
87
|
-
id: 'carto_css_style',
|
|
88
|
-
data: style || '',
|
|
89
|
-
}],
|
|
90
|
-
};
|
|
91
|
-
|
|
92
|
-
// generate
|
|
93
|
-
const res = new carto.Renderer().render(configJson);
|
|
94
|
-
const xmlFileText = typeof res === 'string' ? res : res?.data;
|
|
95
|
-
if (!xmlFileText) {
|
|
96
|
-
throw new Error('xml generation error');
|
|
97
|
-
}
|
|
98
|
-
const { status } = await UploadXML({
|
|
99
|
-
name: id,
|
|
100
|
-
xml: xmlFileText,
|
|
101
|
-
});
|
|
102
|
-
if (status !== 'success') {
|
|
103
|
-
throw new Error('xml upload error');
|
|
104
|
-
}
|
|
105
|
-
return xmlFileText;
|
|
106
|
-
}
|
|
1
|
+
import carto from 'carto';
|
|
2
|
+
|
|
3
|
+
import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
|
|
4
|
+
|
|
5
|
+
const { UploadXML } = mapnik();
|
|
6
|
+
|
|
7
|
+
const srsList = {};
|
|
8
|
+
|
|
9
|
+
const getGeomColumn = (geoms, customColumn) => {
|
|
10
|
+
if (customColumn && geoms.includes(customColumn)) {
|
|
11
|
+
return customColumn;
|
|
12
|
+
}
|
|
13
|
+
if (geoms.includes('geom')) {
|
|
14
|
+
return 'geom';
|
|
15
|
+
}
|
|
16
|
+
return geoms[0];
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
import cartoBounds from './cartoBounds.js';
|
|
20
|
+
|
|
21
|
+
function cartoData(el, extent, pg) {
|
|
22
|
+
const minzoom = el.zoom ? (+el.zoom || 5) : 5;
|
|
23
|
+
const maxzoom = el.maxzoom ? (+el.maxzoom || 22) : 22;
|
|
24
|
+
const view = `(select ${el.columns || '1'}, ${el.gcol} from ${el.table} where ${el.query || 'true'} ) as data`;
|
|
25
|
+
const layerBound = extent || [-180, -85, 180, 85];
|
|
26
|
+
|
|
27
|
+
return {
|
|
28
|
+
id: el.caption,
|
|
29
|
+
name: el.caption,
|
|
30
|
+
properties: { minzoom, maxzoom },
|
|
31
|
+
srs: el.proj4text || '+proj=longlat +datum=WGS84 +no_defs',
|
|
32
|
+
Datasource: {
|
|
33
|
+
simplify_geometries: true,
|
|
34
|
+
type: 'postgis',
|
|
35
|
+
extent: layerBound.join(','),
|
|
36
|
+
table: view,
|
|
37
|
+
geometry_field: el.gcol,
|
|
38
|
+
host: pg.options?.host || 'localhost',
|
|
39
|
+
dbname: pg.options?.database || 'postgres',
|
|
40
|
+
port: pg.options?.port || 5432,
|
|
41
|
+
user: pg.options?.user || 'postgres',
|
|
42
|
+
password: pg.options?.password || 'postgres',
|
|
43
|
+
},
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export default async function uploadXML({ id, dataset, style }, pg) {
|
|
48
|
+
if (!id || !dataset?.length || Array.isArray(dataset) === false) {
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
await Promise.all(dataset.filter((el) => el.active !== false).map(async el => {
|
|
52
|
+
const { table } = el;
|
|
53
|
+
|
|
54
|
+
const geoms = await pg.query(`SELECT json_agg(attname) as geoms FROM pg_attribute
|
|
55
|
+
where attrelid = to_regclass($1::text)
|
|
56
|
+
and attnum > 0
|
|
57
|
+
AND NOT attisdropped
|
|
58
|
+
and atttypid::regtype::text ='geometry'`, [table]).then(e => e.rows?.[0]?.geoms || []);
|
|
59
|
+
|
|
60
|
+
const gcol = getGeomColumn(geoms, el.gcol);
|
|
61
|
+
Object.assign(el, { gcol });
|
|
62
|
+
|
|
63
|
+
const srid = el.srid ? el.srid
|
|
64
|
+
: await pg.query(`select st_srid(${gcol}) as srid from ${table} where ${gcol} is not null limit 1`).then(e => e.rows[0]?.srid);
|
|
65
|
+
|
|
66
|
+
if (srid && !srsList[srid] && (srid - 0 > 0)) {
|
|
67
|
+
srsList[srid] = await pg.query(`SELECT proj4text from spatial_ref_sys where srid=$1`, [srid])
|
|
68
|
+
.then(e => e.rows[0]?.proj4text);
|
|
69
|
+
}
|
|
70
|
+
Object.assign(el, { gcol, proj4text: srsList[srid] });
|
|
71
|
+
}));
|
|
72
|
+
|
|
73
|
+
const bounds = await cartoBounds({ id, dataset }, pg);
|
|
74
|
+
|
|
75
|
+
const arrayLayers = dataset.filter((el) => el.active !== false).map((el) => cartoData(el, bounds, pg));
|
|
76
|
+
|
|
77
|
+
const configJson = {
|
|
78
|
+
format: 'png',
|
|
79
|
+
Layer: arrayLayers.reverse(),
|
|
80
|
+
srs: '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over',
|
|
81
|
+
bounds,
|
|
82
|
+
'maximum-extent': '-20037508.34,-20037508.34,20037508.34,20037508.34',
|
|
83
|
+
center: [0, 0, 2],
|
|
84
|
+
minzoom: 1,
|
|
85
|
+
maxzoom: 25,
|
|
86
|
+
Stylesheet: [{
|
|
87
|
+
id: 'carto_css_style',
|
|
88
|
+
data: style || '',
|
|
89
|
+
}],
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
// generate
|
|
93
|
+
const res = new carto.Renderer().render(configJson);
|
|
94
|
+
const xmlFileText = typeof res === 'string' ? res : res?.data;
|
|
95
|
+
if (!xmlFileText) {
|
|
96
|
+
throw new Error('xml generation error');
|
|
97
|
+
}
|
|
98
|
+
const { status } = await UploadXML({
|
|
99
|
+
name: id,
|
|
100
|
+
xml: xmlFileText,
|
|
101
|
+
});
|
|
102
|
+
if (status !== 'success') {
|
|
103
|
+
throw new Error('xml upload error');
|
|
104
|
+
}
|
|
105
|
+
return xmlFileText;
|
|
106
|
+
}
|
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
import uploadRaster from './controllers/uploadRaster.js';
|
|
2
|
-
import createXml from './controllers/createXml.js';
|
|
3
|
-
import rtile from './controllers/rtile.js';
|
|
4
|
-
import rasterInfo from './controllers/rasterInfo.js';
|
|
5
|
-
import mapnikStat from './controllers/mapnikStat.js';
|
|
6
|
-
import mapnikLogger from './controllers/mapnikLogger.js';
|
|
7
|
-
import checkCarto from './controllers/checkCarto.js';
|
|
8
|
-
|
|
9
|
-
const publicParams = { config: { policy: 'L0' }, package: 'gis' }; // L0 === public
|
|
10
|
-
const adminParams = { config: { policy: 'L1', role: 'admin' }, package: 'gis' };
|
|
11
|
-
const params = { config: { policy: 'L1' }, package: 'gis' }; // L1 === authorized only
|
|
12
|
-
|
|
13
|
-
export default async function route(app) {
|
|
14
|
-
app.get('/gis-upload-raster/:id', params, uploadRaster);
|
|
15
|
-
app.get('/gis-xml/:id', publicParams, createXml);
|
|
16
|
-
app.get('/gis-rtile/:id/:z/:y/:x', publicParams, rtile);
|
|
17
|
-
app.get('/gis-raster/:id', publicParams, rasterInfo);
|
|
18
|
-
app.get('/gis-stat/:period?', adminParams, mapnikStat);
|
|
19
|
-
app.get('/gis-logger/:type', adminParams, mapnikLogger);
|
|
20
|
-
app.get('/gis-css/:id', params, checkCarto);
|
|
21
|
-
}
|
|
1
|
+
import uploadRaster from './controllers/uploadRaster.js';
|
|
2
|
+
import createXml from './controllers/createXml.js';
|
|
3
|
+
import rtile from './controllers/rtile.js';
|
|
4
|
+
import rasterInfo from './controllers/rasterInfo.js';
|
|
5
|
+
import mapnikStat from './controllers/mapnikStat.js';
|
|
6
|
+
import mapnikLogger from './controllers/mapnikLogger.js';
|
|
7
|
+
import checkCarto from './controllers/checkCarto.js';
|
|
8
|
+
|
|
9
|
+
const publicParams = { config: { policy: 'L0' }, package: 'gis' }; // L0 === public
|
|
10
|
+
const adminParams = { config: { policy: 'L1', role: 'admin' }, package: 'gis' };
|
|
11
|
+
const params = { config: { policy: 'L1' }, package: 'gis' }; // L1 === authorized only
|
|
12
|
+
|
|
13
|
+
export default async function route(app) {
|
|
14
|
+
app.get('/gis-upload-raster/:id', params, uploadRaster);
|
|
15
|
+
app.get('/gis-xml/:id', publicParams, createXml);
|
|
16
|
+
app.get('/gis-rtile/:id/:z/:y/:x', publicParams, rtile);
|
|
17
|
+
app.get('/gis-raster/:id', publicParams, rasterInfo);
|
|
18
|
+
app.get('/gis-stat/:period?', adminParams, mapnikStat);
|
|
19
|
+
app.get('/gis-logger/:type', adminParams, mapnikLogger);
|
|
20
|
+
app.get('/gis-css/:id', params, checkCarto);
|
|
21
|
+
}
|
package/server/routes/root.mjs
CHANGED
|
@@ -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,13 +1,13 @@
|
|
|
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
|
-
import checkRasterFile from './server/plugins/mapnik/funcs/checkRasterFile.js';
|
|
6
|
-
|
|
7
|
-
export {
|
|
8
|
-
gisRegistry,
|
|
9
|
-
gisRegistryList,
|
|
10
|
-
mapRegistry,
|
|
11
|
-
rootFolder,
|
|
12
|
-
checkRasterFile,
|
|
13
|
-
};
|
|
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
|
+
import checkRasterFile from './server/plugins/mapnik/funcs/checkRasterFile.js';
|
|
6
|
+
|
|
7
|
+
export {
|
|
8
|
+
gisRegistry,
|
|
9
|
+
gisRegistryList,
|
|
10
|
+
mapRegistry,
|
|
11
|
+
rootFolder,
|
|
12
|
+
checkRasterFile,
|
|
13
|
+
};
|