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

Update ehighways resolution shape generation #370

Merged
merged 32 commits into from
May 14, 2024

Conversation

brynpickering
Copy link
Member

@brynpickering brynpickering commented May 3, 2024

Supercedes #336
Fixes #318

This is in response to a question you had @timtroendle around defining the shape source in shapes in the config. I went to clean up the unresolved comments from #336 and realised that it is a lot cleaner to take that approach. This PR leads to a less flexible solution - E-Highways is baked in more than in #336 - but it is cleaner.

As with #336, it only works with NUTS2013, but I will open an issue about that and have a fix ready to go that I'll add via another PR.

Checklist

Any checks which are not relevant to the PR can be pre-checked by the PR creator. All others should be checked by the reviewer. You can add extra checklist items here if required by the PR.

  • CHANGELOG updated
  • Minimal workflow tests pass
  • Tests added to cover contribution
  • Documentation updated
  • Configuration schema updated

jonathan-peel and others added 29 commits April 9, 2024 17:23
Now need to implement the actual function properly.
Debug configuration set up also.
…nathan-peel/euro-calliope into feature-ehighways-resolution-unts-318
References to nuts-year "variable" still exist.
Copy link
Member

@timtroendle timtroendle left a comment

Choose a reason for hiding this comment

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

I am liking this a lot. Just a few minor comments.

config/schema.yaml Outdated Show resolved Hide resolved
envs/default.yaml Show resolved Hide resolved
rules/shapes.smk Outdated Show resolved Hide resolved
rules/shapes.smk Outdated Show resolved Hide resolved
scripts/shapes/ehighways.py Outdated Show resolved Hide resolved
scripts/shapes/ehighways.py Outdated Show resolved Hide resolved
scripts/shapes/units.py Outdated Show resolved Hide resolved
scripts/shapes/units.py Show resolved Hide resolved
scripts/shapes/units.py Outdated Show resolved Hide resolved
scripts/shapes/units.py Outdated Show resolved Hide resolved
Copy link
Member

@timtroendle timtroendle left a comment

Choose a reason for hiding this comment

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

CHANGELOG and documentation updates are missing.

@brynpickering
Copy link
Member Author

@timtroendle I've addressed your issues but...

On running the minimal workflow with updated zenodo pointer (to new potentials data that includes ehighways), a previous issue rears its head (#99). This would be solved by merging in #239.

@timtroendle
Copy link
Member

Will have a look at #239 soon.

@brynpickering
Copy link
Member Author

Minimal workflow now runs successfully, including all_tests (which covers the ehighways resolution as well as the regional one).

nuts-year:
description: Version of the Nomenclature of Territorial Units for Statistics to use in creating spatial units (see https://ec.europa.eu/eurostat/web/nuts/history for more info).
type: number
enum: [2013] # FIXME: enable other years
Copy link
Member

Choose a reason for hiding this comment

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

Doesn't sound like a fixme to me.

@timtroendle timtroendle merged commit 99eb4cb into develop May 14, 2024
4 checks passed
@timtroendle timtroendle deleted the update-feature-ehighways-resolution branch May 14, 2024 07:52
jnnr pushed a commit to jnnr/euro-calliope that referenced this pull request Aug 27, 2024
…feature-ehighways-resolution

Update ehighways resolution shape generation
jnnr pushed a commit to jnnr/euro-calliope that referenced this pull request Aug 27, 2024
…feature-ehighways-resolution

Update ehighways resolution shape generation
jnnr pushed a commit to jnnr/euro-calliope that referenced this pull request Sep 3, 2024
…feature-ehighways-resolution

Update ehighways resolution shape generation
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.

Build ehighways resolution units
3 participants