@basemaps/shared 6.39.0 → 6.40.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 +17 -0
- package/build/__tests__/util.test.js +10 -1
- package/build/__tests__/util.test.js.map +1 -1
- package/build/cli/base.d.ts +0 -8
- package/build/cli/base.d.ts.map +1 -1
- package/build/cli/base.js +3 -14
- package/build/cli/base.js.map +1 -1
- package/build/cli/info.d.ts +10 -0
- package/build/cli/info.d.ts.map +1 -0
- package/build/cli/info.js +14 -0
- package/build/cli/info.js.map +1 -0
- package/build/util.d.ts +3 -2
- package/build/util.d.ts.map +1 -1
- package/build/util.js +19 -4
- package/build/util.js.map +1 -1
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,23 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [6.40.0](https://github.com/linz/basemaps/compare/v6.39.0...v6.40.0) (2023-03-16)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **server:** make --no-config actually load the configuration from tiffs ([#2682](https://github.com/linz/basemaps/issues/2682)) ([019ee50](https://github.com/linz/basemaps/commit/019ee50ee22cda2ce143f9a012d4aaa9ffc0edc9))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
* **server:** change CLI interface to support multiple tiff folders ([#2688](https://github.com/linz/basemaps/issues/2688)) ([7fcd310](https://github.com/linz/basemaps/commit/7fcd310425aaf02bbadab2bb3b89cce5b7462c8f))
|
|
17
|
+
* filter layers by date ([#2662](https://github.com/linz/basemaps/issues/2662)) ([745b6b6](https://github.com/linz/basemaps/commit/745b6b6e0ae40c5094647cf602ddf2bdd29a7d5f))
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
6
23
|
# [6.39.0](https://github.com/linz/basemaps/compare/v6.38.0...v6.39.0) (2023-01-25)
|
|
7
24
|
|
|
8
25
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import o from 'ospec';
|
|
2
|
-
import { extractYearRangeFromName, getUrlHost, s3ToVsis3, titleizeImageryName } from '../util.js';
|
|
2
|
+
import { extractYearRangeFromName, extractYearRangeFromTitle, getUrlHost, s3ToVsis3, titleizeImageryName, } from '../util.js';
|
|
3
3
|
o.spec('util', () => {
|
|
4
4
|
o('extractYearRangeFromName', () => {
|
|
5
5
|
o(extractYearRangeFromName('2013')).deepEquals([2013, 2014]);
|
|
@@ -9,6 +9,15 @@ o.spec('util', () => {
|
|
|
9
9
|
o(extractYearRangeFromName('2019_abc2020')).deepEquals([2019, 2021]);
|
|
10
10
|
o(extractYearRangeFromName('2020_abc2019')).deepEquals([2019, 2021]);
|
|
11
11
|
o(extractYearRangeFromName('2020-23abc')).deepEquals([2020, 2024]);
|
|
12
|
+
o(extractYearRangeFromName('wellington_urban_2017_0.10m')).deepEquals([2017, 2018]);
|
|
13
|
+
o(extractYearRangeFromName('gebco_2020_305-75m')).deepEquals([2020, 2021]);
|
|
14
|
+
// FIXME these are currently broken
|
|
15
|
+
// o(extractYearRangeFromName('otago_0_375m_sn3806_1975')).deepEquals([1975, 1976]);
|
|
16
|
+
});
|
|
17
|
+
o.only('extractYearRangeFromTitle', () => {
|
|
18
|
+
o(extractYearRangeFromTitle('Banks Peninsula 0.075m Urban Aerial Photos (2019-2020)')).deepEquals([2019, 2020]);
|
|
19
|
+
o(extractYearRangeFromTitle('Manawatu 0.125m Urban Aerial Photos (2019)')).deepEquals([2019]);
|
|
20
|
+
o(extractYearRangeFromTitle('Manawatu 0.125m Urban Aerial Photos (2019a)')).deepEquals(null);
|
|
12
21
|
});
|
|
13
22
|
o('titleizeImageryName', () => {
|
|
14
23
|
o(titleizeImageryName('palmerston-north_urban_2016-17_12-125m_RGBA')).equals('Palmerston-north urban 2016-17 12.125m RGBA');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.test.js","sourceRoot":"","sources":["../../src/__tests__/util.test.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,
|
|
1
|
+
{"version":3,"file":"util.test.js","sourceRoot":"","sources":["../../src/__tests__/util.test.ts"],"names":[],"mappings":"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"}
|
package/build/cli/base.d.ts
CHANGED
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
import { CommandLineParser } from '@rushstack/ts-command-line';
|
|
2
2
|
import 'source-map-support/register.js';
|
|
3
|
-
/** Useful traceability information */
|
|
4
|
-
export declare const CliInfo: {
|
|
5
|
-
package: string;
|
|
6
|
-
version: string;
|
|
7
|
-
hash: string;
|
|
8
|
-
};
|
|
9
|
-
/** Unique Id for this instance of the cli being run */
|
|
10
|
-
export declare const CliId: string;
|
|
11
3
|
export declare abstract class BaseCommandLine extends CommandLineParser {
|
|
12
4
|
verbose: import("@rushstack/ts-command-line").CommandLineFlagParameter;
|
|
13
5
|
extraVerbose: import("@rushstack/ts-command-line").CommandLineFlagParameter;
|
package/build/cli/base.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/cli/base.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/cli/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,gCAAgC,CAAC;AAKxC,8BAAsB,eAAgB,SAAQ,iBAAiB;IAC7D,OAAO,gEAIJ;IACH,YAAY,gEAIT;IAEH,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;gBAEZ,GAAG,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE;IAMlE,SAAS,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAepC,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAI7B,GAAG,IAAI,IAAI;CAUnB"}
|
package/build/cli/base.js
CHANGED
|
@@ -1,19 +1,8 @@
|
|
|
1
|
-
var _a, _b;
|
|
2
|
-
import { LogConfig } from '../log.js';
|
|
3
|
-
import { LoggerFatalError } from '../logger.fatal.error.js';
|
|
4
|
-
import { GitTag } from './git.tag.js';
|
|
5
1
|
import { CommandLineParser } from '@rushstack/ts-command-line';
|
|
6
2
|
import 'source-map-support/register.js';
|
|
7
|
-
import
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
// Detect unlinked packages looks for this string since its a package name, slightly work around it
|
|
11
|
-
package: '@' + 'basemaps/cli',
|
|
12
|
-
version: (_a = process.env.GIT_VERSION) !== null && _a !== void 0 ? _a : GitTag().version,
|
|
13
|
-
hash: (_b = process.env.GIT_HASH) !== null && _b !== void 0 ? _b : GitTag().hash,
|
|
14
|
-
};
|
|
15
|
-
/** Unique Id for this instance of the cli being run */
|
|
16
|
-
export const CliId = ulid.ulid();
|
|
3
|
+
import { LogConfig } from '../log.js';
|
|
4
|
+
import { LoggerFatalError } from '../logger.fatal.error.js';
|
|
5
|
+
import { CliId, CliInfo } from './info.js';
|
|
17
6
|
export class BaseCommandLine extends CommandLineParser {
|
|
18
7
|
constructor(opt) {
|
|
19
8
|
super(opt);
|
package/build/cli/base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/cli/base.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/cli/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE3C,MAAM,OAAgB,eAAgB,SAAQ,iBAAiB;IAe7D,YAAY,GAAsD;QAChE,KAAK,CAAC,GAAG,CAAC,CAAC;QAfb,YAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC;YACjC,iBAAiB,EAAE,WAAW;YAC9B,kBAAkB,EAAE,IAAI;YACxB,WAAW,EAAE,2BAA2B;SACzC,CAAC,CAAC;QACH,iBAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC;YACtC,iBAAiB,EAAE,MAAM;YACzB,kBAAkB,EAAE,IAAI;YACxB,WAAW,EAAE,iCAAiC;SAC/C,CAAC,CAAC;QAOD,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,YAAY,CAAC;QACjC,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC;IAC7C,CAAC;IAES,SAAS;QACjB,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACtB,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,GAAG,OAAO,CAAC;SACjC;aAAM,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YAClC,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,GAAG,OAAO,CAAC;SACjC;aAAM;YACL,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,GAAG,MAAM,CAAC;SAChC;QAED,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;QACnE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEtB,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;IAC3B,CAAC;IACS,kBAAkB;QAC1B,UAAU;IACZ,CAAC;IAEM,GAAG;QACR,IAAI,CAAC,2BAA2B,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/C,IAAI,GAAG,YAAY,gBAAgB,EAAE;gBACnC,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;aAC7C;iBAAM;gBACL,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAC;aAClE;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import 'source-map-support/register.js';
|
|
2
|
+
/** Useful traceability information */
|
|
3
|
+
export declare const CliInfo: {
|
|
4
|
+
package: string;
|
|
5
|
+
version: string;
|
|
6
|
+
hash: string;
|
|
7
|
+
};
|
|
8
|
+
/** Unique Id for this instance of the cli being run */
|
|
9
|
+
export declare const CliId: string;
|
|
10
|
+
//# sourceMappingURL=info.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../src/cli/info.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AAIxC,uCAAuC;AACvC,eAAO,MAAM,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAKrE,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,KAAK,QAAc,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
var _a, _b;
|
|
2
|
+
import 'source-map-support/register.js';
|
|
3
|
+
import * as ulid from 'ulid';
|
|
4
|
+
import { GitTag } from './git.tag.js';
|
|
5
|
+
/** Useful traceability information */
|
|
6
|
+
export const CliInfo = {
|
|
7
|
+
// Detect unlinked packages looks for this string since its a package name, slightly work around it
|
|
8
|
+
package: '@' + 'basemaps/cli',
|
|
9
|
+
version: (_a = process.env.GIT_VERSION) !== null && _a !== void 0 ? _a : GitTag().version,
|
|
10
|
+
hash: (_b = process.env.GIT_HASH) !== null && _b !== void 0 ? _b : GitTag().hash,
|
|
11
|
+
};
|
|
12
|
+
/** Unique Id for this instance of the cli being run */
|
|
13
|
+
export const CliId = ulid.ulid();
|
|
14
|
+
//# sourceMappingURL=info.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../src/cli/info.ts"],"names":[],"mappings":";AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,uCAAuC;AACvC,MAAM,CAAC,MAAM,OAAO,GAAuD;IACzE,mGAAmG;IACnG,OAAO,EAAE,GAAG,GAAG,cAAc;IAC7B,OAAO,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,WAAW,mCAAI,MAAM,EAAE,CAAC,OAAO;IACpD,IAAI,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,MAAM,EAAE,CAAC,IAAI;CAC5C,CAAC;AAEF,uDAAuD;AACvD,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC"}
|
package/build/util.d.ts
CHANGED
|
@@ -12,9 +12,10 @@ export declare function titleizeImageryName(name: string): string;
|
|
|
12
12
|
* Attempt to parse a year from a imagery name
|
|
13
13
|
* @example wellington_urban_2017_0.10m -> 2017
|
|
14
14
|
* @param name Imagery name to parse
|
|
15
|
-
* @return imagery year,
|
|
15
|
+
* @return imagery year, null for failure to parse
|
|
16
16
|
*/
|
|
17
|
-
export declare function extractYearRangeFromName(name: string): [number, number];
|
|
17
|
+
export declare function extractYearRangeFromName(name: string): null | [number, number];
|
|
18
|
+
export declare function extractYearRangeFromTitle(t: string): [number] | [number, number] | null;
|
|
18
19
|
export declare function s3ToVsis3(name: string): string;
|
|
19
20
|
/** Extract the hostname from a url */
|
|
20
21
|
export declare function getUrlHost(ref: string | undefined): string | undefined;
|
package/build/util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,UAAU,KAAK;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CAEtD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQxD;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,UAAU,KAAK;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CAEtD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQxD;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAe9E;AAED,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAYvF;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,sCAAsC;AACtC,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAWtE"}
|
package/build/util.js
CHANGED
|
@@ -17,7 +17,7 @@ export function titleizeImageryName(name) {
|
|
|
17
17
|
* Attempt to parse a year from a imagery name
|
|
18
18
|
* @example wellington_urban_2017_0.10m -> 2017
|
|
19
19
|
* @param name Imagery name to parse
|
|
20
|
-
* @return imagery year,
|
|
20
|
+
* @return imagery year, null for failure to parse
|
|
21
21
|
*/
|
|
22
22
|
export function extractYearRangeFromName(name) {
|
|
23
23
|
const re = /(?:^|\D)(\d{4})(?:-(\d{2}))?(?:$|\D)/g;
|
|
@@ -27,12 +27,27 @@ export function extractYearRangeFromName(name) {
|
|
|
27
27
|
if (m[2] != null)
|
|
28
28
|
years.push(parseInt(m[1].slice(0, 2) + m[2]));
|
|
29
29
|
}
|
|
30
|
-
if (years.length === 0)
|
|
31
|
-
return
|
|
32
|
-
}
|
|
30
|
+
if (years.length === 0)
|
|
31
|
+
return null;
|
|
33
32
|
years.sort();
|
|
34
33
|
return [years[0], years[years.length - 1] + 1];
|
|
35
34
|
}
|
|
35
|
+
export function extractYearRangeFromTitle(t) {
|
|
36
|
+
const yearChunk = t.slice(t.lastIndexOf(' ') + 1).trim(); // "(2019)" or "(2019-2020)"
|
|
37
|
+
if (yearChunk == null)
|
|
38
|
+
return null;
|
|
39
|
+
if (!yearChunk.endsWith(')') || !yearChunk.startsWith('('))
|
|
40
|
+
return null;
|
|
41
|
+
const chunks = yearChunk
|
|
42
|
+
.slice(1, yearChunk.length - 1)
|
|
43
|
+
.split('-')
|
|
44
|
+
.map(Number);
|
|
45
|
+
if (chunks.length === 1 && !isNaN(chunks[0]))
|
|
46
|
+
return chunks;
|
|
47
|
+
else if (chunks.length === 2 && !isNaN(chunks[0]) && !isNaN(chunks[1]))
|
|
48
|
+
return chunks;
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
36
51
|
export function s3ToVsis3(name) {
|
|
37
52
|
return name.startsWith('s3://') ? '/vsis3/' + name.slice('s3://'.length) : name;
|
|
38
53
|
}
|
package/build/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,WAAW,CAAC,CAAQ,EAAE,CAAQ;IAC5C,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,OAAO,CACL,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;QACrB,IAAI;aACD,KAAK,CAAC,CAAC,CAAC;aACR,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC;aACpC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CACtB,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAAY;IACnD,MAAM,EAAE,GAAG,uCAAuC,CAAC;IAEnD,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACxD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3B,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACjE;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basemaps/shared",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.40.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -23,9 +23,9 @@
|
|
|
23
23
|
"test": "ospec --globs 'build/**/*.test.js'"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@basemaps/config": "^6.
|
|
27
|
-
"@basemaps/geo": "^6.
|
|
28
|
-
"@basemaps/tiler": "^6.
|
|
26
|
+
"@basemaps/config": "^6.40.0",
|
|
27
|
+
"@basemaps/geo": "^6.40.0",
|
|
28
|
+
"@basemaps/tiler": "^6.40.0",
|
|
29
29
|
"@chunkd/fs": "^10.0.2",
|
|
30
30
|
"@chunkd/source-aws-v2": "^9.3.1",
|
|
31
31
|
"@linzjs/geojson": "^6.32.1",
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
"files": [
|
|
48
48
|
"build/"
|
|
49
49
|
],
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "029c1e511531064dbf87b2b5204a50fe840daa79"
|
|
51
51
|
}
|