Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions dhnx/gistools/connect_points.py
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,13 @@ def process_geometry(lines, consumers, producers,
lines['type'] = 'DL' # DL for distribution line
lines_consumers['type'] = 'HL' # HL for house line

# generate forks point layer
forks = go.create_forks(lines)

# concat lines
lines_all = pd.concat([lines, lines_consumers, lines_producers], sort=False)

forks = go.create_forks(lines_all)

forks = go.remove_con_prod_forks(forks, consumers, producers)

lines_all.reset_index(inplace=True, drop=True)
lines_all.index.name = 'id'
if 'id' in lines_all.columns:
Expand Down
26 changes: 26 additions & 0 deletions dhnx/gistools/geometry_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -511,3 +511,29 @@ def check_crs(gdf, crs=4647):
logging.info('CRS of GeoDataFrame converted to EPSG:{0}'.format(crs))

return gdf


def remove_con_prod_forks(forks, consumers, producers):
"""

Parameters
----------
forks
consumers
producers

Returns
-------

"""
consumers["geometry_wkt"] = \
consumers["geometry"].apply(lambda geom: geom.wkt)

producers["geometry_wkt"] = \
producers["geometry"].apply(lambda geom: geom.wkt)

con_prod = list(producers["geometry_wkt"]) + list(consumers["geometry_wkt"])

forks_only = forks[forks.geometry_wkt.isin(con_prod) == False]

return forks_only