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.

Sign up for GitHub

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

Limit changed names to database interface #403

Merged
merged 5 commits into from
Dec 10, 2024
Merged

Limit changed names to database interface #403

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38a9bf4
Rename usage of geom back to the_geom so this rename is only reflecte…
margrietpalm Dec 9, 2024
e241e89
Rename the_geom to geom upon loading from sqlite instead of later and…
margrietpalm Dec 9, 2024
43a27cf
Rename the_geom to geom upon loading from sqlite instead of later and…
margrietpalm Dec 9, 2024
d950630
Replace usage of arr_to_attr_dict with label in sql query
margrietpalm Dec 9, 2024
fdbd1e8
Update changes
margrietpalm Dec 10, 2024
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
4 changes: 2 additions & 2 deletions threedigrid_builder/grid/boundary_conditions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ def apply(self, grid):
class BoundaryCondition2D:
id: int
type: BoundaryType
geom: shapely.Geometry
the_geom: shapely.Geometry


class BoundaryConditions2D(Array[BoundaryCondition2D]):
def get_intersecting_node_idx(
self, idx: int, cell_tree: shapely.STRtree
) -> np.ndarray:
bc_geom = self.geom[idx]
bc_geom = self.the_geom[idx]

x1, y1, x2, y2 = shapely.bounds(bc_geom)
is_horizontal = (x2 - x1) > (y2 - y1)
Expand Down
4 changes: 2 additions & 2 deletions threedigrid_builder/grid/zero_d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ class BaseSurface:
code: str
display_name: str
area: float
geom: shapely.Geometry
the_geom: shapely.Geometry

connection_node_id: int
connection_node_the_geom: shapely.Geometry
Expand Down Expand Up @@ -267,7 +267,7 @@ def as_grid_surfaces(
if extra_fields is None:
extra_fields = {}

centroids = shapely.centroid(self.geom)
centroids = shapely.centroid(self.the_geom)
no_centroid_mask = shapely.is_missing(centroids)

if np.any(no_centroid_mask):
Expand Down
Loading
Loading