Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: generate paths for new national hillshade products TDE-1378 #1193

Merged
merged 1 commit into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions src/commands/generate-path/__test__/generate.path.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,57 @@ describe('GeneratePathImagery', () => {
});
});

describe('GeneratePathHillshade', () => {
it('Should match - hillshade 8m igor', () => {
const metadata: PathMetadata = {
targetBucketName: 'nz-elevation',
geospatialCategory: 'dem-hillshade-igor',
region: 'new-zealand',
slug: 'new-zealand-contour',
gsd: 8,
epsg: 2193,
};
assert.equal(
generatePath(metadata),
's3://nz-elevation/new-zealand/new-zealand-contour/dem-hillshade-igor_8m/2193/',
);
});

it('Should match - hillshade 8m default', () => {
const metadata: PathMetadata = {
targetBucketName: 'nz-elevation',
geospatialCategory: 'dem-hillshade',
region: 'new-zealand',
slug: 'new-zealand-contour',
gsd: 8,
epsg: 2193,
};
assert.equal(generatePath(metadata), 's3://nz-elevation/new-zealand/new-zealand-contour/dem-hillshade_8m/2193/');
});
it('Should match - hillshade combined igor', () => {
const metadata: PathMetadata = {
targetBucketName: 'nz-elevation',
geospatialCategory: 'dem-hillshade-igor',
region: 'new-zealand',
slug: 'new-zealand',
gsd: 1,
epsg: 2193,
};
assert.equal(generatePath(metadata), 's3://nz-elevation/new-zealand/new-zealand/dem-hillshade-igor/2193/');
});
it('Should match - hillshade combined default', () => {
const metadata: PathMetadata = {
targetBucketName: 'nz-elevation',
geospatialCategory: 'dem-hillshade',
region: 'new-zealand',
slug: 'new-zealand',
gsd: 1,
epsg: 2193,
};
assert.equal(generatePath(metadata), 's3://nz-elevation/new-zealand/new-zealand/dem-hillshade/2193/');
});
});

describe('GeneratePathGeospatialDataCategories', () => {
it('Should match - dem from slug', () => {
const metadata: PathMetadata = {
Expand Down
12 changes: 11 additions & 1 deletion src/commands/generate-path/path.generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,21 @@ export function generatePath(metadata: PathMetadata): string {

if (
metadata.geospatialCategory === GeospatialDataCategories.Dem ||
metadata.geospatialCategory === GeospatialDataCategories.Dsm
metadata.geospatialCategory === GeospatialDataCategories.Dsm ||
(metadata.gsd === 8 &&
(metadata.geospatialCategory === GeospatialDataCategories.DemHillshade ||
metadata.geospatialCategory === GeospatialDataCategories.DemHillshadeIgor))
) {
return `s3://${metadata.targetBucketName}/${metadata.region}/${metadata.slug}/${metadata.geospatialCategory}_${metadata.gsd}m/${metadata.epsg}/`;
}

if (
metadata.geospatialCategory === GeospatialDataCategories.DemHillshade ||
metadata.geospatialCategory === GeospatialDataCategories.DemHillshadeIgor
) {
return `s3://${metadata.targetBucketName}/${metadata.region}/${metadata.slug}/${metadata.geospatialCategory}/${metadata.epsg}/`;
}

throw new Error(
`Path can't be generated from collection as no matching category for ${metadata.geospatialCategory}.`,
);
Expand Down
4 changes: 3 additions & 1 deletion src/commands/stac-setup/stac.setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ export function slugFromMetadata(metadata: SlugMetadata): string {
}
if (
metadata.geospatialCategory === GeospatialDataCategories.Dem ||
metadata.geospatialCategory === GeospatialDataCategories.Dsm
metadata.geospatialCategory === GeospatialDataCategories.Dsm ||
metadata.geospatialCategory === GeospatialDataCategories.DemHillshade ||
metadata.geospatialCategory === GeospatialDataCategories.DemHillshadeIgor
) {
return slug;
}
Expand Down
2 changes: 2 additions & 0 deletions src/utils/metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export const GeospatialDataCategories = {
UrbanAerialPhotos: 'urban-aerial-photos',
Dem: 'dem',
Dsm: 'dsm',
DemHillshade: 'dem-hillshade',
DemHillshadeIgor: 'dem-hillshade-igor',
} as const;

export type GeospatialDataCategory = (typeof GeospatialDataCategories)[keyof typeof GeospatialDataCategories];