From 8e5c1a4d170e82f150c4d13820f27bbc42963758 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Wed, 22 Oct 2025 22:07:52 +0200 Subject: [PATCH] Reorganize and clean maxspeed:type values Signed-off-by: Jean-Baptiste --- generator/maxspeeds_parser.cpp | 72 ++++++++++++++++------------------ 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/generator/maxspeeds_parser.cpp b/generator/maxspeeds_parser.cpp index 4776bcdb8..a462eecbf 100644 --- a/generator/maxspeeds_parser.cpp +++ b/generator/maxspeeds_parser.cpp @@ -20,13 +20,13 @@ static std::unordered_map const kRoadCategor {"AT:bicycle_road", {30, Units::Metric}}, {"AT:motorway", {130, Units::Metric}}, {"AT:rural", {100, Units::Metric}}, - {"AT:shared_zone20", {20, Units::Metric}}, {"AT:shared_zone30", {30, Units::Metric}}, + {"AT:shared_zone20", {20, Units::Metric}}, {"AT:trunk", {100, Units::Metric}}, {"AT:urban", {50, Units::Metric}}, - {"AT:zone20", {20, Units::Metric}}, - {"AT:zone30", {30, Units::Metric}}, {"AT:zone40", {40, Units::Metric}}, + {"AT:zone30", {30, Units::Metric}}, + {"AT:zone20", {20, Units::Metric}}, {"AU:rural", {100, Units::Metric}}, {"AU:urban", {50, Units::Metric}}, {"BE-BRU:rural", {70, Units::Metric}}, @@ -43,7 +43,6 @@ static std::unordered_map const kRoadCategor {"BE-WAL:rural", {90, Units::Metric}}, {"BE-WAL:urban", {50, Units::Metric}}, {"BE:zone30", {30, Units::Metric}}, - {"BE:zone", {30, Units::Metric}}, {"BG:living_street", {20, Units::Metric}}, {"BG:motorway", {140, Units::Metric}}, {"BG:rural", {90, Units::Metric}}, @@ -81,8 +80,8 @@ static std::unordered_map const kRoadCategor {"DE:rural", {100, Units::Metric}}, {"DE:trunk", {routing::kNoneMaxSpeed, Units::Metric}}, {"DE:urban", {50, Units::Metric}}, - {"DE:zone20", {20, Units::Metric}}, {"DE:zone30", {30, Units::Metric}}, + {"DE:zone20", {20, Units::Metric}}, {"DK:motorway", {130, Units::Metric}}, {"DK:rural", {80, Units::Metric}}, {"DK:urban", {50, Units::Metric}}, @@ -92,9 +91,6 @@ static std::unordered_map const kRoadCategor {"ES:motorway", {120, Units::Metric}}, {"ES:rural", {90, Units::Metric}}, {"ES:trunk", {100, Units::Metric}}, - {"ES:trunk", {90, Units::Metric}}, - {"ES:urban", {20, Units::Metric}}, - {"ES:urban", {30, Units::Metric}}, {"ES:urban", {50, Units::Metric}}, {"ES:zone30", {30, Units::Metric}}, {"FI:living_street", {20, Units::Metric}}, @@ -102,48 +98,47 @@ static std::unordered_map const kRoadCategor {"FI:rural", {80, Units::Metric}}, {"FI:trunk", {100, Units::Metric}}, {"FI:urban", {50, Units::Metric}}, - {"FI:zone20", {20, Units::Metric}}, - {"FI:zone30", {30, Units::Metric}}, - {"FI:zone40", {40, Units::Metric}}, {"FI:zone50", {50, Units::Metric}}, - {"FR:living_street", {20, Units::Metric}}, + {"FI:zone40", {40, Units::Metric}}, + {"FI:zone30", {30, Units::Metric}}, + {"FI:zone20", {20, Units::Metric}}, {"FR:motorway", {130, Units::Metric}}, - {"FR:rural", {80, Units::Metric}}, {"FR:trunk", {110, Units::Metric}}, + {"FR:rural", {80, Units::Metric}}, {"FR:urban", {50, Units::Metric}}, {"FR:zone30", {30, Units::Metric}}, + {"FR:living_street", {20, Units::Metric}}, {"GB:motorway", {70, Units::Imperial}}, // 70 mph = 112.65408 kmph {"GB:nsl_dual", {70, Units::Imperial}}, // 70 mph = 112.65408 kmph {"GB:nsl_restricted", {30, Units::Imperial}}, {"GB:nsl_single", {60, Units::Imperial}}, // 60 mph = 96.56064 kmph {"GB-WLS:nsl_restricted", {20, Units::Imperial}}, - {"GB:zone20", {20, Units::Imperial}}, {"GB:zone40", {40, Units::Imperial}}, + {"GB:zone20", {20, Units::Imperial}}, {"GR:living_street", {20, Units::Metric}}, {"GR:motorway", {130, Units::Metric}}, - {"GR:rural", {90, Units::Metric}}, {"GR:trunk", {110, Units::Metric}}, - {"GR:trunk", {90, Units::Metric}}, + {"GR:rural", {90, Units::Metric}}, {"GR:urban", {50, Units::Metric}}, - {"HU:living_street", {20, Units::Metric}}, {"HU:motorway", {130, Units::Metric}}, - {"HU:rural", {90, Units::Metric}}, {"HU:trunk", {110, Units::Metric}}, + {"HU:rural", {90, Units::Metric}}, {"HU:urban", {50, Units::Metric}}, + {"HU:living_street", {20, Units::Metric}}, {"ID:motorway", {100, Units::Metric}}, - {"ID:residential", {30, Units::Metric}}, {"ID:rural", {80, Units::Metric}}, {"ID:urban", {50, Units::Metric}}, - {"IL:living_street", {30, Units::Metric}}, + {"ID:residential", {30, Units::Metric}}, {"IL:motorway", {110, Units::Metric}}, {"IL:trunk", {100, Units::Metric}}, {"IL:urban", {50, Units::Metric}}, + {"IL:living_street", {30, Units::Metric}}, {"IN:motorway", {120, Units::Metric}}, {"IN:rural", {70, Units::Metric}}, {"IN:urban", {70, Units::Metric}}, {"IT:motorway", {130, Units::Metric}}, - {"IT:rural", {90, Units::Metric}}, {"IT:trunk", {110, Units::Metric}}, + {"IT:rural", {90, Units::Metric}}, {"IT:urban", {50, Units::Metric}}, {"JP:express", {100, Units::Metric}}, {"JP:motorway", {100, Units::Metric}}, @@ -153,18 +148,18 @@ static std::unordered_map const kRoadCategor {"KR:rural", {60, Units::Metric}}, {"KR:trunk", {80, Units::Metric}}, {"KR:urban", {50, Units::Metric}}, - {"LT:living_street", {20, Units::Metric}}, {"LT:motorway", {110, Units::Metric}}, {"LT:rural", {90, Units::Metric}}, {"LT:trunk", {110, Units::Metric}}, {"LT:urban", {50, Units::Metric}}, + {"LT:living_street", {20, Units::Metric}}, {"NL:living_street", {15, Units::Metric}}, - {"NL:motorroad", {100, Units::Metric}}, {"NL:motorway", {130, Units::Metric}}, + {"NL:motorroad", {100, Units::Metric}}, {"NL:rural", {80, Units::Metric}}, {"NL:urban", {50, Units::Metric}}, - {"NL:zone30", {30, Units::Metric}}, {"NL:zone60", {60, Units::Metric}}, + {"NL:zone30", {30, Units::Metric}}, {"NO:rural", {80, Units::Metric}}, {"NO:urban", {50, Units::Metric}}, {"ON:rural", {80, Units::Metric}}, @@ -172,57 +167,56 @@ static std::unordered_map const kRoadCategor {"PH:motorway", {100, Units::Metric}}, {"PH:rural", {80, Units::Metric}}, {"PH:urban", {40, Units::Metric}}, - {"PL:expressway", {120, Units::Metric}}, - {"PL:living_street", {20, Units::Metric}}, {"PL:motorway", {140, Units::Metric}}, + {"PL:trunk", {100, Units::Metric}}, {"PL:rural", {90, Units::Metric}}, {"PL:urban", {50, Units::Metric}}, + {"PL:living_street", {20, Units::Metric}}, {"PT:motorway", {120, Units::Metric}}, - {"PT:rural", {90, Units::Metric}}, {"PT:trunk", {100, Units::Metric}}, + {"PT:rural", {90, Units::Metric}}, {"PT:urban", {50, Units::Metric}}, {"RO:motorway", {130, Units::Metric}}, - {"RO:rural", {90, Units::Metric}}, {"RO:trunk", {100, Units::Metric}}, + {"RO:rural", {90, Units::Metric}}, {"RO:urban", {50, Units::Metric}}, {"RS:living_street", {10, Units::Metric}}, {"RS:motorway", {130, Units::Metric}}, - {"RS:rural", {80, Units::Metric}}, {"RS:trunk", {100, Units::Metric}}, + {"RS:rural", {80, Units::Metric}}, {"RS:urban", {50, Units::Metric}}, - {"RU:living_street", {20, Units::Metric}}, {"RU:motorway", {110, Units::Metric}}, {"RU:rural", {90, Units::Metric}}, {"RU:urban", {60, Units::Metric}}, + {"RU:living_street", {20, Units::Metric}}, {"SE:motorway", {110, Units::Metric}}, {"SE:rural", {70, Units::Metric}}, {"SE:trunk", {90, Units::Metric}}, {"SE:urban", {50, Units::Metric}}, {"SI:motorway", {130, Units::Metric}}, - {"SI:rural", {90, Units::Metric}}, {"SI:trunk", {110, Units::Metric}}, + {"SI:rural", {90, Units::Metric}}, {"SI:urban", {50, Units::Metric}}, - {"SK:living_street", {20, Units::Metric}}, {"SK:motorway", {130, Units::Metric}}, - {"SK:motorway", {90, Units::Metric}}, {"SK:motorway_urban", {90, Units::Metric}}, - {"SK:rural", {90, Units::Metric}}, {"SK:trunk", {90, Units::Metric}}, + {"SK:rural", {90, Units::Metric}}, {"SK:urban", {50, Units::Metric}}, + {"SK:living_street", {20, Units::Metric}}, {"SL:motorway", {130, Units::Metric}}, - {"SL:rural", {90, Units::Metric}}, {"SL:trunk", {110, Units::Metric}}, + {"SL:rural", {90, Units::Metric}}, {"SL:urban", {50, Units::Metric}}, - {"TR:living_street", {20, Units::Metric}}, - {"TR:rural", {90, Units::Metric}}, {"TR:trunk", {110, Units::Metric}}, + {"TR:rural", {90, Units::Metric}}, {"TR:urban", {50, Units::Metric}}, {"TR:zone30", {30, Units::Metric}}, - {"UA:living_street", {20, Units::Metric}}, + {"TR:living_street", {20, Units::Metric}}, {"UA:motorway", {130, Units::Metric}}, - {"UA:rural", {90, Units::Metric}}, {"UA:trunk", {110, Units::Metric}}, + {"UA:rural", {90, Units::Metric}}, {"UA:urban", {50, Units::Metric}}, + {"UA:living_street", {20, Units::Metric}}, {"UK:motorway", {70, Units::Imperial}}, // 70 mph {"UK:nsl_dual", {70, Units::Imperial}}, // 70 mph {"UK:nsl_single", {60, Units::Imperial}}, // 60 mph