Merge branch 'master' into fix/shared/bounds-antimeridian

linz · Jul 15, 2020 · ef2eb9f · ef2eb9f
2 parents d474278 + 11819bb
commit ef2eb9f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 32 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -19,10 +19,10 @@
   "dependencies": {
     "@basemaps/geo": "^4.1.0",
     "@basemaps/shared": "^4.1.0",
-    "@cogeotiff/core": "^2.1.1",
-    "@cogeotiff/source-aws": "^2.1.1",
-    "@cogeotiff/source-file": "^2.1.1",
-    "@cogeotiff/source-url": "^2.1.1",
+    "@cogeotiff/core": "^2.2.0",
+    "@cogeotiff/source-aws": "^2.2.0",
+    "@cogeotiff/source-file": "^2.2.0",
+    "@cogeotiff/source-url": "^2.2.0",
     "@rushstack/ts-command-line": "^4.3.13",
     "ansi-colors": "^4.1.1",
     "lineclip": "^1.1.5",

diff --git a/packages/cli/src/cog/__test__/builder.test.ts b/packages/cli/src/cog/__test__/builder.test.ts
@@ -38,7 +38,7 @@ o.spec('Builder', () => {
         });
 
         o('bounds', async () => {
-            const localTiff = new CogSourceFile('local/file.tiff');
+            const localTiff = new CogSourceFile('/local/file.tiff');
             const s3Tiff = new CogSourceAwsS3('bucket', 's3://file.tiff');
 
             const imageLocal = {
@@ -82,7 +82,7 @@ o.spec('Builder', () => {
                         y: 6198000,
                         width: 24000,
                         height: 36000,
-                        name: 'local/file.tiff',
+                        name: '/local/file.tiff',
                     },
                     {
                         x: 1516000,

diff --git a/packages/cli/src/cog/builder.ts b/packages/cli/src/cog/builder.ts
@@ -87,9 +87,7 @@ export class CogBuilder {
                     bands = tiffBandCount.length;
                 }
 
-                const name = source instanceof CogSourceFile ? source.fileName : source.name;
-
-                const output = { ...Bounds.fromBbox(image.bbox).toJson(), name };
+                const output = { ...Bounds.fromBbox(image.bbox).toJson(), name: source.uri };
 
                 if (CogSourceFile.isSource(source)) {
                     await source.close();

diff --git a/packages/lambda-xyz/package.json b/packages/lambda-xyz/package.json
@@ -11,8 +11,8 @@
     "@basemaps/shared": "^4.1.0",
     "@basemaps/tiler": "^4.1.0",
     "@basemaps/tiler-sharp": "^4.1.0",
-    "@cogeotiff/core": "^2.1.1",
-    "@cogeotiff/source-aws": "^2.1.1",
+    "@cogeotiff/core": "^2.2.0",
+    "@cogeotiff/source-aws": "^2.2.0",
     "path-to-regexp": "^6.1.0",
     "sharp": "^0.25.2"
   },

diff --git a/packages/tiler/package.json b/packages/tiler/package.json
@@ -12,10 +12,10 @@
   "dependencies": {
     "@basemaps/geo": "^4.1.0",
     "@basemaps/metrics": "^4.0.0",
-    "@cogeotiff/core": "^2.1.1"
+    "@cogeotiff/core": "^2.2.0"
   },
   "devDependencies": {
-    "@cogeotiff/source-file": "^2.1.1",
+    "@cogeotiff/source-file": "^2.2.0",
     "@types/pixelmatch": "^5.0.0",
     "@types/pngjs": "^3.3.2",
     "pixelmatch": "^5.1.0",

diff --git a/yarn.lock b/yarn.lock
@@ -548,34 +548,34 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@cogeotiff/core@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@cogeotiff/core/-/core-2.1.1.tgz#6d1a3a58625b8a33ee5ac360da0146f56a65a0a4"
-  integrity sha512-KjB8ky3s+PFR3pq92NET9vC/uiZ2jQw/MTOmgxz82VpdCcog7oZm3sBnlz7W+a7E7OCdFg8iGt8rjrpCaJTbzg==
+"@cogeotiff/core@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@cogeotiff/core/-/core-2.2.0.tgz#5f28d79732c3aafdb8dc833a43d1314974138998"
+  integrity sha512-vI0I1axsgUnd2tIqDhVk/snfpq5cDaiLxNpjS0ovxroWPz12BepW5WLoLbINj/oIIrjgR8VjyxUY065kWrmZVQ==
   dependencies:
     ieee754 "^1.1.13"
 
-"@cogeotiff/source-aws@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@cogeotiff/source-aws/-/source-aws-2.1.1.tgz#1d5e8632c1cf65eaaf40b9406479764d83f699e7"
-  integrity sha512-fPDwEDMSiKCo9RUyiupadoNg9I/sHk3UvjQvUedIkavSmMhZmUVLpLw7fNtAw5pNyAjsIk3t9GcwuYDSiaFaQg==
+"@cogeotiff/source-aws@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@cogeotiff/source-aws/-/source-aws-2.2.0.tgz#3bd7d6d4173a9a2bc90db507ef1fbb29018e1262"
+  integrity sha512-USVQPzaO7V5TJSJjUj/4MeONN9lmrktyeYGNWyoGFpPIhnuimvxZ4qS6oRoxpGJqEcanr2Rdjdw0nEzBDZmNeg==
   dependencies:
-    "@cogeotiff/core" "^2.1.1"
+    "@cogeotiff/core" "^2.2.0"
     aws-sdk "^2.524.0"
 
-"@cogeotiff/source-file@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@cogeotiff/source-file/-/source-file-2.1.1.tgz#ed6a21b460b214437243809c4be1a3f58a68005d"
-  integrity sha512-KF6FzbP/WWRAt0na18fAqbR89Bt4jDwwYBpO/GIV5/pg0tQBgj+6zVAH88ZUXOLxxh3XJdvuls56yW5n4RFUJA==
+"@cogeotiff/source-file@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@cogeotiff/source-file/-/source-file-2.2.0.tgz#8d909c2f127fb8ab7a5f09a0b944018363b94117"
+  integrity sha512-UGV4jYNKG+TRqKkDHkZHHtsXaq0+eWEmhZ9JaxHdZjnTu87WOnFxDmb03pjXDuJ9selUUBOvcAi7fw6rtJLtFQ==
   dependencies:
-    "@cogeotiff/core" "^2.1.1"
+    "@cogeotiff/core" "^2.2.0"
 
-"@cogeotiff/source-url@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@cogeotiff/source-url/-/source-url-2.1.1.tgz#3878fe7d18dab965ca5ed1c6107cb8213a88aec7"
-  integrity sha512-cS5k9WQMrS9cjSDCgf1wpjSlXTbMprt4HwT9uF4aJFgywagqJ5R/S/h7fQU4o1hMIv+VA6AyOv3U2xF1TVbxLw==
+"@cogeotiff/source-url@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@cogeotiff/source-url/-/source-url-2.2.0.tgz#8e28ca0c92a50b0b868cfeb26a46cf58e511f6ab"
+  integrity sha512-Al2inGPAl5SetJ7gdGNHDa8qmtb4ElElabq4qSyF83Tm1D6PYS7MIm/3RsREHdakW7QIKJi/BrPnY2I21NFjUw==
   dependencies:
-    "@cogeotiff/core" "^2.1.1"
+    "@cogeotiff/core" "^2.2.0"
     node-fetch "^2.6.0"
 
 "@evocateur/libnpmaccess@^3.1.2":