Expand capability of geojson class #694
Open
+164
−26
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vtnate
commented
Jan 15, 2025
| pass | ||
|
|
||
|
|
||
| # TODO: Inherit from GeoJSON Feature class, move to its own file |
There was a problem hiding this comment.
I'm now importing this class back into urbanopt_geojson, not inheriting. Is that the right pattern we should use?
| @@ -47,6 +26,8 @@ def __init__(self, filename, building_ids=None, skip_validation=False): | |||
| :param building_ids: list[str | int] | None, optional, list of GeoJSON building | |||
| IDs to parse from the file. If None or an empty list, parse all buildings. | |||
| """ | |||
|
|
|||
| self._filename = Path(filename).resolve() | |||
There was a problem hiding this comment.
This came over from uo-des as well as the methods below.
| @@ -122,3 +103,140 @@ def get_feature(self, jsonpath): | |||
|
|
|||
| # otherwise return the list of values | |||
| return results | |||
|
|
|||
| # TODO: test the following methods | |||
There was a problem hiding this comment.
We (I) should write some tests for these. Not sure if that should delay this PR or not.
| pass | ||
|
|
||
|
|
||
| class UrbanOptLoad: |
There was a problem hiding this comment.
This is moved from urbanopt_geojson.py to its own file.
| @@ -62,7 +62,7 @@ def __init__(self, system_parameters, template_dir): | |||
| } | |||
| # Get access to loop order output from ThermalNetwork package. | |||
| if "fifth_generation" in district_params and "ghe_parameters" in district_params["fifth_generation"]: | |||
| self.loop_order: list = load_loop_order(self.system_parameters.filename) | |||
| self.loop_order = load_loop_order(self.system_parameters.filename) | |||
There was a problem hiding this comment.
Mypy said this was an unnecessary type hint, since the load_loop_order method is already hinted.
nllong
approved these changes
Jan 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Any background context you want to provide?
The urbanopt-des repo has a geojson parsing class as well as the one in the GMT. Combining them should DRY up some code. Updating the uo-des version is accomplished in urbanopt/urbanopt-des#8.
What does this PR accomplish?
How should this be manually tested?
CI is sufficient