fix

Signed-off-by: Mamoru Sobue <[email protected]>
autowarefoundation · Jun 14, 2024 · b142e1c · b142e1c
1 parent 6d2f8a9
commit b142e1c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 45 deletions.
diff --git a/tmp/lanelet2_extension/include/lanelet2_extension/io/autoware_osm_parser.hpp b/tmp/lanelet2_extension/include/lanelet2_extension/io/autoware_osm_parser.hpp
@@ -61,10 +61,6 @@ class AutowareOsmParser : public OsmParser
 
 std::optional<uint64_t> parseMajorVersion(const std::string & format_version);
 
-std::optional<uint64_t> parseMinorVersion(const std::string & format_version);
-
-std::optional<uint64_t> parsePatchVersion(const std::string & format_version);
-
 }  // namespace lanelet::io_handlers
 
 // NOLINTEND(readability-identifier-naming)

diff --git a/tmp/lanelet2_extension/lib/autoware_osm_parser.cpp b/tmp/lanelet2_extension/lib/autoware_osm_parser.cpp
@@ -80,57 +80,25 @@ std::optional<uint64_t> parseMajorVersion(const std::string & format_version)
 {
   std::regex re(R"(^(\d+\.)?(\d+\.)?(\d+)$)");
   // NOTE(Mamoru Sobue): matches `1`, `1.10`, `1.10.100`
-  // `1` ==> [`1`, ``, ``]
+  // `1` ==> [``, ``, `1`]
   // `1.10` ==> [`1.`, ``, `10`]
   // `1.10.100` ==> [`1.`, `10.`, `100`]
   std::smatch match;
   if (!std::regex_match(format_version, match, re)) {
     return std::nullopt;
   }
-  std::string major = match[1].str();
-  major.erase(std::remove(major.begin(), major.end(), '.'), major.end());
-  return std::stoi(major);
-}
-
-std::optional<uint64_t> parseMinorVersion(const std::string & format_version)
-{
-  std::regex re(R"(^(\d+\.)?(\d+\.)?(\d+)$)");
-  // NOTE(Mamoru Sobue): matches `1`, `1.10`, `1.10.100`
-  // `1` ==> [`1`, ``, ``]
-  // `1.10` ==> [`1.`, ``, `10`]
-  // `1.10.100` ==> [`1.`, `10.`, `100`]
-  std::smatch match;
-  if (!std::regex_match(format_version, match, re)) {
+  if (match[3].str() == "") {
     return std::nullopt;
   }
-  std::string minor = match[2].str();
-  if (minor == "") {
-    if (match[3].str() == "") {
-      return std::nullopt;
-    }
-    minor = match[3].str();
-  }
-  minor.erase(std::remove(minor.begin(), minor.end(), '.'), minor.end());
-  return std::stoi(minor);
-}
 
-std::optional<uint64_t> parsePatchVersion(const std::string & format_version)
-{
-  std::regex re(R"(^(\d+\.)?(\d+\.)?(\d+)$)");
-  // NOTE(Mamoru Sobue): matches `1`, `1.10`, `1.10.100`
-  // `1` ==> [`1`, ``, ``]
-  // `1.10` ==> [`1.`, ``, `10`]
-  // `1.10.100` ==> [`1.`, `10.`, `100`]
-  std::smatch match;
-  if (!std::regex_match(format_version, match, re)) {
-    return std::nullopt;
-  }
-  std::string patch = match[3].str();
-  if (patch == "") {
-    return std::nullopt;
+  std::string major{};
+  if (match[1].str() == "") {
+    major = match[3].str();
+  } else {
+    major = match[1].str();
   }
-  patch.erase(std::remove(patch.begin(), patch.end(), '.'), patch.end());
-  return std::stoi(patch);
+  major.erase(std::remove(major.begin(), major.end(), '.'), major.end());
+  return std::stoi(major);
 }
 
 }  // namespace lanelet::io_handlers