@opengis/gis 0.2.82 → 0.2.84
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/dist/index.js +5319 -5100
- package/dist/index.umd.cjs +41 -41
- package/module/gis/table/gis.registers.table.json +3 -3
- package/module/gis/table/gis.services.table.json +2 -2
- package/package.json +4 -3
- package/server/routes/mapnik/controllers/rasterInfo.js +3 -4
- package/server/routes/mapnik/controllers/rtile.js +4 -2
|
@@ -45,7 +45,8 @@
|
|
|
45
45
|
"ua": "Група сервісу",
|
|
46
46
|
"name": "group_id",
|
|
47
47
|
"data": "gis.group_list",
|
|
48
|
-
"format": "badge"
|
|
48
|
+
"format": "badge",
|
|
49
|
+
"width": 300
|
|
49
50
|
},
|
|
50
51
|
{
|
|
51
52
|
"ua": "Шар на мапі",
|
|
@@ -69,8 +70,7 @@
|
|
|
69
70
|
{
|
|
70
71
|
"ua": "Таблиця в базі даних",
|
|
71
72
|
"name": "table_name",
|
|
72
|
-
"format": "text"
|
|
73
|
-
"width": 350
|
|
73
|
+
"format": "text"
|
|
74
74
|
},
|
|
75
75
|
{
|
|
76
76
|
"ua": "Публічний",
|
|
@@ -41,7 +41,8 @@
|
|
|
41
41
|
"ua": "Група",
|
|
42
42
|
"name": "group_id",
|
|
43
43
|
"data": "gis.group_list",
|
|
44
|
-
"format": "badge"
|
|
44
|
+
"format": "badge",
|
|
45
|
+
"width": 300
|
|
45
46
|
},
|
|
46
47
|
{
|
|
47
48
|
"ua": "Ключові слова",
|
|
@@ -52,7 +53,6 @@
|
|
|
52
53
|
{
|
|
53
54
|
"ua": "Джерело",
|
|
54
55
|
"name": "source_path",
|
|
55
|
-
"width": 100,
|
|
56
56
|
"slot" : "<span class='text-ellipsis'>{{data.source_path}}</span>",
|
|
57
57
|
"format": "slot"
|
|
58
58
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opengis/gis",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.84",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"author": "Softpro",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -19,8 +19,9 @@
|
|
|
19
19
|
"migrate": "MIGRATE=true bun ./node_modules/@opengis/fastify-table/dist/script/migrate.js",
|
|
20
20
|
"start": "bun server",
|
|
21
21
|
"start:kyiv-demo": "bun --env-file=.env.kyiv-demo server",
|
|
22
|
-
"
|
|
22
|
+
"kamyanske": "bun --env-file=.env.kamyanske server",
|
|
23
23
|
"start:kr": "bun --env-file=.env.kr server",
|
|
24
|
+
"poltava": "bun --env-file=.env.poltava --hot server",
|
|
24
25
|
"dev:kyiv-demo": "bun --env-file=.env.kyiv-demo --hot server",
|
|
25
26
|
"dev:kamyanske": "bun --env-file=.env.kamyanske --hot server",
|
|
26
27
|
"dev:kr": "bun --env-file=.env.kr --hot server",
|
|
@@ -72,4 +73,4 @@
|
|
|
72
73
|
"vue-router": "4.5.1",
|
|
73
74
|
"vuedraggable": "^4.1.0"
|
|
74
75
|
}
|
|
75
|
-
}
|
|
76
|
+
}
|
|
@@ -14,7 +14,7 @@ export default async function rasterInfo({
|
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
const raster = pg.pk?.['gis.rasters']
|
|
17
|
-
? await pg.query('select raster_id, source_path, name, description, raster_key, is_active, is_public, srid from gis.rasters where raster_id=$1::text', [params.id])
|
|
17
|
+
? await pg.query('select raster_id, source_path, name, description, raster_key, is_active, is_public, srid, proj4 from gis.rasters where raster_id=$1::text', [params.id])
|
|
18
18
|
.then(el => el.rows?.[0] || {})
|
|
19
19
|
: {};
|
|
20
20
|
|
|
@@ -27,12 +27,11 @@ export default async function rasterInfo({
|
|
|
27
27
|
Object.assign(raster, { source_path: decodedPath });
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
-
const proj4 = raster.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [raster.srid]).then(el => el.rows?.[0]?.proj4text) : undefined;
|
|
30
|
+
const proj4 = raster.proj4 || (raster.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [raster.srid]).then(el => el.rows?.[0]?.proj4text) : undefined);
|
|
31
31
|
|
|
32
32
|
const { data, cache } = await GetRasterInfo({
|
|
33
33
|
path: raster.source_path,
|
|
34
|
-
|
|
35
|
-
// proj4,
|
|
34
|
+
proj4,
|
|
36
35
|
ttl: query.nocache ? '0' : '1h',
|
|
37
36
|
});
|
|
38
37
|
|
|
@@ -80,14 +80,16 @@ export default async function rtile({
|
|
|
80
80
|
? Buffer.from(raster.source_path).toString('base64url')
|
|
81
81
|
: undefined;
|
|
82
82
|
|
|
83
|
-
const
|
|
83
|
+
const param = {
|
|
84
84
|
path: cartoExists ? null : raster.source_path, // for rasters only
|
|
85
85
|
name: cartoExists && carto.source_path ? `vector/${carto.source_path}` : id, // required for cartocss
|
|
86
86
|
width: 256,
|
|
87
87
|
bbox,
|
|
88
88
|
ttl,
|
|
89
89
|
debug: query.debug,
|
|
90
|
-
}
|
|
90
|
+
};
|
|
91
|
+
// console.log(param);
|
|
92
|
+
const data = await RenderTile(param);
|
|
91
93
|
|
|
92
94
|
if (query.debug) {
|
|
93
95
|
return {
|