Skip to content

Commit

Permalink
Ignore invalid measures when splitting an edge
Browse files Browse the repository at this point in the history
  • Loading branch information
geographika committed Sep 19, 2023
1 parent 7ca9e3b commit da1c146
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 24 deletions.
91 changes: 74 additions & 17 deletions tests/test_splitting.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,16 @@ def test_split_invalid_measure(use_reverse_lookup):
net = loader.load_network_from_geometries(
feats, use_reverse_lookup=use_reverse_lookup
)
error = False

try:
# 150 is greater than edge length
splitter.split_network_edge(net, 2, [150])
except ValueError:
error = True
edge_count = len(net.edges())
key = 2
original_edge = functions.get_edge_by_key(net, key, with_data=True)

assert error
# 150 is greater than edge length
split_edges = splitter.split_network_edge(net, key, [150])
# no split should happen and the original edge should be returned
assert original_edge == split_edges[0]
assert edge_count == len(net.edges())


@pytest.mark.parametrize("use_reverse_lookup", [(True), (False)])
Expand All @@ -117,15 +118,70 @@ def test_split_invalid_measure2(use_reverse_lookup):
net = loader.load_network_from_geometries(
feats, use_reverse_lookup=use_reverse_lookup
)
error = False

try:
# 100 is equal to edge length
splitter.split_network_edge(net, 2, [100])
except ValueError:
error = True
edge_count = len(net.edges())
key = 2
original_edge = functions.get_edge_by_key(net, key, with_data=True)

assert error
# 100 is equal to edge length
split_edges = splitter.split_network_edge(net, key, [100])
# no split should happen and the original edge should be returned
assert original_edge == split_edges[0]
assert edge_count == len(net.edges())


@pytest.mark.parametrize("use_reverse_lookup", [(True), (False)])
def test_split_invalid_measure3(use_reverse_lookup):
feats = simple_features()
net = loader.load_network_from_geometries(
feats, use_reverse_lookup=use_reverse_lookup
)

edge_count = len(net.edges())
key = 2
original_edge = functions.get_edge_by_key(net, key, with_data=True)

# 0 values should be ignored
split_edges = splitter.split_network_edge(net, key, [0])
# no split should happen and the original edge should be returned
assert original_edge == split_edges[0]
assert edge_count == len(net.edges())


@pytest.mark.parametrize("use_reverse_lookup", [(True), (False)])
def test_split_invalid_measure4(use_reverse_lookup):
feats = simple_features()
net = loader.load_network_from_geometries(
feats, use_reverse_lookup=use_reverse_lookup
)

edge_count = len(net.edges())
key = 2
original_edge = functions.get_edge_by_key(net, key, with_data=True)

# negative values should be ignored
split_edges = splitter.split_network_edge(net, key, [-10])
# no split should happen and the original edge should be returned
assert original_edge == split_edges[0]
assert edge_count == len(net.edges())


@pytest.mark.parametrize("use_reverse_lookup", [(True), (False)])
def test_split_invalid_measure5(use_reverse_lookup):
feats = simple_features()
net = loader.load_network_from_geometries(
feats, use_reverse_lookup=use_reverse_lookup
)

edge_count = len(net.edges())
key = 2
original_edge = functions.get_edge_by_key(net, key, with_data=True)

# all invalid measures should be ignored
split_edges = splitter.split_network_edge(net, key, [-10, -5, 0, 100, 150, 200])
# no split should happen and the original edge should be returned
assert original_edge == split_edges[0]
assert edge_count == len(net.edges())


@pytest.mark.parametrize("use_reverse_lookup", [(True), (False)])
Expand Down Expand Up @@ -204,12 +260,13 @@ def test_doctest():
if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG)
# test_multiple_split_network_edge(True)
# test_split_invalid_measure(True)
# test_split_invalid_measure2(True)
test_split_invalid_measure(True)
test_split_invalid_measure2(True)
test_split_invalid_measure3(True)
# test_multiple_split_network_edge(True)
# test_multiple_split_network_edge(True)
# test_double_split_network_edge(True)
# test_split_with_points(True)
# test_split_network_edge(True)
test_unsplit_network_edges()
# test_unsplit_network_edges()
print("Done!")
22 changes: 15 additions & 7 deletions wayfarer/splitter.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,23 +323,31 @@ def split_network_edge(

original_edge = functions.get_edge_by_key(net, key, with_data=True)

log.debug(f"Splitting {original_edge.key} with {len(measures)} points")

functions.remove_edge_by_key(net, original_edge.key)
original_length = original_edge.attributes[LENGTH_FIELD]

validated_measures = []

for m in measures:
if m >= original_length:
raise ValueError(
log.debug(
f"Split measure {m} is greater or equal to the length {original_length} of edge {key}"
)
if m == 0:
raise ValueError("Split measure is 0 - no need to split!")
elif m <= 0:
log.debug("Split measure is 0 or less - no need to split!")
else:
validated_measures.append(m)

if len(validated_measures) == 0:
log.debug("No measures along line - returning original edges")
return [original_edge]

log.debug(f"Splitting {original_edge.key} with {len(measures)} points")

functions.remove_edge_by_key(net, original_edge.key)
prev_node = original_edge.start_node
from_m = 0 # type: (int | float)

for to_m in sorted(set(measures)):
for to_m in sorted(set(validated_measures)):
split_key = create_split_key(key, to_m)
atts = get_split_attributes(
original_edge.attributes, from_m, to_m, prev_node, split_key
Expand Down

0 comments on commit da1c146

Please sign in to comment.