Skip to content

Commit fe2f5c0

Browse files
committed
Fix merge
1 parent 4ff36b2 commit fe2f5c0

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

src/dsm/sources/Graph.cpp

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,8 @@ namespace dsm {
417417
std::format("Self loop detected: {}->{}. Skipping.", sourceId, targetId));
418418
continue;
419419
}
420-
auto srcId{m_nodeMapping.at(sourceId)};
421-
auto dstId{m_nodeMapping.at(targetId)};
420+
auto const srcId{m_nodeMapping.at(sourceId)};
421+
auto const dstId{m_nodeMapping.at(targetId)};
422422
if (static_cast<unsigned long long>(srcId * nNodes + dstId) >
423423
std::numeric_limits<Id>::max()) {
424424
throw std::invalid_argument(Logger::buildExceptionMessage(
@@ -433,23 +433,6 @@ namespace dsm {
433433
std::stod(maxspeed),
434434
std::stoul(lanes),
435435
name);
436-
if (oneway == "False") {
437-
std::swap(srcId, dstId);
438-
if (static_cast<unsigned long long>(srcId * nNodes + dstId) >
439-
std::numeric_limits<Id>::max()) {
440-
throw std::invalid_argument(Logger::buildExceptionMessage(std::format(
441-
"Street id {}->{} would too large for the current type of Id.",
442-
srcId,
443-
dstId)));
444-
}
445-
Id streetId = srcId * nNodes + dstId;
446-
addEdge<Street>(streetId,
447-
std::make_pair(srcId, dstId),
448-
std::stod(length),
449-
std::stod(maxspeed),
450-
std::stoul(lanes),
451-
name);
452-
}
453436
}
454437
} else {
455438
throw std::invalid_argument(

0 commit comments

Comments
 (0)