Merge pull request #4268 from hove-io/nav-2811-sa-formatting

NAV-2811: Add logging for whitespace deletion

Author: adrien3d

source/ed/connectors/gtfs_parser.cpp

@@ -70,7 +70,7 @@ nt::Type_e get_type_enum(const std::string& str) {
     if ("stop_time" == str) {
         return nt::Type_e::StopTime;
     }
-    LOG4CPLUS_WARN(log4cplus::Logger::getInstance("log"), "unkown navitia type: " << str);
+    LOG4CPLUS_WARN(log4cplus::Logger::getInstance("log"), "unknown navitia type: " << str);
     return nt::Type_e::Unknown;
 }
 

source/ed/data.cpp

@@ -66,18 +66,18 @@ void Data::add_feed_info(const std::string& key, const std::string& value) {
 }
 
 void Data::normalize_uri() {
-    ::ed::normalize_uri(networks);
-    ::ed::normalize_uri(companies);
-    ::ed::normalize_uri(commercial_modes);
-    ::ed::normalize_uri(lines);
-    ::ed::normalize_uri(line_groups);
-    ::ed::normalize_uri(physical_modes);
-    ::ed::normalize_uri(stop_areas);
-    ::ed::normalize_uri(stop_points);
-    ::ed::normalize_uri(vehicle_journeys);
-    ::ed::normalize_uri(validity_patterns);
-    ::ed::normalize_uri(calendars);
-    ::ed::normalize_uri(access_points);
+    ::ed::normalize_uri(networks, true);
+    ::ed::normalize_uri(companies, true);
+    ::ed::normalize_uri(commercial_modes, true);
+    ::ed::normalize_uri(lines, true);
+    ::ed::normalize_uri(line_groups, true);
+    ::ed::normalize_uri(physical_modes, true);
+    ::ed::normalize_uri(stop_areas, true);
+    ::ed::normalize_uri(stop_points, false);
+    ::ed::normalize_uri(vehicle_journeys, true);
+    ::ed::normalize_uri(validity_patterns, true);
+    ::ed::normalize_uri(calendars, true);
+    ::ed::normalize_uri(access_points, true);
 }
 
 void Data::build_block_id() {
@@ -296,7 +296,7 @@ void Data::complete() {
     shift_stop_times();
     finalize_frequency();
 
-    ::ed::normalize_uri(routes);
+    ::ed::normalize_uri(routes, true);
 
     // set StopPoint from old zonal ODT to is_zonal
     for (const auto* vj : vehicle_journeys) {

source/ed/data.h

@@ -44,17 +44,28 @@ www.navitia.io
 #include "fare/fare.h"
 #include "type/datetime.h"
 #include "type/address_from_ntfs.h"
+#include "utils/logger.h"
 
 namespace nt = navitia::type;
 /** Ce namespace contient toutes les structures de données \b temporaires, à remplir par le connecteur */
 namespace ed {
 
 template <typename T>
-void normalize_uri(std::vector<T*>& vec) {
+void normalize_uri(std::vector<T*>& vec, bool remove_whitespaces) {
     std::string prefix = navitia::type::static_data::get()->captionByType(T::type);
+
     for (auto* element : vec) {
-        // Suppression des espaces de l'URI
-        boost::algorithm::replace_all(element->uri, " ", "");
+        if (element->uri.find(' ') != std::string::npos) {
+            if (!remove_whitespaces) {
+                LOG4CPLUS_ERROR(log4cplus::Logger::getInstance("log"),
+                                "Keeping spaces for: " << prefix << ":" << element->uri);
+            } else {
+                // Suppression des espaces de l'URI
+                LOG4CPLUS_ERROR(log4cplus::Logger::getInstance("log"),
+                                "Removing spaces for: " << prefix << ":" << element->uri);
+                boost::algorithm::replace_all(element->uri, " ", "");
+            }
+        }
         element->uri = prefix + ":" + element->uri;
     }
 }

source/ed/tests/ed2nav_test.cpp

@@ -87,3 +87,30 @@ BOOST_AUTO_TEST_CASE(throw_on_save) {
     DataThrowOnSave data(0);
     BOOST_CHECK_EQUAL(ed::try_save_file(filename, data), false);
 }
+
+struct SA {
+    std::string uri;
+    const static nt::Type_e type = nt::Type_e::StopArea;
+};
+struct SP {
+    std::string uri;
+    const static nt::Type_e type = nt::Type_e::StopPoint;
+};
+
+BOOST_AUTO_TEST_CASE(normalize_uri) {
+    std::vector<SA*> stopAreasToNormalize;
+    stopAreasToNormalize.push_back(new SA{"AMI:SP:VENUS 1"});
+
+    ed::normalize_uri(stopAreasToNormalize, true);
+    for (auto* ptr : stopAreasToNormalize) {
+        BOOST_CHECK_EQUAL(ptr->uri, "stop_area:AMI:SP:VENUS1");
+    }
+
+    std::vector<SP*> stopPointsNotToNormalize;
+    stopPointsNotToNormalize.push_back(new SP{"AMI:SP:VENUS 1"});
+
+    ed::normalize_uri(stopPointsNotToNormalize, false);
+    for (auto* ptr : stopPointsNotToNormalize) {
+        BOOST_CHECK_EQUAL(ptr->uri, "stop_point:AMI:SP:VENUS 1");
+    }
+}