@basemaps/cli-vector 8.2.0 → 8.4.0
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/build/cli/cli.analyse.js +1 -1
- package/build/cli/cli.create.js +7 -3
- package/build/cli/cli.create.js.map +1 -1
- package/build/cli/cli.extract.js +1 -1
- package/build/cli/cli.extract.js.map +1 -1
- package/build/cli/cli.join.js +3 -3
- package/build/cli/cli.join.js.map +1 -1
- package/build/generalization/generalization.d.ts +2 -1
- package/build/generalization/generalization.js +31 -22
- package/build/generalization/generalization.js.map +1 -1
- package/build/modify/layers/place_labels.d.ts +5 -4
- package/build/modify/layers/place_labels.js +41 -57
- package/build/modify/layers/place_labels.js.map +1 -1
- package/build/modify/layers/pois.js +5 -3
- package/build/modify/layers/pois.js.map +1 -1
- package/build/modify/layers/public_transport.js +2 -20
- package/build/modify/layers/public_transport.js.map +1 -1
- package/build/modify/layers/{water_polygons.d.ts → water.d.ts} +2 -2
- package/build/modify/layers/{water_polygons.js → water.js} +12 -15
- package/build/modify/layers/water.js.map +1 -0
- package/build/modify/modify.js +3 -2
- package/build/modify/modify.js.map +1 -1
- package/build/modify/parser.d.ts +15 -32
- package/build/modify/parser.js +15 -15
- package/build/modify/parser.js.map +1 -1
- package/build/modify/schema.d.ts +5 -7
- package/build/modify/shared.d.ts +4 -0
- package/build/modify/shared.js +25 -5
- package/build/modify/shared.js.map +1 -1
- package/build/schema-loader/parser.d.ts +8 -0
- package/build/schema-loader/parser.js +1 -0
- package/build/schema-loader/parser.js.map +1 -1
- package/build/schema-loader/schema.d.ts +2 -0
- package/build/schema-loader/schema.loader.d.ts +3 -1
- package/build/schema-loader/schema.loader.js +9 -2
- package/build/schema-loader/schema.loader.js.map +1 -1
- package/build/stac.js +3 -2
- package/build/stac.js.map +1 -1
- package/build/transform/nztm.d.ts +4 -0
- package/build/transform/nztm.js +13 -0
- package/build/transform/nztm.js.map +1 -0
- package/build/transform/ogr2ogr.d.ts +3 -1
- package/build/transform/ogr2ogr.js +24 -1
- package/build/transform/ogr2ogr.js.map +1 -1
- package/build/transform/tippecanoe.d.ts +2 -1
- package/build/transform/tippecanoe.js +6 -5
- package/build/transform/tippecanoe.js.map +1 -1
- package/dist/index.cjs +736 -656
- package/package.json +7 -7
- package/build/modify/layers/water_polygons.js.map +0 -1
|
@@ -1,14 +1,13 @@
|
|
|
1
|
-
import { Area } from '@linzjs/geojson';
|
|
2
1
|
export const LargeLakeSize = 4_000_000;
|
|
3
2
|
/**
|
|
4
|
-
* Processes a 'water_polygons' layer feature.
|
|
3
|
+
* Processes a 'water_lines' or 'water_polygons' layer feature.
|
|
5
4
|
*
|
|
6
5
|
* @param feature - the feature to process
|
|
7
6
|
* @param options - the layer's options
|
|
8
7
|
* @param logger - a logger instance
|
|
9
8
|
* @returns the processed feature
|
|
10
9
|
*/
|
|
11
|
-
export function
|
|
10
|
+
export function handleLayerWater(feature, options, logger) {
|
|
12
11
|
logger.trace({}, 'HandleWaterPolygons:Start');
|
|
13
12
|
feature = structuredClone(feature);
|
|
14
13
|
const kind = options.layer.tags['kind'];
|
|
@@ -47,17 +46,15 @@ function handleKindWater(feature, logger) {
|
|
|
47
46
|
logger.trace({ name: grpName }, 'new/overidden tags');
|
|
48
47
|
}
|
|
49
48
|
// determine if the lake is large
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
49
|
+
if (feature.properties['water'] === 'lake') {
|
|
50
|
+
const aera = feature.properties['_derived_area'];
|
|
51
|
+
if (aera != null && Number(aera) >= LargeLakeSize) {
|
|
52
|
+
feature.tippecanoe.minzoom = 1;
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
feature.tippecanoe.minzoom = 9;
|
|
56
|
+
}
|
|
57
57
|
}
|
|
58
|
-
const minzoom = area >= LargeLakeSize ? 1 : 9;
|
|
59
|
-
feature.tippecanoe.minzoom = minzoom;
|
|
60
|
-
logger.trace({ minzoom }, 'overidden styles');
|
|
61
58
|
logger.trace({}, 'HandleKindWater:End');
|
|
62
59
|
return feature;
|
|
63
60
|
}
|
|
@@ -73,7 +70,7 @@ function handleKindRiver(feature, options, logger) {
|
|
|
73
70
|
feature = structuredClone(feature);
|
|
74
71
|
if (options.layer.style.minZoom < 11) {
|
|
75
72
|
const name = feature.properties['name'];
|
|
76
|
-
if (name === '') {
|
|
73
|
+
if (name === '' && feature.tippecanoe.minzoom < 11) {
|
|
77
74
|
const minzoom = 11;
|
|
78
75
|
feature.tippecanoe.minzoom = minzoom;
|
|
79
76
|
logger.trace({ minzoom }, 'overidden styles');
|
|
@@ -82,4 +79,4 @@ function handleKindRiver(feature, options, logger) {
|
|
|
82
79
|
logger.trace({}, 'HandleKindRiver:End');
|
|
83
80
|
return feature;
|
|
84
81
|
}
|
|
85
|
-
//# sourceMappingURL=
|
|
82
|
+
//# sourceMappingURL=water.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"water.js","sourceRoot":"","sources":["../../../src/modify/layers/water.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC;AAEvC;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAyB,EACzB,OAA8B,EAC9B,MAAe;IAEf,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,2BAA2B,CAAC,CAAC;IAC9C,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAExC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,OAAO;YACV,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC3C,MAAM;QACR,KAAK,OAAO;YACV,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACpD,MAAM;IACV,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAElD,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;QACtB,MAAM,SAAS,GAAG,SAAS,CAAC;QAC5B,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,EAAE,oBAAoB,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,yBAAyB,CAAC,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,SAAS,eAAe,CAAC,OAAyB,EAAE,MAAe;IACjE,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,uBAAuB,CAAC,CAAC;IAC1C,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAEnC,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,iEAAiE;QACjE,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC/C,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,oBAAoB,CAAC,CAAC;IACxD,CAAC;IAED,iCAAiC;IACjC,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACjD,IAAI,IAAI,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,aAAa,EAAE,CAAC;YAClD,OAAO,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,qBAAqB,CAAC,CAAC;IACxC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,SAAS,eAAe,CAAC,OAAyB,EAAE,OAA8B,EAAE,MAAe;IACjG,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,uBAAuB,CAAC,CAAC;IAC1C,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAEnC,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAExC,IAAI,IAAI,KAAK,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,CAAC;YACnD,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,OAAO,CAAC,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,kBAAkB,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,qBAAqB,CAAC,CAAC;IACxC,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
package/build/modify/modify.js
CHANGED
|
@@ -4,7 +4,7 @@ import { handleLayerPois } from './layers/pois.js';
|
|
|
4
4
|
import { handleLayerPublicTransport } from './layers/public_transport.js';
|
|
5
5
|
import { handleLayerStreetLabels } from './layers/street_labels.js';
|
|
6
6
|
import { handleLayerStreets } from './layers/streets.js';
|
|
7
|
-
import {
|
|
7
|
+
import { handleLayerWater } from './layers/water.js';
|
|
8
8
|
/**
|
|
9
9
|
* special tag function to check if the name to decide whether to do special tags
|
|
10
10
|
* Include like place_labels, pois(for building poi), contours, public_transport, street_labels/streets, water_lines/water_polygons
|
|
@@ -37,7 +37,8 @@ export function modifyFeature(feature, options, logger) {
|
|
|
37
37
|
modifiedFeature = handleLayerStreets(feature, options, logger);
|
|
38
38
|
break;
|
|
39
39
|
case 'water_polygons':
|
|
40
|
-
|
|
40
|
+
case 'water_lines':
|
|
41
|
+
modifiedFeature = handleLayerWater(feature, options, logger);
|
|
41
42
|
break;
|
|
42
43
|
default:
|
|
43
44
|
modifiedFeature = structuredClone(feature);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modify.js","sourceRoot":"","sources":["../../src/modify/modify.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"modify.js","sourceRoot":"","sources":["../../src/modify/modify.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAC3B,OAAyB,EACzB,OAA8B,EAC9B,MAAe;IAEf,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,iBAAiB;IAC9C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,mBAAmB;IAEnD,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,qBAAqB,CAAC,CAAC;IACvD,IAAI,eAAwC,CAAC;IAE7C,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,UAAU;YACb,eAAe,GAAG,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAChE,MAAM;QACR,KAAK,cAAc;YACjB,eAAe,GAAG,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM;QACR,KAAK,MAAM;YACT,eAAe,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACnD,MAAM;QACR,KAAK,kBAAkB;YACrB,eAAe,GAAG,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACvE,MAAM;QACR,KAAK,eAAe;YAClB,eAAe,GAAG,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACpE,MAAM;QACR,KAAK,SAAS;YACZ,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAC/D,MAAM;QACR,KAAK,gBAAgB,CAAC;QACtB,KAAK,aAAa;YAChB,eAAe,GAAG,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,MAAM;QACR;YACE,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,mBAAmB,CAAC,CAAC;IACrD,OAAO,eAAe,CAAC;AACzB,CAAC"}
|
package/build/modify/parser.d.ts
CHANGED
|
@@ -2,46 +2,29 @@ import { z } from 'zod';
|
|
|
2
2
|
export declare const zPlaceLabelsProperties: z.ZodObject<{
|
|
3
3
|
/** @example "Kaitaia" */
|
|
4
4
|
label: z.ZodString;
|
|
5
|
+
/** @example 8 */
|
|
6
|
+
zoom_level: z.ZodNumber;
|
|
5
7
|
/** @example "TWN1" */
|
|
6
8
|
style: z.ZodString;
|
|
9
|
+
/** @example "cape" */
|
|
10
|
+
natural: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, unknown>;
|
|
7
11
|
/** @example "city" */
|
|
8
|
-
place: z.ZodString
|
|
9
|
-
/** @example
|
|
10
|
-
|
|
11
|
-
/** @example "0" */
|
|
12
|
-
natural: z.ZodString;
|
|
13
|
-
/** @example "0" */
|
|
14
|
-
water: z.ZodString;
|
|
12
|
+
place: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, unknown>;
|
|
13
|
+
/** @example "bay" */
|
|
14
|
+
water: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, unknown>;
|
|
15
15
|
}, "strip", z.ZodTypeAny, {
|
|
16
16
|
style: string;
|
|
17
17
|
label: string;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
water
|
|
18
|
+
zoom_level: number;
|
|
19
|
+
natural?: string | undefined;
|
|
20
|
+
place?: string | undefined;
|
|
21
|
+
water?: string | undefined;
|
|
22
22
|
}, {
|
|
23
23
|
style: string;
|
|
24
24
|
label: string;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
water
|
|
29
|
-
}>;
|
|
30
|
-
export declare const zPlaceLabelsTippecanoe: z.ZodObject<{
|
|
31
|
-
/** @example "place_labels" */
|
|
32
|
-
layer: z.ZodString;
|
|
33
|
-
/** @example 8 */
|
|
34
|
-
minzoom: z.ZodNumber;
|
|
35
|
-
/** @example 8 */
|
|
36
|
-
maxzoom: z.ZodNumber;
|
|
37
|
-
}, "strip", z.ZodTypeAny, {
|
|
38
|
-
layer: string;
|
|
39
|
-
minzoom: number;
|
|
40
|
-
maxzoom: number;
|
|
41
|
-
}, {
|
|
42
|
-
layer: string;
|
|
43
|
-
minzoom: number;
|
|
44
|
-
maxzoom: number;
|
|
25
|
+
zoom_level: number;
|
|
26
|
+
natural?: unknown;
|
|
27
|
+
place?: unknown;
|
|
28
|
+
water?: unknown;
|
|
45
29
|
}>;
|
|
46
30
|
export type zTypePlaceLabelsProperties = z.infer<typeof zPlaceLabelsProperties>;
|
|
47
|
-
export type zTypePlaceLabelsTippecanoe = z.infer<typeof zPlaceLabelsTippecanoe>;
|
package/build/modify/parser.js
CHANGED
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
+
const optionalString = z.preprocess((value) => {
|
|
3
|
+
if (value === '0' || value === null) {
|
|
4
|
+
return undefined;
|
|
5
|
+
}
|
|
6
|
+
else {
|
|
7
|
+
return value;
|
|
8
|
+
}
|
|
9
|
+
}, z.string().optional());
|
|
2
10
|
export const zPlaceLabelsProperties = z.object({
|
|
3
11
|
/** @example "Kaitaia" */
|
|
4
12
|
label: z.string(),
|
|
13
|
+
/** @example 8 */
|
|
14
|
+
zoom_level: z.number(),
|
|
5
15
|
/** @example "TWN1" */
|
|
6
16
|
style: z.string(),
|
|
17
|
+
/** @example "cape" */
|
|
18
|
+
natural: optionalString,
|
|
7
19
|
/** @example "city" */
|
|
8
|
-
place:
|
|
9
|
-
/** @example
|
|
10
|
-
|
|
11
|
-
/** @example "0" */
|
|
12
|
-
natural: z.string(),
|
|
13
|
-
/** @example "0" */
|
|
14
|
-
water: z.string(),
|
|
15
|
-
});
|
|
16
|
-
export const zPlaceLabelsTippecanoe = z.object({
|
|
17
|
-
/** @example "place_labels" */
|
|
18
|
-
layer: z.string(),
|
|
19
|
-
/** @example 8 */
|
|
20
|
-
minzoom: z.number(),
|
|
21
|
-
/** @example 8 */
|
|
22
|
-
maxzoom: z.number(),
|
|
20
|
+
place: optionalString,
|
|
21
|
+
/** @example "bay" */
|
|
22
|
+
water: optionalString,
|
|
23
23
|
});
|
|
24
24
|
//# sourceMappingURL=parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/modify/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/modify/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,cAAc,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,EAAE;IAC5C,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACpC,OAAO,SAAS,CAAC;IACnB,CAAC;SAAM,CAAC;QACN,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;AAE1B,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,yBAAyB;IACzB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IAEjB,iBAAiB;IACjB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IAEtB,sBAAsB;IACtB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IAEjB,sBAAsB;IACtB,OAAO,EAAE,cAAc;IAEvB,sBAAsB;IACtB,KAAK,EAAE,cAAc;IAErB,qBAAqB;IACrB,KAAK,EAAE,cAAc;CACtB,CAAC,CAAC"}
|
package/build/modify/schema.d.ts
CHANGED
|
@@ -5,13 +5,11 @@ export interface VectorGeoPlaceLabelsFeature extends VectorGeoFeature {
|
|
|
5
5
|
name: string;
|
|
6
6
|
/** @example "ant" */
|
|
7
7
|
kind: string;
|
|
8
|
+
/** @example "cape" */
|
|
9
|
+
natural?: string;
|
|
8
10
|
/** @example "city" */
|
|
9
|
-
place
|
|
10
|
-
/** @example
|
|
11
|
-
|
|
12
|
-
/** @example "0" */
|
|
13
|
-
natural: string;
|
|
14
|
-
/** @example "0" */
|
|
15
|
-
water: string;
|
|
11
|
+
place?: string;
|
|
12
|
+
/** @example "bay" */
|
|
13
|
+
water?: string;
|
|
16
14
|
};
|
|
17
15
|
}
|
package/build/modify/shared.d.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { LogType } from '@basemaps/shared';
|
|
2
|
+
import { Geometry, Point, Position } from 'geojson';
|
|
2
3
|
import { VectorCreationOptions } from '../stac.js';
|
|
3
4
|
import { VectorGeoFeature } from '../types/VectorGeoFeature.js';
|
|
5
|
+
export declare const polylabel: (polygon: number[][][], precision?: number, debug?: boolean) => number[];
|
|
4
6
|
export declare function handleRoadFeature(feature: VectorGeoFeature, options: VectorCreationOptions, logger: LogType): VectorGeoFeature;
|
|
7
|
+
export declare function getInaccessibilityPole(geometry: Geometry, logger: LogType): Point;
|
|
8
|
+
export declare function getCoordinates(geometry: Geometry, logger: LogType): Position[][];
|
package/build/modify/shared.js
CHANGED
|
@@ -1,19 +1,23 @@
|
|
|
1
|
+
import * as poly from 'polylabel';
|
|
1
2
|
import { MajorHighWays } from './consts.js';
|
|
3
|
+
export const polylabel = poly.default;
|
|
2
4
|
export function handleRoadFeature(feature, options, logger) {
|
|
3
5
|
logger.trace({}, 'HandleRoadFeature:Start');
|
|
4
6
|
feature = structuredClone(feature);
|
|
5
7
|
const highwayNum = feature.properties['hway_num'];
|
|
6
|
-
if (typeof highwayNum === 'string') {
|
|
8
|
+
if (highwayNum != null && typeof highwayNum === 'string') {
|
|
7
9
|
// append/override tags
|
|
8
10
|
const kind = 'motorway';
|
|
9
11
|
feature.properties['kind'] = kind;
|
|
10
12
|
const ref = highwayNum;
|
|
11
13
|
feature.properties['ref'] = ref;
|
|
12
14
|
logger.trace({ kind, ref }, 'new/overidden tags');
|
|
13
|
-
//
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
// Keep the highways with names below zoom 8.
|
|
16
|
+
if (feature.tippecanoe.minzoom < 8) {
|
|
17
|
+
const minzoom = MajorHighWays.has(highwayNum) ? feature.tippecanoe.maxzoom : 8;
|
|
18
|
+
feature.tippecanoe.minzoom = minzoom;
|
|
19
|
+
logger.trace({ minzoom }, 'overidden styles');
|
|
20
|
+
}
|
|
17
21
|
// return feature
|
|
18
22
|
logger.trace({}, 'HandleRoadFeature:End');
|
|
19
23
|
return feature;
|
|
@@ -35,4 +39,20 @@ export function handleRoadFeature(feature, options, logger) {
|
|
|
35
39
|
logger.trace({}, 'HandleRoadFeature:End');
|
|
36
40
|
return feature;
|
|
37
41
|
}
|
|
42
|
+
export function getInaccessibilityPole(geometry, logger) {
|
|
43
|
+
const coordinates = getCoordinates(geometry, logger);
|
|
44
|
+
const inaccessibilityPole = polylabel(coordinates);
|
|
45
|
+
return { type: 'Point', coordinates: inaccessibilityPole };
|
|
46
|
+
}
|
|
47
|
+
export function getCoordinates(geometry, logger) {
|
|
48
|
+
switch (geometry.type) {
|
|
49
|
+
case 'MultiPolygon':
|
|
50
|
+
// TODO: Worth to try create a point for each polygon and see how it looks line.
|
|
51
|
+
return geometry.coordinates[0];
|
|
52
|
+
case 'Polygon':
|
|
53
|
+
return geometry.coordinates;
|
|
54
|
+
}
|
|
55
|
+
logger.error({ type: geometry.type }, 'Unsupported geometry type');
|
|
56
|
+
throw new Error('Unsupported geometry type');
|
|
57
|
+
}
|
|
38
58
|
//# sourceMappingURL=shared.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/modify/shared.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/modify/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,6 +105,7 @@ export declare const zLayer: z.ZodObject<{
|
|
|
105
105
|
tolerance?: number | undefined;
|
|
106
106
|
}>, "many">>;
|
|
107
107
|
tippecanoe: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
108
|
+
includeDerivedArea: z.ZodOptional<z.ZodBoolean>;
|
|
108
109
|
}, "strip", z.ZodTypeAny, {
|
|
109
110
|
tags: Record<string, string | boolean>;
|
|
110
111
|
style: {
|
|
@@ -126,6 +127,7 @@ export declare const zLayer: z.ZodObject<{
|
|
|
126
127
|
tolerance?: number | undefined;
|
|
127
128
|
}[] | undefined;
|
|
128
129
|
tippecanoe?: string[] | undefined;
|
|
130
|
+
includeDerivedArea?: boolean | undefined;
|
|
129
131
|
}, {
|
|
130
132
|
tags: Record<string, string | boolean>;
|
|
131
133
|
style: {
|
|
@@ -147,6 +149,7 @@ export declare const zLayer: z.ZodObject<{
|
|
|
147
149
|
tolerance?: number | undefined;
|
|
148
150
|
}[] | undefined;
|
|
149
151
|
tippecanoe?: string[] | undefined;
|
|
152
|
+
includeDerivedArea?: boolean | undefined;
|
|
150
153
|
}>;
|
|
151
154
|
export declare const zSchema: z.ZodObject<{
|
|
152
155
|
name: z.ZodString;
|
|
@@ -238,6 +241,7 @@ export declare const zSchema: z.ZodObject<{
|
|
|
238
241
|
tolerance?: number | undefined;
|
|
239
242
|
}>, "many">>;
|
|
240
243
|
tippecanoe: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
244
|
+
includeDerivedArea: z.ZodOptional<z.ZodBoolean>;
|
|
241
245
|
}, "strip", z.ZodTypeAny, {
|
|
242
246
|
tags: Record<string, string | boolean>;
|
|
243
247
|
style: {
|
|
@@ -259,6 +263,7 @@ export declare const zSchema: z.ZodObject<{
|
|
|
259
263
|
tolerance?: number | undefined;
|
|
260
264
|
}[] | undefined;
|
|
261
265
|
tippecanoe?: string[] | undefined;
|
|
266
|
+
includeDerivedArea?: boolean | undefined;
|
|
262
267
|
}, {
|
|
263
268
|
tags: Record<string, string | boolean>;
|
|
264
269
|
style: {
|
|
@@ -280,6 +285,7 @@ export declare const zSchema: z.ZodObject<{
|
|
|
280
285
|
tolerance?: number | undefined;
|
|
281
286
|
}[] | undefined;
|
|
282
287
|
tippecanoe?: string[] | undefined;
|
|
288
|
+
includeDerivedArea?: boolean | undefined;
|
|
283
289
|
}>, "many">;
|
|
284
290
|
}, "strip", z.ZodTypeAny, {
|
|
285
291
|
name: string;
|
|
@@ -307,6 +313,7 @@ export declare const zSchema: z.ZodObject<{
|
|
|
307
313
|
tolerance?: number | undefined;
|
|
308
314
|
}[] | undefined;
|
|
309
315
|
tippecanoe?: string[] | undefined;
|
|
316
|
+
includeDerivedArea?: boolean | undefined;
|
|
310
317
|
}[];
|
|
311
318
|
simplify?: {
|
|
312
319
|
style: {
|
|
@@ -342,6 +349,7 @@ export declare const zSchema: z.ZodObject<{
|
|
|
342
349
|
tolerance?: number | undefined;
|
|
343
350
|
}[] | undefined;
|
|
344
351
|
tippecanoe?: string[] | undefined;
|
|
352
|
+
includeDerivedArea?: boolean | undefined;
|
|
345
353
|
}[];
|
|
346
354
|
simplify?: {
|
|
347
355
|
style: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/schema-loader/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC9B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AAE1D,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;AAEhD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,IAAI,EAAE,KAAK;CACZ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,KAAK,EAAE,QAAQ;IACf,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,KAAK;IACX,UAAU,EAAE,WAAW,CAAC,QAAQ,EAAE;IAClC,KAAK,EAAE,QAAQ;IACf,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE;IACvC,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;QACjB,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;KAChC,CAAC;IACF,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE;IACvC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;CACxB,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/schema-loader/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC9B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AAE1D,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;AAEhD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,IAAI,EAAE,KAAK;CACZ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,KAAK,EAAE,QAAQ;IACf,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,KAAK;IACX,UAAU,EAAE,WAAW,CAAC,QAAQ,EAAE;IAClC,KAAK,EAAE,QAAQ;IACf,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE;IACvC,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC1C,kBAAkB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;QACjB,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;KAChC,CAAC;IACF,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE;IACvC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;CACxB,CAAC,CAAC"}
|
|
@@ -96,6 +96,8 @@ export interface Layer {
|
|
|
96
96
|
cache?: CacheFile;
|
|
97
97
|
/** true for layer over 2GB, which will require separated node to process */
|
|
98
98
|
largeLayer?: boolean;
|
|
99
|
+
/** Include the aera size as square meters in the property _derived_area via ogr*/
|
|
100
|
+
includeDerivedArea?: boolean;
|
|
99
101
|
}
|
|
100
102
|
/**
|
|
101
103
|
* Schema metadata for vector layer
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
+
import { TileMatrixSet } from '@basemaps/geo';
|
|
1
2
|
import { LogType } from '@basemaps/shared';
|
|
2
3
|
import { Schema } from './schema.js';
|
|
3
4
|
export declare class SchemaLoader {
|
|
4
5
|
path: URL;
|
|
5
6
|
logger: LogType;
|
|
6
7
|
schemas: Schema[];
|
|
8
|
+
tileMatrix: TileMatrixSet;
|
|
7
9
|
cache?: URL;
|
|
8
|
-
constructor(path: URL, logger: LogType, cache?: URL);
|
|
10
|
+
constructor(path: URL, tileMatrix: TileMatrixSet, logger: LogType, cache?: URL);
|
|
9
11
|
/**
|
|
10
12
|
* Read the json schema from the path
|
|
11
13
|
*
|
|
@@ -6,7 +6,7 @@ import { lds, LDS_CACHE_BUCKET } from '../extract.js';
|
|
|
6
6
|
import { zSchema } from './parser.js';
|
|
7
7
|
const LARGE_LAYER_SIZE = 1024 * 1024 * 1024; // processing for large layers that over 1GB
|
|
8
8
|
export class SchemaLoader {
|
|
9
|
-
constructor(path, logger, cache) {
|
|
9
|
+
constructor(path, tileMatrix, logger, cache) {
|
|
10
10
|
Object.defineProperty(this, "path", {
|
|
11
11
|
enumerable: true,
|
|
12
12
|
configurable: true,
|
|
@@ -25,6 +25,12 @@ export class SchemaLoader {
|
|
|
25
25
|
writable: true,
|
|
26
26
|
value: []
|
|
27
27
|
});
|
|
28
|
+
Object.defineProperty(this, "tileMatrix", {
|
|
29
|
+
enumerable: true,
|
|
30
|
+
configurable: true,
|
|
31
|
+
writable: true,
|
|
32
|
+
value: void 0
|
|
33
|
+
});
|
|
28
34
|
Object.defineProperty(this, "cache", {
|
|
29
35
|
enumerable: true,
|
|
30
36
|
configurable: true,
|
|
@@ -33,6 +39,7 @@ export class SchemaLoader {
|
|
|
33
39
|
});
|
|
34
40
|
this.path = path;
|
|
35
41
|
this.logger = logger;
|
|
42
|
+
this.tileMatrix = tileMatrix;
|
|
36
43
|
this.cache = cache;
|
|
37
44
|
}
|
|
38
45
|
/**
|
|
@@ -96,7 +103,7 @@ export class SchemaLoader {
|
|
|
96
103
|
const fileName = isLdsFile
|
|
97
104
|
? `${layer.id}_${layer.version}_${configHash}.mbtiles`
|
|
98
105
|
: `${layer.id}_${configHash}.mbtiles`;
|
|
99
|
-
const path = new URL(`${layer.id}/${fileName}`, this.cache);
|
|
106
|
+
const path = new URL(`${this.tileMatrix.projection.code}/${layer.id}/${fileName}`, this.cache);
|
|
100
107
|
const exists = await fsa.exists(path);
|
|
101
108
|
const cache = {
|
|
102
109
|
fileName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.loader.js","sourceRoot":"","sources":["../../src/schema-loader/schema.loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.loader.js","sourceRoot":"","sources":["../../src/schema-loader/schema.loader.ts"],"names":[],"mappings":"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"}
|
package/build/stac.js
CHANGED
|
@@ -67,7 +67,7 @@ export class VectorStac {
|
|
|
67
67
|
stac_version: '1.0.0',
|
|
68
68
|
stac_extensions: [],
|
|
69
69
|
geometry: null,
|
|
70
|
-
bbox:
|
|
70
|
+
bbox: tileMatrix.extent.toBbox(),
|
|
71
71
|
links: [
|
|
72
72
|
{ href: `./${filename}.json`, rel: 'self' },
|
|
73
73
|
{ href: './collection.json', rel: 'collection' },
|
|
@@ -75,6 +75,7 @@ export class VectorStac {
|
|
|
75
75
|
...layers,
|
|
76
76
|
],
|
|
77
77
|
properties: {
|
|
78
|
+
datetime: CliDate,
|
|
78
79
|
'proj:epsg': tileMatrix.projection.code,
|
|
79
80
|
'linz_basemaps:generated': {
|
|
80
81
|
package: CliInfo.package,
|
|
@@ -164,7 +165,7 @@ export async function createStacFiles(filePaths, targetPath, filename, tileMatri
|
|
|
164
165
|
const stacCollection = vectorStac.createStacCollection(unionBbox, layers, filename, title);
|
|
165
166
|
// Create stac catalog
|
|
166
167
|
let stacCatalog = vectorStac.createStacCatalog();
|
|
167
|
-
const catalogPath = new URL('catalog.json', targetPath);
|
|
168
|
+
const catalogPath = new URL('topographic/catalog.json', targetPath);
|
|
168
169
|
if (await fsa.exists(catalogPath))
|
|
169
170
|
stacCatalog = await fsa.readJson(catalogPath);
|
|
170
171
|
// Add link for new collection
|
package/build/stac.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stac.js","sourceRoot":"","sources":["../src/stac.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"stac.js","sourceRoot":"","sources":["../src/stac.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Nztm2000QuadTms, projectFeature } from '@basemaps/geo';
|
|
2
|
+
// Transform a GeoJSON feature to the NZTM projection
|
|
3
|
+
export function transformNdJson(feature) {
|
|
4
|
+
projectFeature(feature, Nztm2000QuadTms);
|
|
5
|
+
}
|
|
6
|
+
// Transform Zoom level to NZTM projection
|
|
7
|
+
export function transformZoom(z, tileMatrix) {
|
|
8
|
+
if (tileMatrix.identifier === Nztm2000QuadTms.identifier)
|
|
9
|
+
return Math.max(0, z - 2);
|
|
10
|
+
else
|
|
11
|
+
return z;
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=nztm.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nztm.js","sourceRoot":"","sources":["../../src/transform/nztm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAiB,MAAM,eAAe,CAAC;AAG/E,qDAAqD;AACrD,MAAM,UAAU,eAAe,CAAC,OAAgB;IAC9C,cAAc,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;AAC3C,CAAC;AAED,0CAA0C;AAC1C,MAAM,UAAU,aAAa,CAAC,CAAS,EAAE,UAAyB;IAChE,IAAI,UAAU,CAAC,UAAU,KAAK,eAAe,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;;QAC/E,OAAO,CAAC,CAAC;AAChB,CAAC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { LogType } from '@basemaps/shared';
|
|
2
|
+
import { Layer } from '../schema-loader/schema.js';
|
|
2
3
|
/**
|
|
3
4
|
* ogr2ogr GeoJSONSeq usage, return cmd for ogr2ogr
|
|
4
5
|
*
|
|
5
6
|
* @returns {cmd: string, args: string[]} cmd and arguments for ogr2ogr
|
|
6
7
|
*/
|
|
7
|
-
export declare function ogr2ogrNDJson(input: URL, output: URL, logger: LogType): Promise<void>;
|
|
8
|
+
export declare function ogr2ogrNDJson(input: URL, output: URL, layer: Layer, logger: LogType): Promise<void>;
|
|
9
|
+
export declare function getTableName(input: URL, logger: LogType): Promise<string>;
|
|
@@ -5,11 +5,17 @@ import { Command } from '@linzjs/docker-command';
|
|
|
5
5
|
*
|
|
6
6
|
* @returns {cmd: string, args: string[]} cmd and arguments for ogr2ogr
|
|
7
7
|
*/
|
|
8
|
-
export async function ogr2ogrNDJson(input, output, logger) {
|
|
8
|
+
export async function ogr2ogrNDJson(input, output, layer, logger) {
|
|
9
9
|
const cmd = Command.create('ogr2ogr');
|
|
10
10
|
cmd.args.push('-f', 'GeoJSONSeq');
|
|
11
11
|
cmd.args.push(output.pathname);
|
|
12
12
|
cmd.args.push('-t_srs', Epsg.Wgs84.toEpsgString());
|
|
13
|
+
// Calculate area for lake polygons
|
|
14
|
+
if (layer.includeDerivedArea) {
|
|
15
|
+
const table = await getTableName(input, logger);
|
|
16
|
+
cmd.args.push('-dialect', 'SQLite');
|
|
17
|
+
cmd.args.push('-sql', `SELECT *, ST_Area(geom) AS _derived_area FROM "${table}"`);
|
|
18
|
+
}
|
|
13
19
|
cmd.args.push(input.pathname);
|
|
14
20
|
const res = await cmd.run();
|
|
15
21
|
if (res.exitCode !== 0) {
|
|
@@ -17,4 +23,21 @@ export async function ogr2ogrNDJson(input, output, logger) {
|
|
|
17
23
|
throw new Error('Gdal failed to run');
|
|
18
24
|
}
|
|
19
25
|
}
|
|
26
|
+
export async function getTableName(input, logger) {
|
|
27
|
+
const cmd = Command.create('ogrinfo');
|
|
28
|
+
cmd.args.push('-ro');
|
|
29
|
+
cmd.args.push('-q');
|
|
30
|
+
cmd.args.push('-json');
|
|
31
|
+
cmd.args.push(input.pathname);
|
|
32
|
+
const res = await cmd.run();
|
|
33
|
+
if (res.exitCode !== 0) {
|
|
34
|
+
logger.fatal({ Gdal: res }, 'Failure');
|
|
35
|
+
throw new Error('Gdal failed to run');
|
|
36
|
+
}
|
|
37
|
+
const info = JSON.parse(res.stdout);
|
|
38
|
+
if (info.layers == null || info.layers.length === 0) {
|
|
39
|
+
throw new Error(`No layers found in ${input.pathname}`);
|
|
40
|
+
}
|
|
41
|
+
return info.layers[0].name; // Return the first layer name
|
|
42
|
+
}
|
|
20
43
|
//# sourceMappingURL=ogr2ogr.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ogr2ogr.js","sourceRoot":"","sources":["../../src/transform/ogr2ogr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"ogr2ogr.js","sourceRoot":"","sources":["../../src/transform/ogr2ogr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAIjD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,KAAU,EAAE,MAAW,EAAE,KAAY,EAAE,MAAe;IACxF,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAEtC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAClC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;IAEnD,mCAAmC;IACnC,IAAI,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACpC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,kDAAkD,KAAK,GAAG,CAAC,CAAC;IACpF,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAE9B,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,GAAG,EAAE,CAAC;IAC5B,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAU,EAAE,MAAe;IAC5D,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAEtC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAE9B,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,GAAG,EAAE,CAAC;IAE5B,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAmC,CAAC;IACtE,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,sBAAsB,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,8BAA8B;AAC5D,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { TileMatrixSet } from '@basemaps/geo';
|
|
1
2
|
import { LogType } from '@basemaps/shared';
|
|
2
3
|
import { Layer } from '../schema-loader/schema.js';
|
|
3
4
|
/**
|
|
@@ -5,7 +6,7 @@ import { Layer } from '../schema-loader/schema.js';
|
|
|
5
6
|
*
|
|
6
7
|
* @returns { cmd: string; args: string[] } cmd and arguments for tippecanoe docker command
|
|
7
8
|
*/
|
|
8
|
-
export declare function tippecanoe(input: URL, output: URL, layer: Layer, logger: LogType): Promise<void>;
|
|
9
|
+
export declare function tippecanoe(input: URL, output: URL, layer: Layer, tileMatrix: TileMatrixSet, logger: LogType): Promise<void>;
|
|
9
10
|
/**
|
|
10
11
|
* tippecanoe tile-join usage, return cmd for tile-join
|
|
11
12
|
*
|