From 19de35cc260b0c4c4442e109e9ff063617404066 Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Fri, 1 Sep 2023 09:35:13 +1200 Subject: [PATCH 1/3] fix: missing licensors --- stac/nelson/nelson_2014_0.4m/rgb/2193/collection.json | 3 +-- stac/taranaki/taranaki_2011-2012_0.4m/rgb/2193/collection.json | 3 +-- .../west-coast_2009-2011_0.4m/rgb/2193/collection.json | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/stac/nelson/nelson_2014_0.4m/rgb/2193/collection.json b/stac/nelson/nelson_2014_0.4m/rgb/2193/collection.json index 8ce0cb2f82..3af4ae9d66 100644 --- a/stac/nelson/nelson_2014_0.4m/rgb/2193/collection.json +++ b/stac/nelson/nelson_2014_0.4m/rgb/2193/collection.json @@ -94,8 +94,7 @@ { "rel": "item", "href": "./BQ27_5000_0401.json", "type": "application/json" } ], "providers": [ - { "name": "{{workflow.parameters.licensor}}", "roles": ["licensor"] }, - { "name": "NZ Aerial Mapping", "roles": ["producer"] }, + { "name": "NZ Aerial Mapping", "roles": ["licensor", "producer"] }, { "name": "Toitū Te Whenua Land Information New Zealand", "roles": ["host", "processor"] } ], "extent": { diff --git a/stac/taranaki/taranaki_2011-2012_0.4m/rgb/2193/collection.json b/stac/taranaki/taranaki_2011-2012_0.4m/rgb/2193/collection.json index 237b1a1812..e52c3f555d 100644 --- a/stac/taranaki/taranaki_2011-2012_0.4m/rgb/2193/collection.json +++ b/stac/taranaki/taranaki_2011-2012_0.4m/rgb/2193/collection.json @@ -895,8 +895,7 @@ { "rel": "item", "href": "./BL31_5000_0107.json", "type": "application/json" } ], "providers": [ - { "name": "{{workflow.parameters.licensor}}", "roles": ["licensor"] }, - { "name": "NZ Aerial Mapping", "roles": ["producer"] }, + { "name": "NZ Aerial Mapping", "roles": ["licensor", "producer"] }, { "name": "Toitū Te Whenua Land Information New Zealand", "roles": ["host", "processor"] } ], "extent": { diff --git a/stac/west-coast/west-coast_2009-2011_0.4m/rgb/2193/collection.json b/stac/west-coast/west-coast_2009-2011_0.4m/rgb/2193/collection.json index f7044fbc0e..5e17b9a1ac 100644 --- a/stac/west-coast/west-coast_2009-2011_0.4m/rgb/2193/collection.json +++ b/stac/west-coast/west-coast_2009-2011_0.4m/rgb/2193/collection.json @@ -1637,8 +1637,7 @@ { "rel": "item", "href": "./BZ11_5000_0209.json", "type": "application/json" } ], "providers": [ - { "name": "{{workflow.parameters.licensor}}", "roles": ["licensor"] }, - { "name": "NZ Aerial Mapping", "roles": ["producer"] }, + { "name": "NZ Aerial Mapping", "roles": ["licensor", "producer"] }, { "name": "Toitū Te Whenua Land Information New Zealand", "roles": ["host", "processor"] } ], "extent": { From d4ae7ef7a98c45fdbaae4dd566683d72765aa96b Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Fri, 1 Sep 2023 09:43:55 +1200 Subject: [PATCH 2/3] fix: consistent naming for NZ Aerial Mapping --- .../manawatu-whanganui_2010-2011_0.4m/rgb/2193/collection.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stac/manawatu-whanganui/manawatu-whanganui_2010-2011_0.4m/rgb/2193/collection.json b/stac/manawatu-whanganui/manawatu-whanganui_2010-2011_0.4m/rgb/2193/collection.json index 41ef087ece..64c46d1c4f 100644 --- a/stac/manawatu-whanganui/manawatu-whanganui_2010-2011_0.4m/rgb/2193/collection.json +++ b/stac/manawatu-whanganui/manawatu-whanganui_2010-2011_0.4m/rgb/2193/collection.json @@ -2939,9 +2939,8 @@ { "rel": "item", "href": "./BN38_5000_0204.json", "type": "application/json" } ], "providers": [ - { "name": "NZ Aerial Mapping Limited", "roles": ["licensor"] }, { "name": "Manawatu-Wanganui LASS Limited", "roles": ["licensor"] }, - { "name": "NZ Aerial Mapping", "roles": ["producer"] }, + { "name": "NZ Aerial Mapping", "roles": ["licensor", "producer"] }, { "name": "Toitū Te Whenua Land Information New Zealand", "roles": ["host", "processor"] } ], "extent": { From fb1fbb9bb01247776905c9cbe775b7fd99be74ee Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Fri, 1 Sep 2023 09:53:12 +1200 Subject: [PATCH 3/3] fix: AAM NZ consistency --- stac/auckland/auckland_2017_0.075m/rgb/2193/collection.json | 3 +-- .../southland/invercargill_2016_0.05m/rgb/2193/collection.json | 3 +-- stac/taranaki/new-plymouth_2017_0.10m/rgb/2193/collection.json | 3 +-- stac/tasman/tasman_2016-2017_0.3m/rgb/2193/collection.json | 3 +-- stac/wellington/porirua_2016_0.075m/rgb/2193/collection.json | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/stac/auckland/auckland_2017_0.075m/rgb/2193/collection.json b/stac/auckland/auckland_2017_0.075m/rgb/2193/collection.json index c7ee8d82b0..4980599b1e 100644 --- a/stac/auckland/auckland_2017_0.075m/rgb/2193/collection.json +++ b/stac/auckland/auckland_2017_0.075m/rgb/2193/collection.json @@ -7816,8 +7816,7 @@ ], "providers": [ { "name": "Auckland Council", "roles": ["licensor"] }, - { "name": "AAM NZ Limited", "roles": ["licensor"] }, - { "name": "AAM NZ", "roles": ["producer"] }, + { "name": "AAM NZ", "roles": ["licensor", "producer"] }, { "name": "Toitū Te Whenua Land Information New Zealand", "roles": ["host", "processor"] } ], "extent": { diff --git a/stac/southland/invercargill_2016_0.05m/rgb/2193/collection.json b/stac/southland/invercargill_2016_0.05m/rgb/2193/collection.json index 04308794d5..822fb47b84 100644 --- a/stac/southland/invercargill_2016_0.05m/rgb/2193/collection.json +++ b/stac/southland/invercargill_2016_0.05m/rgb/2193/collection.json @@ -526,8 +526,7 @@ ], "providers": [ { "name": "Invercargill City Council", "roles": ["licensor"] }, - { "name": "AAM NZ Limited", "roles": ["licensor"] }, - { "name": "AAM NZ", "roles": ["producer"] }, + { "name": "AAM NZ", "roles": ["licensor", "producer"] }, { "name": "Toitū Te Whenua Land Information New Zealand", "roles": ["host", "processor"] } ], "extent": { diff --git a/stac/taranaki/new-plymouth_2017_0.10m/rgb/2193/collection.json b/stac/taranaki/new-plymouth_2017_0.10m/rgb/2193/collection.json index fec1b5d0b1..b24b13cab7 100644 --- a/stac/taranaki/new-plymouth_2017_0.10m/rgb/2193/collection.json +++ b/stac/taranaki/new-plymouth_2017_0.10m/rgb/2193/collection.json @@ -2113,8 +2113,7 @@ ], "providers": [ { "name": "New Plymouth City Council", "roles": ["licensor"] }, - { "name": "AAM NZ Limited", "roles": ["licensor"] }, - { "name": "AAM NZ", "roles": ["producer"] }, + { "name": "AAM NZ", "roles": ["licensor", "producer"] }, { "name": "Toitū Te Whenua Land Information New Zealand", "roles": ["host", "processor"] } ], "extent": { diff --git a/stac/tasman/tasman_2016-2017_0.3m/rgb/2193/collection.json b/stac/tasman/tasman_2016-2017_0.3m/rgb/2193/collection.json index f22ae983ee..f4e9aab556 100644 --- a/stac/tasman/tasman_2016-2017_0.3m/rgb/2193/collection.json +++ b/stac/tasman/tasman_2016-2017_0.3m/rgb/2193/collection.json @@ -353,8 +353,7 @@ ], "providers": [ { "name": "Tasman District Council", "roles": ["licensor"] }, - { "name": "AAM NZ Limited", "roles": ["licensor"] }, - { "name": "AAM NZ", "roles": ["producer"] }, + { "name": "AAM NZ", "roles": ["licensor", "producer"] }, { "name": "Toitū Te Whenua Land Information New Zealand", "roles": ["host", "processor"] } ], "extent": { diff --git a/stac/wellington/porirua_2016_0.075m/rgb/2193/collection.json b/stac/wellington/porirua_2016_0.075m/rgb/2193/collection.json index 3987a58308..0f5529e49c 100644 --- a/stac/wellington/porirua_2016_0.075m/rgb/2193/collection.json +++ b/stac/wellington/porirua_2016_0.075m/rgb/2193/collection.json @@ -264,8 +264,7 @@ ], "providers": [ { "name": "Porirua City Council", "roles": ["licensor"] }, - { "name": "AAM NZ Limited", "roles": ["licensor"] }, - { "name": "AAM NZ", "roles": ["producer"] }, + { "name": "AAM NZ", "roles": ["licensor", "producer"] }, { "name": "Toitū Te Whenua Land Information New Zealand", "roles": ["host", "processor"] } ], "extent": {