Merge branch 'master' into fix/wmts/add-style

linz · Jul 9, 2020 · 0c12c2d · 0c12c2d
2 parents 77d6b68 + 21cdb05
commit 0c12c2d
Show file tree

Hide file tree

Showing 43 changed files with 518 additions and 265 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,49 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/linz/basemaps/compare/v3.6.0...v4.0.0) (2020-07-09)
+
+
+### Bug Fixes
+
+* **cli:** improve image quality when fully zoomed in ([#884](https://github.com/linz/basemaps/issues/884)) ([7880d92](https://github.com/linz/basemaps/commit/7880d92b3eb8897f592dd87609e0f557b94ef6bb))
+* **landing:** Fix typos in side menu ([#883](https://github.com/linz/basemaps/issues/883)) ([b380757](https://github.com/linz/basemaps/commit/b380757fb306d9cfd987a7f3255ebd37fbe23d39))
+
+
+### Features
+
+* improve access to the GDAL cli ([#882](https://github.com/linz/basemaps/issues/882)) ([5eaef38](https://github.com/linz/basemaps/commit/5eaef38ae19ca2b80843112502bdf15df57acab6))
+
+
+### BREAKING CHANGES
+
+* this changes how to get access to a new gdal instance to Gdal.create()
+
+Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
+
+
+
+
+
+# [3.6.0](https://github.com/linz/basemaps/compare/v3.5.0...v3.6.0) (2020-07-08)
+
+
+### Bug Fixes
+
+* **cli:** make clipMultipolygon always remove degenerate edges ([#863](https://github.com/linz/basemaps/issues/863)) ([c3c4cdf](https://github.com/linz/basemaps/commit/c3c4cdf8a8bb87e79569b08272ddb0fb2bfe8f01))
+* **lambda:** Set Cors header on GET requests ([#865](https://github.com/linz/basemaps/issues/865)) ([c3e3c4c](https://github.com/linz/basemaps/commit/c3e3c4c331458a2d3ea5570a84e2ae961c19fd7f))
+* **wmts:** add identifier ([#877](https://github.com/linz/basemaps/issues/877)) ([d2d9f56](https://github.com/linz/basemaps/commit/d2d9f56eb348e1131fa951a59e799cc333fb8a31))
+
+
+### Features
+
+* **landing:** Add content to contact us mailto: link ([#879](https://github.com/linz/basemaps/issues/879)) ([579ac92](https://github.com/linz/basemaps/commit/579ac92e2f39c70a8d67c2d01613f91e7b194774))
+* **landing:** limit nztm to its extent ([#878](https://github.com/linz/basemaps/issues/878)) ([7470679](https://github.com/linz/basemaps/commit/747067955b0d52343498c81c2c20b29516046a75))
+
+
+
+
+
 # [3.5.0](https://github.com/linz/basemaps/compare/v3.4.2...v3.5.0) (2020-07-05)
 
 

diff --git a/audit-resolve.json b/audit-resolve.json
@@ -2,113 +2,91 @@
   "decisions": {
     "1523|@typescript-eslint/eslint-plugin>@typescript-eslint/experimental-utils>@typescript-eslint/typescript-estree>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230431,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|@typescript-eslint/parser>@typescript-eslint/experimental-utils>@typescript-eslint/typescript-estree>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|@typescript-eslint/parser>@typescript-eslint/typescript-estree>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|eslint>inquirer>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|eslint>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|eslint>table>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/clean>@lerna/prompt>inquirer>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/import>@lerna/prompt>inquirer>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/publish>@lerna/npm-dist-tag>@lerna/otplease>@lerna/prompt>inquirer>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/publish>@lerna/npm-publish>@lerna/otplease>@lerna/prompt>inquirer>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/publish>@lerna/otplease>@lerna/prompt>inquirer>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/publish>@lerna/prompt>inquirer>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/publish>@lerna/version>@lerna/prompt>inquirer>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/version>@lerna/prompt>inquirer>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/publish>@lerna/version>@lerna/conventional-commits>conventional-changelog-core>conventional-changelog-writer>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/version>@lerna/conventional-commits>conventional-changelog-core>conventional-changelog-writer>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/publish>@lerna/version>@lerna/conventional-commits>conventional-changelog-core>conventional-commits-parser>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/version>@lerna/conventional-commits>conventional-changelog-core>conventional-commits-parser>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/publish>@lerna/version>@lerna/conventional-commits>conventional-recommended-bump>conventional-commits-parser>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/version>@lerna/conventional-commits>conventional-recommended-bump>conventional-commits-parser>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/publish>@lerna/version>@lerna/conventional-commits>conventional-changelog-core>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     },
     "1523|lerna>@lerna/version>@lerna/conventional-commits>conventional-changelog-core>lodash": {
       "decision": "ignore",
-      "madeAt": 1593732230432,
-      "expiresAt": 1594337019864
+      "madeAt": 1594337410231
     }
   },
   "rules": {},

diff --git a/lerna.json b/lerna.json
@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "3.5.0"
+  "version": "4.0.0"
 }
diff --git a/packages/__tests__/CHANGELOG.md b/packages/__tests__/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/linz/basemaps/compare/v3.6.0...v4.0.0) (2020-07-09)
+
+**Note:** Version bump only for package @basemaps/test
+
+
+
+
+
 # [3.1.0](https://github.com/linz/basemaps/compare/v3.0.0...v3.1.0) (2020-06-25)
 
 **Note:** Version bump only for package @basemaps/test

diff --git a/packages/__tests__/package.json b/packages/__tests__/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/test",
-  "version": "3.1.0",
+  "version": "4.0.0",
   "private": true,
   "main": "./build/index.js",
   "types": "./build/index.d.ts",

diff --git a/packages/_infra/CHANGELOG.md b/packages/_infra/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/linz/basemaps/compare/v3.6.0...v4.0.0) (2020-07-09)
+
+**Note:** Version bump only for package @basemaps/infra
+
+
+
+
+
+# [3.6.0](https://github.com/linz/basemaps/compare/v3.5.0...v3.6.0) (2020-07-08)
+
+**Note:** Version bump only for package @basemaps/infra
+
+
+
+
+
 # [3.5.0](https://github.com/linz/basemaps/compare/v3.4.2...v3.5.0) (2020-07-05)
 
 **Note:** Version bump only for package @basemaps/infra

diff --git a/packages/_infra/package.json b/packages/_infra/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/infra",
-  "version": "3.5.0",
+  "version": "4.0.0",
   "private": true,
   "repository": "git@github.com:linz/basemaps.git",
   "author": "",
@@ -21,9 +21,9 @@
     "@aws-cdk/aws-elasticloadbalancingv2-targets": "1.46.0",
     "@aws-cdk/aws-s3": "1.46.0",
     "@aws-cdk/core": "1.46.0",
-    "@basemaps/lambda-api-tracker": "^3.5.0",
-    "@basemaps/lambda-xyz": "^3.5.0",
-    "@basemaps/shared": "^3.5.0",
+    "@basemaps/lambda-api-tracker": "^4.0.0",
+    "@basemaps/lambda-xyz": "^4.0.0",
+    "@basemaps/shared": "^4.0.0",
     "aws-cdk": "^1.46.0"
   }
 }
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/linz/basemaps/compare/v3.6.0...v4.0.0) (2020-07-09)
+
+
+### Bug Fixes
+
+* **cli:** improve image quality when fully zoomed in ([#884](https://github.com/linz/basemaps/issues/884)) ([7880d92](https://github.com/linz/basemaps/commit/7880d92b3eb8897f592dd87609e0f557b94ef6bb))
+
+
+### Features
+
+* improve access to the GDAL cli ([#882](https://github.com/linz/basemaps/issues/882)) ([5eaef38](https://github.com/linz/basemaps/commit/5eaef38ae19ca2b80843112502bdf15df57acab6))
+
+
+### BREAKING CHANGES
+
+* this changes how to get access to a new gdal instance to Gdal.create()
+
+Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
+
+
+
+
+
+# [3.6.0](https://github.com/linz/basemaps/compare/v3.5.0...v3.6.0) (2020-07-08)
+
+
+### Bug Fixes
+
+* **cli:** make clipMultipolygon always remove degenerate edges ([#863](https://github.com/linz/basemaps/issues/863)) ([c3c4cdf](https://github.com/linz/basemaps/commit/c3c4cdf8a8bb87e79569b08272ddb0fb2bfe8f01))
+
+
+
+
+
 # [3.5.0](https://github.com/linz/basemaps/compare/v3.4.2...v3.5.0) (2020-07-05)
 
 

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/cli",
-  "version": "3.5.0",
+  "version": "4.0.0",
   "private": false,
   "repository": "git@github.com:linz/basemaps.git",
   "author": "",
@@ -17,8 +17,8 @@
     "test": "ospec --globs 'build/**/*.test.js' --preload ../../scripts/test.before.js"
   },
   "dependencies": {
-    "@basemaps/geo": "^3.5.0",
-    "@basemaps/shared": "^3.5.0",
+    "@basemaps/geo": "^4.0.0",
+    "@basemaps/shared": "^4.0.0",
     "@cogeotiff/core": "^2.1.1",
     "@cogeotiff/source-aws": "^2.1.1",
     "@cogeotiff/source-file": "^2.1.1",

diff --git a/packages/cli/src/cli/cogify/action.cog.ts b/packages/cli/src/cli/cogify/action.cog.ts
@@ -11,7 +11,7 @@ import { buildCogForName } from '../../cog/cog';
 import { CogVrt } from '../../cog/cog.vrt';
 import { Cutline } from '../../cog/cutline';
 import { CogJob } from '../../cog/types';
-import { GdalCogBuilder } from '../../gdal/gdal';
+import { Gdal } from '../../gdal/gdal';
 import { CliId, CliInfo } from '../base.cli';
 import { getJobPath, makeTempFolder } from '../folder';
 import { SemVer } from './semver.util';
@@ -80,7 +80,7 @@ export class ActionCogCreate extends CommandLineAction {
         const logger = LogConfig.get().child({ correlationId: job.id, imageryName: job.name });
         LogConfig.set(logger);
 
-        const gdalVersion = await GdalCogBuilder.getVersion(logger);
+        const gdalVersion = await Gdal.version(logger);
         logger.info({ version: gdalVersion }, 'GdalVersion');
 
         const name = this.getName(job);

diff --git a/packages/cli/src/cog/__test__/cog.test.ts b/packages/cli/src/cog/__test__/cog.test.ts
@@ -1,7 +1,7 @@
 import { Epsg } from '@basemaps/geo';
 import { LogConfig } from '@basemaps/shared';
 import o from 'ospec';
-import { GdalCogBuilder } from '../../gdal/gdal';
+import { GdalCogBuilder } from '../../gdal/gdal.cog';
 import { buildCogForName } from '../cog';
 import { SourceTiffTestHelper } from './source.tiff.testhelper';
 import { TilingScheme } from '../../gdal/gdal.config';