Skip to content
This repository has been archived by the owner on Sep 27, 2023. It is now read-only.

Add vegetation geodata #973

Merged
merged 412 commits into from
Aug 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
412 commits
Select commit Hold shift + click to select a range
2501745
Update gridlabd-geodata
Apr 22, 2021
9a0b879
Update gridlabd-geodata
Apr 22, 2021
72221e9
Update geodata_example.glm
Apr 22, 2021
bda08a0
Update geodata_example
dchassin Apr 22, 2021
314b98f
Work update
Apr 22, 2021
e60a05d
Update geodata_address.py
Apr 22, 2021
0a9a716
Update gridlabd-geodata
Apr 22, 2021
f6e5639
Fix traceback output when DEBUG is True
Apr 22, 2021
a2da347
Add general geodata autotest
Apr 22, 2021
79cfcfa
Update gridlabd-geodata
Apr 22, 2021
408bf3f
Update test_geodata_address.glm
Apr 22, 2021
2a6885d
Update gridlabd-geodata
Apr 22, 2021
e6ddcc3
Add geodata dataset autotest
Apr 23, 2021
9f97434
Update geodata_utility.py
Apr 23, 2021
d4c0062
Update autotest.sh
Apr 23, 2021
97771c1
Rename unittest.sh
Apr 23, 2021
5e6cb91
Update geodata_elevation.py
Apr 23, 2021
b35bbfc
Update geodata_address.py
Apr 23, 2021
ae6a16c
Update geodata_address.py
Apr 23, 2021
281eb4b
Update geodata_elevation.py
Apr 23, 2021
8e22289
Update geodata_utility.py
Apr 23, 2021
49a8225
Update test_geodata_elevation.glm
Apr 23, 2021
0f86b52
Update test_geodata_utility.glm
Apr 23, 2021
df8d098
Update unittest.sh
Apr 23, 2021
8a3e7b5
Update gridlabd-geodata
Apr 23, 2021
70d2701
Update test_geodata.txt
Apr 23, 2021
993a95c
Update unittest.sh
Apr 23, 2021
44938da
Update geodata_powerline.py
Apr 23, 2021
8f7e65b
Fix index resolution conflicts
Apr 23, 2021
486ba04
Update geodata_powerline.py
Apr 23, 2021
f4a48dc
Add haversine function support
Apr 23, 2021
4185882
Update requirements.txt
Apr 23, 2021
373f243
Update gridlabd-geodata
Apr 23, 2021
6a4a485
Update gridlabd-geodata
Apr 26, 2021
fd413e9
Update geodata_powerline.py
Apr 27, 2021
74e113c
Update gridlabd-geodata
Apr 27, 2021
0adef66
Update test_geodata.glm
dchassin Apr 27, 2021
fa6b4a3
Update gridlabd-geodata
dchassin Apr 28, 2021
175b3fe
Update gridlabd-geodata
dchassin Apr 28, 2021
df638b4
Update main.cpp
Apr 28, 2021
28a3895
Update test_geodata.glm
Apr 28, 2021
8d872bc
Update geodata package call method
dchassin Apr 28, 2021
30ab73b
Update geodata_powerline.py
dchassin Apr 28, 2021
1db9c49
Update geodata_powerline.py
Apr 28, 2021
eef9775
Update gridlabd-geodata
Apr 28, 2021
d49b4cb
Update geodata_census.py
Apr 28, 2021
7bd901f
Add cabletypes for powerline geodata package
Apr 29, 2021
c972252
Update gridlabd-geodata
Apr 29, 2021
99354e8
Update geodata_powerline.py
Apr 29, 2021
642fcad
Update geodata_powerline.py
Apr 30, 2021
f3386f1
Update geodata_powerline.py
Apr 30, 2021
1efd24f
Update geodata_powerline_cabletypes.csv
Apr 30, 2021
2cae5a9
Update geodata_powerline.py
Apr 30, 2021
b29bf8b
Update geodata_powerline.py
Apr 30, 2021
c34c2ad
Add csv-table to glm-library converter
dchassin May 1, 2021
1acee31
Update geodata_powerline.py
dchassin May 1, 2021
37e2fcc
Refactor gridlabd convert implementation
dchassin May 1, 2021
bd0cb0c
Update Convert.md
dchassin May 1, 2021
92437f9
Update Convert.md
dchassin May 1, 2021
c211d8e
Merge branch 'develop-fix-gridladb-convert' into develop-geodata-subc…
dchassin May 1, 2021
67de536
Update gridlabd-convert
dchassin May 1, 2021
5c684ef
Update csv-table2glm-library.py
dchassin May 1, 2021
403de85
Update gridlabd-convert
dchassin May 1, 2021
35705c0
Update csv-table2glm-library.py
dchassin May 1, 2021
d9bc7d5
Update geodata_powerline.py
dchassin May 1, 2021
246416a
Update geodata_powerline.py
dchassin May 1, 2021
7a530cf
Update path_example.csv
dchassin May 1, 2021
60260f6
Update geodata_powerline.py
dchassin May 1, 2021
a379602
Merge branch 'develop' into develop-geodata-subcommand
dchassin May 1, 2021
7ba3e20
Update test_geodata.txt
May 2, 2021
9914a25
Add verbose output for get_args()
dchassin May 2, 2021
73f6999
Add census state data processing
dchassin May 2, 2021
77fafd5
Update geodata_census.py
dchassin May 2, 2021
df4a939
Add more support for plot format
dchassin May 2, 2021
d5e70db
Add support for uuid key
May 3, 2021
5831531
Update gridlabd-geodata
May 3, 2021
9058846
Refactor python requirements handling
May 3, 2021
9f03cc0
Update gridlabd-geodata
May 3, 2021
009344b
Update geodata_census.py
May 3, 2021
b53a07f
Fix redirect issue
May 9, 2021
d817fef
Update test_geodata.glm
May 9, 2021
a5c2156
Fix permissions on scripts
May 9, 2021
d09c78f
Update Makefile.am
May 10, 2021
2638510
Update gridlabd-geodata
May 10, 2021
909e690
Update geodata_census.py
May 10, 2021
f8abba7
Update geodata_census.py
May 11, 2021
ec36cbb
Update gridlabd-geodata
May 11, 2021
1e3c6f6
Added zipcode-level census data
May 12, 2021
ced4667
Update zipcodes.py
May 12, 2021
6efe127
Update gridlabd-geodata
May 12, 2021
001bca7
Update geodata_census.py
May 12, 2021
97647f7
Create path_example.csv
May 12, 2021
5b91330
Create GridLAB-D GeoData Tutorial.ipynb
May 12, 2021
a1f94bd
Update geodata_distance.py
May 12, 2021
fe1e5ba
Update build_number
May 12, 2021
cbeeae2
Update gridlabd-geodata
May 12, 2021
3744fcc
Update GridLAB-D GeoData Tutorial.ipynb
May 12, 2021
5dd56d4
Update geodata_elevation.py
May 13, 2021
a2f549f
Update gridlabd-geodata
May 13, 2021
8e131e0
Update geodata_utility.py
May 13, 2021
b3aa8ea
Update GridLAB-D GeoData Tutorial.ipynb
May 13, 2021
5126419
Update geodata_utility.py
May 14, 2021
84f8ff2
Update gridlabd-geodata
May 14, 2021
0369990
Update GridLAB-D GeoData Tutorial.ipynb
May 14, 2021
b24e867
Update gridlabd-geodata
May 14, 2021
f6e0e15
Update geodata_powerline.py
May 14, 2021
f968a9a
Update GridLAB-D GeoData Tutorial.ipynb
May 14, 2021
48c676a
Update geodata_powerline.py
May 14, 2021
6e071f9
Update GridLAB-D GeoData Tutorial.ipynb
May 14, 2021
9706957
Update GridLAB-D GeoData Tutorial.ipynb
May 14, 2021
270138c
Update gridlabd-geodata
May 14, 2021
b9405f5
Update GridLAB-D GeoData Tutorial.ipynb
May 14, 2021
250acf0
Update gridlabd-geodata
May 14, 2021
ae0f826
Update geodata_distance.py
May 14, 2021
b93d21c
Update GridLAB-D GeoData Tutorial.ipynb
May 14, 2021
3fb4ef6
Update gridlabd-geodata
May 14, 2021
3907ebe
Update GridLAB-D GeoData Tutorial.ipynb
May 14, 2021
91c9473
Update GridLAB-D GeoData Tutorial.ipynb
May 14, 2021
b5598a5
Update GridLAB-D GeoData Tutorial.ipynb
May 14, 2021
09a70cf
Update gridlabd-geodata
May 14, 2021
71e5210
Update GridLAB-D GeoData Tutorial.ipynb
May 14, 2021
d87c137
Update gridlabd-geodata
May 14, 2021
6872ac7
Update gridlabd-geodata
May 14, 2021
caf7d15
Update geodata_distance.py
dchassin May 15, 2021
127cc8c
Update Makefile.am
dchassin May 15, 2021
79f292e
Update gridlabd-geodata
May 15, 2021
b1ea35b
Update GridLAB-D GeoData Tutorial.ipynb
May 15, 2021
a7aa4cd
Update gridlabd-geodata
May 15, 2021
24370ee
Update geodata_example.sh
May 15, 2021
b151fd7
Update GridLAB-D GeoData Tutorial.ipynb
May 15, 2021
0af1f7e
Merge branch 'develop-geodata-subcommand' of https://github.com/slacg…
dchassin May 15, 2021
acd3a4b
Update version check so it works from the command line too
dchassin May 15, 2021
f4aab82
Add more support for JSON and Excel file I/O
dchassin May 15, 2021
7616d7a
Add relative distance option to geodata distance package
dchassin May 15, 2021
8795afa
Update gridlabd-geodata
dchassin May 15, 2021
4b95f25
Update GridLAB-D GeoData Tutorial.ipynb
dchassin May 15, 2021
19ffc48
Update Geodata.md
dchassin May 15, 2021
e101c5e
Update Geodata.md
dchassin May 15, 2021
7c662a0
Update test_geodata_elevation.glm
dchassin May 15, 2021
15c83f1
Update requirements.txt
dchassin May 15, 2021
f8829bd
Update requirements.txt
dchassin May 15, 2021
dc381db
Update Geodata.md
dchassin May 15, 2021
ea919ee
Update gridlabd-geodata
dchassin May 15, 2021
d908e9f
Update gridlabd-geodata
dchassin May 15, 2021
f8a71d0
Update GridLAB-D GeoData Tutorial.ipynb
dchassin May 15, 2021
3a9eb5d
Fix input delimiter problem with address (again)
dchassin May 15, 2021
9fbda10
Fix autotest errors
dchassin May 15, 2021
169d38f
Fix geodata autotest problems on github actions
dchassin May 16, 2021
4b6c6e9
Create Geodata.md
May 16, 2021
eb2b9c7
Update Geodata.md
May 16, 2021
bff2423
Add tutorial docs generation
May 16, 2021
f89d3b0
Tutorial update
May 16, 2021
c0d2864
Update test_geodata.glm
May 16, 2021
a7bbde6
Making pole test optional until it's fixed
May 16, 2021
36f122d
Update the geodata tutorial
May 16, 2021
7e53d6e
Update geodata tutorial
dchassin May 16, 2021
4b39d97
Update docs and add --resolution_id option
May 17, 2021
f693911
Update Geodata.md
May 17, 2021
0422d56
Fix waypoints id calcs
May 17, 2021
d86238d
Update geodata_elevation.py
May 17, 2021
d2d425f
Create geodata_vegetation.py
May 17, 2021
cc2f0b2
Add geodata_vegetation.py
May 17, 2021
e6544ff
Update geodata_vegetation.py
May 18, 2021
4659804
Add vegetation geodata package
May 18, 2021
05f2bc2
Update geodata_vegetation.py
May 18, 2021
087d297
Update geodata_vegetation.py
May 18, 2021
8d36b17
Update vegetation geodata package
May 19, 2021
42acb64
Update geodata_vegetation.py
May 19, 2021
42fce3b
Update geodata_vegetation.py
May 19, 2021
87cf66b
Add link to CFO repo for user registration
May 19, 2021
312d9b2
Update vegetation package and docs
May 19, 2021
4ea68cf
Update geodata tutorial
May 19, 2021
a65e893
Tutorial update
May 19, 2021
11157fe
Update tutorial docs
May 19, 2021
251e7af
Update distance package to support relative distances
May 21, 2021
7dab657
Update with a second example
May 21, 2021
a9de3a4
Fix distance calcs when resolution is too large
May 21, 2021
59cd012
Merge branch 'develop' into develop-add-vegetation-geodata
May 21, 2021
35835da
Fix geodata autotest
May 21, 2021
bb1044f
fix distance calulation issue
May 21, 2021
050cd0f
fix the bug for calculation linesag at arbitrary points
May 22, 2021
9e52cf1
Update geodata_vegetation.py
May 22, 2021
b299ada
Create update_vegetation.py
dchassin May 22, 2021
169a857
Update update_vegetation.py
dchassin May 22, 2021
a2ddafd
Update update_vegetation.py
dchassin May 22, 2021
0e6f78d
Fix image tiling
May 24, 2021
3dec72f
Code for downloading 0.1 degree vegetation tiles and uploading them t…
May 27, 2021
f929d13
Update geodata_vegetation.py
dchassin May 29, 2021
4c1a0d0
Update Geodata.ipynb
dchassin May 30, 2021
ff28eab
Update Geodata.md
dchassin May 30, 2021
27fe468
Update Geodata.ipynb
dchassin May 30, 2021
b1715bb
Update Geodata.md
dchassin May 30, 2021
275deda
Update geodata_powerline.py
dchassin May 30, 2021
7e70aae
Update Geodata.ipynb
dchassin May 30, 2021
8de3d57
Update Geodata.md
dchassin May 30, 2021
4bd5b7e
Update docs
Jun 3, 2021
317ab6a
change pole height
Jun 3, 2021
d3a6fb4
change pole geight
Jun 3, 2021
f3554c2
change pole height
Jun 3, 2021
660aeb3
Added line contact probability test
Jun 3, 2021
9eded8a
Update docs
Jun 3, 2021
41ea103
Update Geodata.ipynb
Jun 4, 2021
fcd2312
Update CFO authenticator
Jun 7, 2021
d28871f
Added interpolation of elevation
Jun 7, 2021
c128f89
Update geodata_elevation.py
Jun 7, 2021
c1b8429
update elevation intepolation for geodata_elevation
Jun 8, 2021
41c193b
Update the initial tension calculation
Jun 9, 2021
49cb660
Fixed python notebook for geodata
Jun 9, 2021
f33b0d3
Update Geodata.md
Jun 9, 2021
c701b10
Update develop.yml
Jun 9, 2021
57936f7
merge updates
Jun 9, 2021
c9ad836
Update .gitignore
Jun 10, 2021
7ada720
Update path_example.csv
Jun 10, 2021
479bd99
Update gridlabd-library
Jun 10, 2021
f288b8d
Update geodata_vegetation.py
Jun 10, 2021
64b251b
Merge branch 'develop' into develop-add-vegetation-geodata
Jun 12, 2021
73fe55d
Update geodata_vegetation.py
Jun 12, 2021
daa25d9
Create geodata.conf
Jun 12, 2021
252e54b
Update update_vegetation.py
Jun 12, 2021
cc87907
Update Geodata.ipynb
Jun 12, 2021
686a3fd
Update CFO authentication
Jun 12, 2021
602d189
Update Geodata.md
Jun 12, 2021
bfbce82
Update Geodata.ipynb
Jun 12, 2021
490ee6f
Update geodata_vegetation.py
Jun 12, 2021
10cb6ec
Fix autotest validation
Jun 12, 2021
d6b8741
Merge branch 'develop-add-vegetation-geodata' of https://github.com/s…
Jun 12, 2021
e16d183
Update test_geodata.txt
Jun 12, 2021
41351f2
Update geodata_vegetation.py
Jun 12, 2021
27870c0
Update geodata_vegetation.py
Jun 12, 2021
fff2c47
Merge branch 'develop' into develop-add-vegetation-geodata
Jun 13, 2021
cee85d5
Merge branch 'develop' into develop-add-vegetation-geodata
Jun 14, 2021
585961b
Merge branch 'develop' into develop-add-vegetation-geodata
Jun 15, 2021
d3f2ad3
Merge branch 'develop' into develop-add-vegetation-geodata
Jun 21, 2021
5e6b007
Update geodata_powerline.py
Jun 24, 2021
46cd00b
Merge branch 'develop' into develop-add-vegetation-geodata
Jun 24, 2021
116afc4
Update geodata_powerline.py
Jun 29, 2021
b16b2eb
Merge branch 'develop' into develop-add-vegetation-geodata
Jul 5, 2021
890206a
Merge branch 'develop' into develop-add-vegetation-geodata
Jul 14, 2021
faef8cb
Merge branch 'develop-add-vegetation-geodata' of https://github.com/s…
Jul 15, 2021
b3018a6
Update geodata_powerline.py
Jul 15, 2021
9b65b42
Merge branch 'develop' into develop-add-vegetation-geodata
Jul 19, 2021
e4db49d
Merge branch 'develop' into develop-add-vegetation-geodata
dchassin Jul 19, 2021
6120259
Merge branch 'develop' into develop-add-vegetation-geodata
dchassin Jul 19, 2021
589292c
Merge branch 'develop-add-vegetation-geodata' of https://github.com/s…
Jul 19, 2021
6b8e6b2
Merge branch 'develop' into develop-add-vegetation-geodata
dchassin Jul 27, 2021
396accd
Merge branch 'develop' into develop-add-vegetation-geodata
Jul 30, 2021
d18bed4
Update Geodata.ipynb
Aug 9, 2021
60d3548
Update geodata_powerline.py
Aug 9, 2021
230acfa
Merge branch 'develop' into develop-add-vegetation-geodata
Aug 9, 2021
ddbafd9
Merge branch 'develop' into develop-add-vegetation-geodata
aivanova5 Aug 16, 2021
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
19 changes: 17 additions & 2 deletions gldcore/geodata/docs/Geodata.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2026,7 +2026,7 @@
},
{
"cell_type": "code",
"execution_count": 62,
"execution_count": 5,
"id": "f6cc13cb",
"metadata": {
"scrolled": false
Expand All @@ -2036,7 +2036,22 @@
"name": "stdout",
"output_type": "stream",
"text": [
"ERROR [geodata/powerline]: 'height'\r\n"
"WARNING [geodata/powerline]: cannot run function CONTACT and 'height' is missing or invalid\n",
" linesag\n",
"position \n",
"0 18.0\n",
"50 12.2\n",
"100 9.4\n",
"150 9.7\n",
"200 13.0\n",
"... ...\n",
"8390 -16.6\n",
"8440 -8.9\n",
"8490 0.6\n",
"8540 12.0\n",
"8583 23.0\n",
"\n",
"[191 rows x 1 columns]\n"
]
}
],
Expand Down
21 changes: 16 additions & 5 deletions gldcore/geodata/geodata_powerline.py
Original file line number Diff line number Diff line change
Expand Up @@ -567,11 +567,22 @@ def apply(data, options=default_options, config=default_config, warning=print):
CONFIG = config

result = pandas.DataFrame(data)
result["linesag"] = linesag(data)
result["linesway"] = linesway(data)
result["linegallop"] = linegallop(data)
result["contact"] = contact(result)

try:
result["linesag"] = linesag(data)
except Exception as err:
WARNING(f"cannot run function LINESAG and {err} is missing or invalid")
try:
result["linesway"] = linesway(data)
except Exception as err:
WARNING(f"cannot run function LINEWAY and {err} is missing or invalid")
try:
result["linegallop"] = linegallop(data)
except Exception as err:
WARNING(f"cannot run function LINEGALLOP and {err} is missing or invalid")
try:
result["contact"] = contact(result)
except Exception as err:
WARNING(f"cannot run function CONTACT and {err} is missing or invalid")
return result

# perform validation tests
Expand Down