Skip to content

Update to OSM-prebuilt v0.6#1431

Merged
fneum merged 38 commits intomasterfrom
osm-prebuilt-0.6
Dec 2, 2024
Merged

Update to OSM-prebuilt v0.6#1431
fneum merged 38 commits intomasterfrom
osm-prebuilt-0.6

Conversation

@bobbyxng
Copy link
Copy Markdown
Collaborator

@bobbyxng bobbyxng commented Nov 19, 2024 •
edited
Loading

Closes # (if applicable).

Changes proposed in this Pull Request

Checklist

  • I tested my contribution locally and it works as intended.
  • Code and workflow changes are sufficiently documented.
  • Changed dependencies are added to envs/environment.yaml.
  • Changes in configuration options are added in config/config.default.yaml.
  • Changes in configuration options are documented in doc/configtables/*.csv.
  • Sources of newly added data are documented in doc/data_sources.rst.
  • A release note doc/release_notes.rst is added.

bobbyxng and others added 30 commits October 14, 2024 19:56
@bobbyxng
Implemented line merge over virtual bus functionality.
a1d076c
@bobbyxng
Implemented: Aggregating identical lines, bus merging to stations, cr…
0287872 
…eating voltage-specific bus endings in stations.
@bobbyxng
Implemented: Mapping of lines to buses and extending lines to buses.
ce15373
@bobbyxng
Finished implementing converters and links.
77f77c8
@bobbyxng
Finished implementation of entirely new build_osm_network.py script.
24145f7
@bobbyxng
Merge branch 'master' into osm-interconnectors
9aca61a
@bobbyxng
Updated configtables.
fc5b36c
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
43cf668 
for more information, see https://pre-commit.ci
@bobbyxng
Temporarily disabled tqdm in retrieve. Line splitting disabled as well.
caf8eb9
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
6b00178 
for more information, see https://pre-commit.ci
@bobbyxng
Implemented relations. Running, converging workflow.
fb653fb
@bobbyxng
Added updated simplify_network.py
b2c21f7
@bobbyxng
Cleaned up code.
2aefa9b
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
5420fec 
for more information, see https://pre-commit.ci
@bobbyxng
Updated doc
9b24312
@bobbyxng
Merge remote-tracking branch 'refs/remotes/origin/osm-relations' into…
4ef062f 
… osm-relations
@bobbyxng
Reactivated line splitting.
8aec857
@bobbyxng
Updated build_osm_network.
13391d6
@bobbyxng
Cleaned up code.
639eef7
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
aca66fb 
for more information, see https://pre-commit.ci
@bobbyxng
Added 400 kV voltage level to config.default
0cca562
@bobbyxng
Merge branch 'osm-relations' of https://github.com/pypsa/pypsa-eur in…
b3fec47 
…to osm-relations
@bobbyxng
Merge branch 'master' into osm-relations
db2f593
@bobbyxng
Updated Zenodo link
e9f7798
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
c7c453d 
for more information, see https://pre-commit.ci
@bobbyxng
Cleaned up code based on PR comments
8fa4c43
@bobbyxng
Merge branch 'master' into osm-relations
527410d
@bobbyxng
Added docstrings.
0770e21
@fneum
Merge branch 'master' into osm-relations
74b8eb3
@bobbyxng
Merge master into branch.
6a53661
@bobbyxng bobbyxng requested a review from lisazeyen November 19, 2024 14:16
@bobbyxng bobbyxng self-assigned this Nov 19, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Nov 19, 2024 •
edited
Loading

Validator Report

I am the Validator. Download all artifacts here.
I'll be back and edit this comment for each new commit.

General

Plots comparison
Main branch Feature branch
Image not available Image not available
Image not available Image not available
Image not available Image not available
Image not available Image not available
Image not available Image not available
Image not available Image not available
Files comparison
Status NRMSE MAE (norm)

NRMSE: Normalized (combined-min-max) Root Mean Square Error
MAE (norm): Mean Absolute Error on normalized data (min-max)
Status Threshold: MAE (norm) > 0.05 and NRMSE > 0.3

Model Metrics

Benchmarks Image not available Image not available Image not available

Comparing osm-prebuilt-0.6 (8b68b93) with master (98d387c).
Branch is 38 commits ahead and 1 commits behind.
Last updated on 2024-11-21 13:08:52 CET.

@fneum fneum merged commit 920ffb4 into master Dec 2, 2024
@FabianHofmann
Copy link
Copy Markdown
Contributor

FabianHofmann commented Dec 22, 2024

@bobbyxng I have problems with the retrieval of map.html. they are not included in the zenodo repo. Is that perhaps something for future zenodo versions?

@bobbyxng
Copy link
Copy Markdown
Collaborator Author

bobbyxng commented Dec 22, 2024

@bobbyxng I have problems with the retrieval of map.html. they are not included in the zenodo repo. Is that perhaps something for future zenodo versions?

Hi @FabianHofmann ! I just did a test using the latest pypsa-eur master branch, for me map.htmlis downloaded just like all other files. Note the file only exists from version 0.6 onwards. Download takes a bit longer (in my case around 30 seconds), as it's quite large at >40 MB

@FabianHofmann
Copy link
Copy Markdown
Contributor

FabianHofmann commented Dec 22, 2024

Gotcha! thanks, I still had the old version!

@FabianHofmann
Copy link
Copy Markdown
Contributor

FabianHofmann commented Dec 22, 2024

on the other hand this means that the osm version setting is obsolete. At least setting version <0.6, which the current code suggests to be working, breaks. I would suggest to either only support version tags >= 0.6 or make the code flexible to support also older versions

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fneum fneum fneum approved these changes

@lisazeyen lisazeyen Awaiting requested review from lisazeyen

Assignees

@bobbyxng bobbyxng

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@bobbyxng @FabianHofmann @fneum