Skip to content

Commit

Permalink
reverting some alleged typos and adapting tests eclipse-sumo#21 eclip…
Browse files Browse the repository at this point in the history 
…se-sumo#11237 eclipse-sumo#22
  • Loading branch information
@behrisch
behrisch committed Oct 11, 2022
1 parent 778ad71 commit 9353f6b
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 21 deletions.
8 changes: 5 additions & 3 deletions data/po/de_sumo.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sumo\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-10-11 18:45+0200\n"
"POT-Creation-Date: 2022-10-11 18:52+0200\n"
"PO-Revision-Date: 2022-10-09 17:46+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -796,11 +796,13 @@ msgid "Ignoring invalid stopOffset for lane '%' (invalid lane index)."
msgstr ""

#: /home/micha/sumo/src/netbuild/NBEdge.cpp:4366
msgid "Edge '%' already has a dedicated lane for %. Not adding another one."
#, c-format
msgid "Edge '%' already has a dedicated lane for %s. Not adding another one."
msgstr ""

#: /home/micha/sumo/src/netbuild/NBEdge.cpp:4403
msgid "Edge '%' doesn't have a dedicated lane for %. Cannot be restored."
#, c-format
msgid "Edge '%' doesn't have a dedicated lane for %s. Cannot be restored."
msgstr ""

#: /home/micha/sumo/src/netbuild/NBEdge.cpp:4451
Expand Down
8 changes: 5 additions & 3 deletions data/po/es_sumo.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sumo\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-10-11 18:45+0200\n"
"POT-Creation-Date: 2022-10-11 18:52+0200\n"
"PO-Revision-Date: 2022-10-11 11:53+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -796,11 +796,13 @@ msgid "Ignoring invalid stopOffset for lane '%' (invalid lane index)."
msgstr ""

#: /home/micha/sumo/src/netbuild/NBEdge.cpp:4366
msgid "Edge '%' already has a dedicated lane for %. Not adding another one."
#, c-format
msgid "Edge '%' already has a dedicated lane for %s. Not adding another one."
msgstr ""

#: /home/micha/sumo/src/netbuild/NBEdge.cpp:4403
msgid "Edge '%' doesn't have a dedicated lane for %. Cannot be restored."
#, c-format
msgid "Edge '%' doesn't have a dedicated lane for %s. Cannot be restored."
msgstr ""

#: /home/micha/sumo/src/netbuild/NBEdge.cpp:4451
Expand Down
8 changes: 5 additions & 3 deletions data/po/fr_sumo.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sumo\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-10-11 18:45+0200\n"
"POT-Creation-Date: 2022-10-11 18:52+0200\n"
"PO-Revision-Date: 2022-10-09 17:46+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -796,11 +796,13 @@ msgid "Ignoring invalid stopOffset for lane '%' (invalid lane index)."
msgstr ""

#: /home/micha/sumo/src/netbuild/NBEdge.cpp:4366
msgid "Edge '%' already has a dedicated lane for %. Not adding another one."
#, c-format
msgid "Edge '%' already has a dedicated lane for %s. Not adding another one."
msgstr ""

#: /home/micha/sumo/src/netbuild/NBEdge.cpp:4403
msgid "Edge '%' doesn't have a dedicated lane for %. Cannot be restored."
#, c-format
msgid "Edge '%' doesn't have a dedicated lane for %s. Cannot be restored."
msgstr ""

#: /home/micha/sumo/src/netbuild/NBEdge.cpp:4451
Expand Down
4 changes: 2 additions & 2 deletions src/netbuild/NBEdge.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4363,7 +4363,7 @@ NBEdge::hasRestrictedLane(SUMOVehicleClass vclass) const {
void
NBEdge::addRestrictedLane(double width, SUMOVehicleClass vclass) {
if (hasRestrictedLane(vclass)) {
WRITE_WARNINGF(TL("Edge '%' already has a dedicated lane for %. Not adding another one."), getID(), toString(vclass));
WRITE_WARNINGF(TL("Edge '%' already has a dedicated lane for %s. Not adding another one."), getID(), toString(vclass));
return;
}
if (myLaneSpreadFunction == LaneSpreadFunction::CENTER) {
Expand Down Expand Up @@ -4400,7 +4400,7 @@ void
NBEdge::restoreRestrictedLane(SUMOVehicleClass vclass, std::vector<NBEdge::Lane> oldLanes, PositionVector oldGeometry, std::vector<NBEdge::Connection> oldConnections) {
// check that previously lane was transformed
if (myLanes[0].permissions != vclass) {
WRITE_WARNINGF(TL("Edge '%' doesn't have a dedicated lane for %. Cannot be restored."), getID(), toString(vclass));
WRITE_WARNINGF(TL("Edge '%' doesn't have a dedicated lane for %s. Cannot be restored."), getID(), toString(vclass));
return;
}
// restore old values
Expand Down
12 changes: 6 additions & 6 deletions tests/netconvert/import/OSM/adlershof_dlr_sidewalks/errors.netconvert
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ Warning: Found sharp turn with radius 4.30 at the start of edge '133858467#1'.
Warning: Found sharp turn with radius 4.73 at the start of edge '143308685#1'.
Warning: Found sharp turn with radius 6.42 at the start of edge '47765615#1'.
Warning: Found sharp turn with radius 2.04 at the start of edge '70214888#3'.
Warning: could not find edge for parkingArea '46039050#2s'
Warning: could not find edge for parkingArea '46039050#3s'
Warning: could not find edge for parkingArea '46039050#5s'
Warning: could not find edge for parkingArea '46039050#6s'
Warning: could not find edge for parkingArea '71028777#1s'
Warning: Could not find edge for parkingArea '46039050#2'.
Warning: Could not find edge for parkingArea '46039050#3'.
Warning: Could not find edge for parkingArea '46039050#5'.
Warning: Could not find edge for parkingArea '46039050#6'.
Warning: Could not find edge for parkingArea '71028777#1'.
Warning: Ignoring parking area on edge '142575693#3' due to insufficient space.
Warning: Ignoring parking area on edge '142575693#4' due to insufficient space.
Warning: Ignoring parking area on edge '142575693#6' due to insufficient space.
Warning: Ignoring parking area on edge '143308521#6' due to insufficient space.
Warning: Ignoring parking area on edge '-143308521#6' due to insufficient space.
Warning: 20 total messages of type: Could not find edge for parkingArea '%'.
Warning: 9 total messages of type: Discarding unknown compound '%' in type '%' (first occurence for edge '%').
Warning: 10 total messages of type: Ignoring parking area on edge '%' due to insufficient space.
Warning: 10 total messages of type: PT line '%' in relation % seems to be split, only keeping first part.
Warning: 20 total messages of type: could not find edge for parkingArea '%s'
2 changes: 1 addition & 1 deletion tests/netconvert/import/OSM/bugs/ticket6470/errors.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Warning: Discarding unusable type 'waterway.river' (first occurence for edge '181412435').
Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.tertiary' (first occurence for edge '332907828').
Warning: Discarding unknown compound 'railway.crossing' in type 'highway.footway|railway.crossing' (first occurence for edge '601605353').
Warning: Ignoring join-cluster 'cluster_3151786679s' because it has size '1'.
Warning: Ignoring join-cluster 'cluster_3151786679' because it has size '1'.
Warning: Could not find corresponding edge or compatible lane for pt stop '3151780943' (Am Magnitor). Thus, it will be removed!
Warning: Could not find corresponding edge or compatible lane for pt stop '34672434' (Am Magnitor). Thus, it will be removed!
Warning: The traffic light '34672430' does not control any links; it will not be build.
Expand Down
6 changes: 3 additions & 3 deletions tests/netconvert/meta/aggregate_warnings/errors.netconvert
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ Warning: Reducing junction cluster 1560224141,1560224152,1560224191,1560224195 (
Warning: Found sharp turn with radius 4.30 at the end of edge '-133858467#1'.
Warning: Found sharp turn with radius 7.22 at the start of edge '-133858467#2'.
Warning: Found sharp turn with radius 4.30 at the start of edge '133858467#1'.
Warning: could not find edge for parkingArea '46039050#2s'
Warning: could not find edge for parkingArea '46039050#3s'
Warning: Could not find edge for parkingArea '46039050#2'.
Warning: Could not find edge for parkingArea '46039050#3'.
Warning: Ignoring parking area on edge '142575693#3' due to insufficient space.
Warning: Ignoring parking area on edge '142575693#4' due to insufficient space.
Warning: 20 total messages of type: Could not find edge for parkingArea '%'.
Warning: 9 total messages of type: Discarding unknown compound '%' in type '%' (first occurence for edge '%').
Warning: 4 total messages of type: Discarding unusable type '%' (first occurence for edge '%').
Warning: 5 total messages of type: Found sharp turn with radius % at the start of edge '%'.
Warning: 10 total messages of type: Ignoring parking area on edge '%' due to insufficient space.
Warning: 10 total messages of type: PT line '%' in relation % seems to be split, only keeping first part.
Warning: 3 total messages of type: PT stop '%' has been moved to edge '%'.
Warning: 5 total messages of type: Removing pt stop '%' on non existing edge '%'.
Warning: 20 total messages of type: could not find edge for parkingArea '%s'

0 comments on commit 9353f6b

Please sign in to comment.