@basemaps/server 6.40.0 → 6.41.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/CHANGELOG.md +11 -0
- package/bin/basemaps-server.cjs +165 -165
- package/build/cli.d.ts +9 -2
- package/build/cli.d.ts.map +1 -1
- package/build/cli.js +16 -1
- package/build/cli.js.map +1 -1
- package/build/config.d.ts +2 -1
- package/build/config.d.ts.map +1 -1
- package/build/config.js +2 -2
- package/build/config.js.map +1 -1
- package/package.json +7 -7
package/build/cli.d.ts
CHANGED
|
@@ -1,17 +1,24 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { Type } from 'cmd-ts';
|
|
3
|
+
/**
|
|
4
|
+
* Parse a input parameter as a URL,
|
|
5
|
+
* if it looks like a file path convert it using `pathToFileURL`
|
|
6
|
+
**/
|
|
7
|
+
export declare const Url: Type<string, URL>;
|
|
1
8
|
export declare const BasemapsServerCommand: Partial<import("cmd-ts/dist/cjs/argparser.js").Register> & {
|
|
2
9
|
parse(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
|
|
3
10
|
config: string | undefined;
|
|
4
11
|
port: number | undefined;
|
|
5
12
|
verbose: boolean;
|
|
6
13
|
assets: string | undefined;
|
|
7
|
-
paths:
|
|
14
|
+
paths: URL[];
|
|
8
15
|
}>>;
|
|
9
16
|
} & import("cmd-ts/dist/cjs/helpdoc.js").PrintHelp & import("cmd-ts/dist/cjs/helpdoc.js").ProvidesHelp & import("cmd-ts/dist/cjs/helpdoc.js").Named & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned> & import("cmd-ts/dist/cjs/argparser.js").Register & import("cmd-ts/dist/cjs/runner.js").Handling<{
|
|
10
17
|
config: string | undefined;
|
|
11
18
|
port: number | undefined;
|
|
12
19
|
verbose: boolean;
|
|
13
20
|
assets: string | undefined;
|
|
14
|
-
paths:
|
|
21
|
+
paths: URL[];
|
|
15
22
|
}, Promise<void>> & {
|
|
16
23
|
run(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<Promise<void>>>;
|
|
17
24
|
} & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned & import("cmd-ts/dist/cjs/helpdoc.js").Descriptive & import("cmd-ts/dist/cjs/helpdoc.js").Aliased>;
|
package/build/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,IAAI,EAAoE,MAAM,QAAQ,CAAC;AAOhG;;;IAGI;AACJ,eAAO,MAAM,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAQjC,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;6JAyChC,CAAC"}
|
package/build/cli.js
CHANGED
|
@@ -1,9 +1,24 @@
|
|
|
1
1
|
import { Env, LogConfig } from '@basemaps/shared';
|
|
2
2
|
import { CliInfo } from '@basemaps/shared/build/cli/info.js';
|
|
3
3
|
import { command, flag, number, option, optional, restPositionals, string } from 'cmd-ts';
|
|
4
|
+
import { pathToFileURL } from 'node:url';
|
|
4
5
|
import { createServer } from './server.js';
|
|
5
6
|
CliInfo.package = 'basemaps/server';
|
|
6
7
|
const DefaultPort = 5000;
|
|
8
|
+
/**
|
|
9
|
+
* Parse a input parameter as a URL,
|
|
10
|
+
* if it looks like a file path convert it using `pathToFileURL`
|
|
11
|
+
**/
|
|
12
|
+
export const Url = {
|
|
13
|
+
async from(str) {
|
|
14
|
+
try {
|
|
15
|
+
return new URL(str);
|
|
16
|
+
}
|
|
17
|
+
catch (e) {
|
|
18
|
+
return pathToFileURL(str);
|
|
19
|
+
}
|
|
20
|
+
},
|
|
21
|
+
};
|
|
7
22
|
export const BasemapsServerCommand = command({
|
|
8
23
|
name: 'basemaps-server',
|
|
9
24
|
version: CliInfo.version,
|
|
@@ -23,7 +38,7 @@ export const BasemapsServerCommand = command({
|
|
|
23
38
|
long: 'assets',
|
|
24
39
|
description: 'Where the assets (sprites, fonts) are located',
|
|
25
40
|
}),
|
|
26
|
-
paths: restPositionals({ type:
|
|
41
|
+
paths: restPositionals({ type: Url, displayName: 'path', description: 'Path to imagery' }),
|
|
27
42
|
},
|
|
28
43
|
handler: async (args) => {
|
|
29
44
|
var _a;
|
package/build/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/build/config.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import { BasemapsConfigProvider } from '@basemaps/config';
|
|
2
3
|
import { LogType } from '@basemaps/shared';
|
|
3
4
|
export type ServerOptions = ServerOptionsTiffs | ServerOptionsConfig;
|
|
4
5
|
/** Load configuration from folders */
|
|
5
6
|
export interface ServerOptionsTiffs {
|
|
6
7
|
assets?: string;
|
|
7
|
-
paths:
|
|
8
|
+
paths: URL[];
|
|
8
9
|
}
|
|
9
10
|
/** Load configuration from a config file/dynamodb */
|
|
10
11
|
export interface ServerOptionsConfig {
|
package/build/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAMvB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAyB,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElE,MAAM,MAAM,aAAa,GAAG,kBAAkB,GAAG,mBAAmB,CAAC;AAErE,sCAAsC;AACtC,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,sBAAsB,EAMvB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAyB,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElE,MAAM,MAAM,aAAa,GAAG,kBAAkB,GAAG,mBAAmB,CAAC;AAErE,sCAAsC;AACtC,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,GAAG,EAAE,CAAC;CACd;AAED,qDAAqD;AACrD,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CA6CtG"}
|
package/build/config.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ConfigJson, ConfigPrefix, ConfigProviderDynamo, ConfigProviderMemory, } from '@basemaps/config';
|
|
2
|
-
import {
|
|
2
|
+
import { initConfigFromUrls } from '@basemaps/config/build/json/tiff.config.js';
|
|
3
3
|
import { fsa, getDefaultConfig } from '@basemaps/shared';
|
|
4
4
|
/**
|
|
5
5
|
* Attempt to load a configuration file from a number of sources
|
|
@@ -12,7 +12,7 @@ export async function loadConfig(opts, logger) {
|
|
|
12
12
|
// Load the config directly from the source tiff files
|
|
13
13
|
if ('paths' in opts) {
|
|
14
14
|
const mem = new ConfigProviderMemory();
|
|
15
|
-
const ret = await
|
|
15
|
+
const ret = await initConfigFromUrls(mem, opts.paths);
|
|
16
16
|
logger.info({ tileSet: ret.tileSet.name, layers: ret.tileSet.layers.length }, 'TileSet:Loaded');
|
|
17
17
|
for (const im of ret.imagery) {
|
|
18
18
|
logger.info({ imagery: im.uri, title: im.title, tileMatrix: im.tileMatrix, files: im.files.length }, 'Imagery:Loaded');
|
package/build/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EACV,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EACV,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,GAAG,EAAE,gBAAgB,EAAW,MAAM,kBAAkB,CAAC;AAgBlE;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAmB,EAAE,MAAe;IACnE,sDAAsD;IACtD,IAAI,OAAO,IAAI,IAAI,EAAE;QACnB,MAAM,GAAG,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACtD,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,CAAC;QAChG,KAAK,MAAM,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE;YAC5B,MAAM,CAAC,IAAI,CACT,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EACvF,gBAAgB,CACjB,CAAC;SACH;QACD,OAAO,GAAG,CAAC;KACZ;IACD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;IAC/B,kCAAkC;IAClC,IAAI,UAAU,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACxC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAC5E,OAAO,IAAI,oBAAoB,CAAC,KAAK,CAAC,CAAC;KACxC;IAED,wEAAwE;IACxE,IAAI,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE;QACpD,MAAM,EAAE,GAAG,MAAM,gBAAgB,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,EAAE,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,UAAU,EAAE,CAAC,CAAC;QAC9E,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAgB,EAAE,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,GAAG,GAAG,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACtD,GAAG,CAAC,qBAAqB,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAC;KACZ;IAED,mDAAmD;IACnD,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QACnE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAC5E,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAgB,UAAU,CAAC,CAAC;QACjE,MAAM,GAAG,GAAG,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACtD,GAAG,CAAC,qBAAqB,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,iBAAiB,CAAC,CAAC;IAC1E,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAC5B,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basemaps/server",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.41.0",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/linz/basemaps.git",
|
|
@@ -44,22 +44,22 @@
|
|
|
44
44
|
"bin/"
|
|
45
45
|
],
|
|
46
46
|
"optionalDependencies": {
|
|
47
|
-
"@basemaps/landing": "^6.
|
|
47
|
+
"@basemaps/landing": "^6.41.0"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"sharp": "^0.30.7"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
-
"@basemaps/config": "^6.
|
|
54
|
-
"@basemaps/geo": "^6.
|
|
55
|
-
"@basemaps/lambda-tiler": "^6.
|
|
53
|
+
"@basemaps/config": "^6.41.0",
|
|
54
|
+
"@basemaps/geo": "^6.41.0",
|
|
55
|
+
"@basemaps/lambda-tiler": "^6.41.0",
|
|
56
56
|
"@basemaps/landing": "^6.39.0",
|
|
57
|
-
"@basemaps/shared": "^6.
|
|
57
|
+
"@basemaps/shared": "^6.41.0",
|
|
58
58
|
"@fastify/formbody": "^7.0.1",
|
|
59
59
|
"@fastify/static": "^6.5.0",
|
|
60
60
|
"cmd-ts": "^0.12.1",
|
|
61
61
|
"fastify": "^4.9.2",
|
|
62
62
|
"pretty-json-log": "^1.0.0"
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "a466cbcc9859b1585e6ca32894615b3eb6ad04b0"
|
|
65
65
|
}
|