From 564c6203eb6ed72eceb9db36ee74561b4e3b03c4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Wed, 22 Oct 2025 20:00:02 +0200 Subject: [PATCH] [generator] Support more maxspeed type in the world Signed-off-by: Jean-Baptiste --- generator/maxspeeds_parser.cpp | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/generator/maxspeeds_parser.cpp b/generator/maxspeeds_parser.cpp index 7b83eec92..53d1508cd 100644 --- a/generator/maxspeeds_parser.cpp +++ b/generator/maxspeeds_parser.cpp @@ -20,6 +20,14 @@ static std::unordered_map const kRoadCategor {"AT:rural", {100, Units::Metric}}, {"AT:trunk", {100, Units::Metric}}, {"AT:motorway", {130, Units::Metric}}, + {"AT:bicycle_road", {30, Units::Metric}}, + {"AT:zone20", {20, Units::Metric}}, + {"AT:zone30", {30, Units::Metric}}, + {"AT:zone40", {40, Units::Metric}}, + {"AT:shared_zone20", {20, Units::Metric}}, + {"AT:shared_zone30", {30, Units::Metric}}, + {"AU:urban", {50, Units::Metric}}, + {"AU:rural", {100, Units::Metric}}, {"BE:urban", {50, Units::Metric}}, {"BE:zone", {30, Units::Metric}}, {"BE:motorway", {120, Units::Metric}}, @@ -30,6 +38,7 @@ static std::unordered_map const kRoadCategor {"CH:rural", {80, Units::Metric}}, {"CH:trunk", {100, Units::Metric}}, {"CH:motorway", {120, Units::Metric}}, + {"CH:zone30", {30, Units::Metric}}, {"CZ:pedestrian_zone", {20, Units::Metric}}, {"CZ:living_street", {20, Units::Metric}}, {"CZ:urban", {50, Units::Metric}}, @@ -38,6 +47,7 @@ static std::unordered_map const kRoadCategor {"CZ:rural", {90, Units::Metric}}, {"CZ:trunk", {110, Units::Metric}}, {"CZ:motorway", {130, Units::Metric}}, + {"CZ:zone30", {30, Units::Metric}}, {"DK:urban", {50, Units::Metric}}, {"DK:rural", {80, Units::Metric}}, {"DK:motorway", {130, Units::Metric}}, @@ -47,14 +57,23 @@ static std::unordered_map const kRoadCategor {"DE:bicycle_road", {30, Units::Metric}}, {"DE:trunk", {routing::kNoneMaxSpeed, Units::Metric}}, {"DE:motorway", {routing::kNoneMaxSpeed, Units::Metric}}, + {"DE:zone30", {30, Units::Metric}}, + {"DE:zone20", {20, Units::Metric}}, {"FI:urban", {50, Units::Metric}}, {"FI:rural", {80, Units::Metric}}, {"FI:trunk", {100, Units::Metric}}, {"FI:motorway", {120, Units::Metric}}, + {"FI:zone50", {50, Units::Metric}}, + {"FI:zone40", {40, Units::Metric}}, + {"FI:zone30", {30, Units::Metric}}, + {"FI:zone20", {20, Units::Metric}}, + {"FI:living_street", {20, Units::Metric}}, {"FR:motorway", {130, 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}}, {"GR:urban", {50, Units::Metric}}, {"GR:rural", {90, Units::Metric}}, {"GR:trunk", {90, Units::Metric}}, @@ -77,10 +96,18 @@ static std::unordered_map const kRoadCategor {"LT:rural", {90, Units::Metric}}, {"LT:urban", {50, Units::Metric}}, {"LT:living_street", {20, Units::Metric}}, + {"NL:zone30", {30, Units::Metric}}, + {"NL:zone60", {60, Units::Metric}}, + {"NL:living_street", {15, Units::Metric}}, + {"NL:urban", {50, Units::Metric}}, + {"NL:rural", {80, Units::Metric}}, + {"NL:motorroad", {100, Units::Metric}}, + {"NL:motorway", {130, Units::Metric}}, {"NO:rural", {80, Units::Metric}}, {"NO:urban", {50, Units::Metric}}, {"ON:urban", {50, Units::Metric}}, {"ON:rural", {80, Units::Metric}}, + {"PH:urban", {40, Units::Metric}}, {"PL:living_street", {20, Units::Metric}}, {"PL:urban", {50, Units::Metric}}, {"PL:rural", {90, Units::Metric}}, @@ -106,6 +133,7 @@ static std::unordered_map const kRoadCategor {"SL:rural", {90, Units::Metric}}, {"SL:trunk", {110, Units::Metric}}, {"SL:motorway", {130, Units::Metric}}, + {"TR:urban", {50, Units::Metric}}, {"ES:urban", {50, Units::Metric}}, {"ES:rural", {90, Units::Metric}}, {"ES:trunk", {100, Units::Metric}}, @@ -118,6 +146,10 @@ static std::unordered_map const kRoadCategor {"GB:motorway", {70, Units::Imperial}}, // 70 mph = 112.65408 kmph {"GB:nsl_dual", {70, Units::Imperial}}, // 70 mph = 112.65408 kmph {"GB:nsl_single", {60, Units::Imperial}}, // 60 mph = 96.56064 kmph + {"GB:nsl_restricted", {30, Units::Imperial}}, + {"GB-WLS:nsl_restricted", {20, Units::Imperial}}, + {"GB:zone20", {20, Units::Imperial}}, + {"GB:zone40", {40, Units::Imperial}}, {"UK:motorway", {70, Units::Imperial}}, // 70 mph {"UK:nsl_dual", {70, Units::Imperial}}, // 70 mph