Skip to content

Ngpwc 9824 site no to hl uri#65

Merged
dylanlee merged 10 commits intomainfrom
NGPWC-9824_site_no_to_hl_uri
Mar 6, 2026
Merged

Ngpwc 9824 site no to hl uri#65
dylanlee merged 10 commits intomainfrom
NGPWC-9824_site_no_to_hl_uri

Conversation

@danielcumpton
Copy link

[Short description explaining the high-level reason for the pull request]

Additions

Changed geopackage API endpoint to use generic names for the ID type field that cover both 2.2 and NHF (as applicable) without referring to specific names in the hydrofabric tables such as hl_uri or site_no.

Removals

Changes

Testing

Screenshots

Notes

Todos

Checklist

  • PR has an informative and human-readable title
  • Changes are limited to a single goal (no scope creep)
  • Code can be automatically merged (no conflicts)
  • Code follows project standards (link if applicable)
  • Passes all existing automated tests
  • Any change in functionality is tested
  • New functions are documented (with a description, list of inputs, and expected output)
  • Placeholder code is flagged / future todos are captured in comments
  • Visually tested in supported browsers and devices (see checklist below 👇)
  • Project documentation has been updated (including the "Unreleased" section of the CHANGELOG)
  • Reviewers requested with the Reviewers tool ➡️

Testing checklist

Target Environment support

  • Windows
  • Linux
  • Browser

Accessibility

  • Keyboard friendly
  • Screen reader friendly

Other

  • Is useable without CSS
  • Is useable without JS
  • Flexible from small to large screens
  • No linting errors or warnings
  • JavaScript tests are passing

@danielcumpton danielcumpton requested a review from dylanlee March 3, 2026 17:09
@danielcumpton danielcumpton self-assigned this Mar 3, 2026
Copy link

@dylanlee dylanlee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job! Just have a few minor comments/requested changes on top of the discussed test modifications that we talked about on Teams

POI_ID = "poi_id" # HF 2.2 only
VPU_ID = "vpu_id"
FP_ID = ("fp_id",)
FP_ID = "fp_id"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FP_ID and SITE_NO don't seem to be referenced anywhere in the codebase. Could we get rid of them here? Also could get rid of VPU_ID if we used QueryIdType VPU_ID inside the CLI.

This would make the IdType enum dedicated to just HF 2.2 related fields which might be less confusing

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed all items for NHF and unused items for 2.2, leaving only HL_URI and ID which are used to subset 2.2.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turns out POI_ID is used in one of the tests, so I left it in.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update docstring to reflect changes

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

replaced old IdType names with the new ones.

else:
nonspatial_layers[table_name] = layer_data
else:
print(f"Warning: {table_name} layer is empty")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The print statements in router.py should be converted to warning or error logs for consistency with the rest of the app/ code

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed print statements to logs

@dylanlee dylanlee merged commit 7511a70 into main Mar 6, 2026
9 checks passed
@dylanlee dylanlee deleted the NGPWC-9824_site_no_to_hl_uri branch March 6, 2026 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants