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

Fix geometry issues #532

Closed
wants to merge 54 commits into from
Closed
Changes from 2 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
d489e77
Add an emptiness check for geometry
ekatef Dec 3, 2022
59a0e83
Add a comment to a check added
ekatef Dec 3, 2022
9ddb8bf
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 3, 2022
b15717a
Merge branch 'main' into country_geom_fixes
ekatef Dec 4, 2022
8dd7ed6
Fix processing country names for a case of not relevant entries
ekatef Dec 5, 2022
5438808
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 5, 2022
a5e5529
Fix geometry with holes
ekatef Dec 5, 2022
94c5df8
Improve comment
ekatef Dec 5, 2022
4b35011
Merge remote-tracking branch 'origin/country_geom_fixes' into country…
ekatef Dec 5, 2022
21d167b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 5, 2022
5c94a02
Add a function to restore a country code from the country name
ekatef Dec 6, 2022
6b8f98f
Add an import
ekatef Dec 6, 2022
1bbbf08
Apply the code restoring
ekatef Dec 6, 2022
8841088
Drop non-found country names
ekatef Dec 6, 2022
d42c6eb
Merge remote-tracking branch 'origin/country_geom_fixes' into country…
ekatef Dec 6, 2022
05e954f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 6, 2022
23f5e7c
Unify outline before to calculate Voronoi patrition
ekatef Dec 10, 2022
2f41dcf
Merge remote-tracking branch 'origin/country_geom_fixes' into country…
ekatef Dec 10, 2022
1357965
Fix offshore_shapes duplication
ekatef Dec 11, 2022
40c4a3a
Merge branch 'pypsa-meets-earth:main' into country_geom_fixes
ekatef Dec 11, 2022
2f8fd89
Add a release note
ekatef Dec 17, 2022
6ccb5ac
Merge remote-tracking branch 'upstream/main' into country_geom_fixes
ekatef Dec 17, 2022
97d848b
Merge branch 'main' into country_geom_fixes
ekatef Dec 25, 2022
cb3b14e
Merge remote-tracking branch 'upstream/main' into country_geom_fixes
ekatef Dec 25, 2022
ca6d67c
Add an interim output
ekatef Dec 26, 2022
602b62d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 26, 2022
075ff01
Remove a testing line
ekatef Dec 26, 2022
75fb552
Merge remote-tracking branch 'origin/country_geom_fixes' into country…
ekatef Dec 26, 2022
019a49b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 26, 2022
152a550
Merge remote-tracking branch 'upstream/main' into country_geom_fixes
ekatef Jan 3, 2023
8519d6f
docs(contributor): contrib-readme-action has updated readme
github-actions[bot] Jan 8, 2023
0333cc2
Merge branch 'main' into country_geom_fixes
ekatef Jan 8, 2023
1bf0048
Merge branch 'pypsa-meets-earth:main' into country_geom_fixes
ekatef Jan 8, 2023
05345ef
docs(contributor): contrib-readme-action has updated readme
github-actions[bot] Jan 8, 2023
076198d
Merge remote-tracking branch 'origin/country_geom_fixes' into country…
ekatef Jan 8, 2023
b7026e1
Improve structure
ekatef Jan 9, 2023
bc2436d
Wrap a function around building a gadm-layer dataframe
ekatef Jan 9, 2023
04a4fb1
Remove duplication
ekatef Jan 9, 2023
3606638
Move geometry validation inside a function
ekatef Jan 9, 2023
aced6fa
Add temporary comments
ekatef Jan 9, 2023
1c3b962
Fix variable name inside a function
ekatef Jan 9, 2023
d6a49d4
Fix definition of variables
ekatef Jan 9, 2023
d9f4e33
Fix indent
ekatef Jan 9, 2023
7d457e9
Keep all the columns
ekatef Jan 9, 2023
4603e37
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 9, 2023
daec9e8
Merge remote-tracking branch 'upstream/main' into country_geom_fixes
ekatef Jan 9, 2023
d69e64a
Merge branch 'pypsa-meets-earth:main' into country_geom_fixes
ekatef Jan 9, 2023
b414a98
Merge remote-tracking branch 'origin/country_geom_fixes' into country…
ekatef Jan 9, 2023
21aba6b
Merge remote-tracking branch 'origin/country_geom_fixes' into country…
ekatef Jan 9, 2023
a4da003
Remove duplication
ekatef Jan 9, 2023
3b25277
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 9, 2023
f314100
Merge branch 'main' of https://github.com/ekatef/pypsa-earth
ekatef Jan 10, 2023
495477d
Merge branch 'main' into country_geom_fixes
ekatef Jan 10, 2023
ee6f07a
Merge remote-tracking branch 'origin/country_geom_fixes' into country…
ekatef Jan 10, 2023
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
134 changes: 49 additions & 85 deletions README.md
Original file line number Diff line number Diff line change
@@ -147,27 +147,6 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
<!-- readme: collaborators,contributors -start -->
<table>
<tr>
<td align="center">
<a href="https://github.com/hazemakhalek">
<img src="https://avatars.githubusercontent.com/u/26235356?v=4" width="100;" alt="hazemakhalek"/>
<br />
<sub><b>Null</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/jarry7">
<img src="https://avatars.githubusercontent.com/u/27745389?v=4" width="100;" alt="jarry7"/>
<br />
<sub><b>Jarrad Wright</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/fneum">
<img src="https://avatars.githubusercontent.com/u/29101152?v=4" width="100;" alt="fneum"/>
<br />
<sub><b>Fabian Neumann</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/ekatef">
<img src="https://avatars.githubusercontent.com/u/30229437?v=4" width="100;" alt="ekatef"/>
@@ -176,70 +155,41 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
</a>
</td>
<td align="center">
<a href="https://github.com/euronion">
<img src="https://avatars.githubusercontent.com/u/42553970?v=4" width="100;" alt="euronion"/>
<br />
<sub><b>Euronion</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Justus-coded">
<img src="https://avatars.githubusercontent.com/u/44394641?v=4" width="100;" alt="Justus-coded"/>
<br />
<sub><b>Justus Ilemobayo</b></sub>
</a>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/mnm-matin">
<img src="https://avatars.githubusercontent.com/u/45293386?v=4" width="100;" alt="mnm-matin"/>
<a href="https://github.com/davide-f">
<img src="https://avatars.githubusercontent.com/u/67809479?v=4" width="100;" alt="davide-f"/>
<br />
<sub><b>Mnm-matin</b></sub>
<sub><b>Davide-f</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/desenk">
<img src="https://avatars.githubusercontent.com/u/48335263?v=4" width="100;" alt="desenk"/>
<a href="https://github.com/pz-max">
<img src="https://avatars.githubusercontent.com/u/61968949?v=4" width="100;" alt="pz-max"/>
<br />
<sub><b>Desen Kirli</b></sub>
<sub><b>Max Parzen</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/LukasFrankenQ">
<img src="https://avatars.githubusercontent.com/u/55196140?v=4" width="100;" alt="LukasFrankenQ"/>
<a href="https://github.com/restyled-commits">
<img src="https://avatars.githubusercontent.com/u/65077583?v=4" width="100;" alt="restyled-commits"/>
<br />
<sub><b>Lukas Franken</b></sub>
<sub><b>Restyled Commits</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/pz-max">
<img src="https://avatars.githubusercontent.com/u/61968949?v=4" width="100;" alt="pz-max"/>
<a href="https://github.com/mnm-matin">
<img src="https://avatars.githubusercontent.com/u/45293386?v=4" width="100;" alt="mnm-matin"/>
<br />
<sub><b>Max Parzen</b></sub>
<sub><b>Mnm-matin</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Cesare-Caputo">
<img src="https://avatars.githubusercontent.com/u/62548290?v=4" width="100;" alt="Cesare-Caputo"/>
<a href="https://github.com/DeniseGiub">
<img src="https://avatars.githubusercontent.com/u/113139589?v=4" width="100;" alt="DeniseGiub"/>
<br />
<sub><b>Null</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/davide-f">
<img src="https://avatars.githubusercontent.com/u/67809479?v=4" width="100;" alt="davide-f"/>
<br />
<sub><b>Davide-f</b></sub>
</a>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/koen-vg">
<img src="https://avatars.githubusercontent.com/u/74298901?v=4" width="100;" alt="koen-vg"/>
<br />
<sub><b>Koen Van Greevenbroek</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Hazem-IEG">
<img src="https://avatars.githubusercontent.com/u/87850910?v=4" width="100;" alt="Hazem-IEG"/>
@@ -255,46 +205,46 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
</a>
</td>
<td align="center">
<a href="https://github.com/AnasAlgarei">
<img src="https://avatars.githubusercontent.com/u/101210563?v=4" width="100;" alt="AnasAlgarei"/>
<a href="https://github.com/Tomkourou">
<img src="https://avatars.githubusercontent.com/u/5240283?v=4" width="100;" alt="Tomkourou"/>
<br />
<sub><b>AnasAlgarei</b></sub>
<sub><b>Thomas Kouroughli</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/restyled-commits">
<img src="https://avatars.githubusercontent.com/u/65077583?v=4" width="100;" alt="restyled-commits"/>
<a href="https://github.com/giacfalk">
<img src="https://avatars.githubusercontent.com/u/36954873?v=4" width="100;" alt="giacfalk"/>
<br />
<sub><b>Restyled Commits</b></sub>
<sub><b>Giacomo Falchetta</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/DeniseGiub">
<img src="https://avatars.githubusercontent.com/u/113139589?v=4" width="100;" alt="DeniseGiub"/>
<a href="https://github.com/Ekaterina-Vo">
<img src="https://avatars.githubusercontent.com/u/99509555?v=4" width="100;" alt="Ekaterina-Vo"/>
<br />
<sub><b>Null</b></sub>
<sub><b>Ekaterina-Vo</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/Tomkourou">
<img src="https://avatars.githubusercontent.com/u/5240283?v=4" width="100;" alt="Tomkourou"/>
<a href="https://github.com/euronion">
<img src="https://avatars.githubusercontent.com/u/42553970?v=4" width="100;" alt="euronion"/>
<br />
<sub><b>Thomas Kouroughli</b></sub>
<sub><b>Euronion</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/giacfalk">
<img src="https://avatars.githubusercontent.com/u/36954873?v=4" width="100;" alt="giacfalk"/>
<a href="https://github.com/AnasAlgarei">
<img src="https://avatars.githubusercontent.com/u/101210563?v=4" width="100;" alt="AnasAlgarei"/>
<br />
<sub><b>Giacomo Falchetta</b></sub>
<sub><b>AnasAlgarei</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Ekaterina-Vo">
<img src="https://avatars.githubusercontent.com/u/99509555?v=4" width="100;" alt="Ekaterina-Vo"/>
<a href="https://github.com/LukasFrankenQ">
<img src="https://avatars.githubusercontent.com/u/55196140?v=4" width="100;" alt="LukasFrankenQ"/>
<br />
<sub><b>Ekaterina-Vo</b></sub>
<sub><b>Lukas Franken</b></sub>
</a>
</td>
<td align="center">
@@ -304,6 +254,13 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
<sub><b>Jarrad Wright</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/koen-vg">
<img src="https://avatars.githubusercontent.com/u/74298901?v=4" width="100;" alt="koen-vg"/>
<br />
<sub><b>Koen Van Greevenbroek</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/EmreYorat">
<img src="https://avatars.githubusercontent.com/u/93644024?v=4" width="100;" alt="EmreYorat"/>
@@ -319,6 +276,13 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
</a>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/jarry7">
<img src="https://avatars.githubusercontent.com/u/27745389?v=4" width="100;" alt="jarry7"/>
<br />
<sub><b>Jarrad Wright</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/squoilin">
<img src="https://avatars.githubusercontent.com/u/4547840?v=4" width="100;" alt="squoilin"/>