fixing style and warnings #22 #3

eclipse-sumo · Mar 19, 2024 · 3fcd15a · 3fcd15a
1 parent 66f7978
commit 3fcd15a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/microsim/devices/MSDevice_FCDReplay.cpp b/src/microsim/devices/MSDevice_FCDReplay.cpp
@@ -199,7 +199,6 @@ MSDevice_FCDReplay::FCDHandler::addTrafficObjects() {
             device->setTrajectory(&t);
         } else {
             const std::string dummyRouteID = "DUMMY_ROUTE_" + id;
-            Trajectory& t = myTrajectories[id];
             const std::vector<SUMOVehicleParameter::Stop> stops;
             ConstMSRoutePtr route = std::make_shared<MSRoute>(dummyRouteID, std::get<3>(desc.second), true, nullptr, stops);
             if (!MSRoute::dictionary(dummyRouteID, route)) {

diff --git a/src/netbuild/NBNetBuilder.cpp b/src/netbuild/NBNetBuilder.cpp
@@ -649,7 +649,7 @@ NBNetBuilder::compute(OptionsCont& oc, const std::set<std::string>& explicitTurn
 
     if (lefthand != oc.getBool("flip-y-axis")) {
         mirrorX();
-    };
+    }
 
     if (oc.exists("geometry.check-overlap")  && oc.getFloat("geometry.check-overlap") > 0) {
         before = PROGRESS_BEGIN_TIME_MESSAGE(TL("Checking overlapping edges"));

diff --git a/src/netimport/NIImporter_OpenStreetMap.cpp b/src/netimport/NIImporter_OpenStreetMap.cpp
@@ -525,7 +525,7 @@ NIImporter_OpenStreetMap::insertEdge(Edge* e, int index, NBNode* from, NBNode* t
     }
     // get additional direction information
     int nodeDirection = myOSMNodes.find(StringUtils::toLong(from->getID()))->second->myRailDirection |
-        myOSMNodes.find(StringUtils::toLong(to->getID()))->second->myRailDirection;
+                        myOSMNodes.find(StringUtils::toLong(to->getID()))->second->myRailDirection;
 
     std::vector<std::shared_ptr<NBPTStop> > ptStops;
     for (long long i : passed) {
@@ -553,11 +553,11 @@ NIImporter_OpenStreetMap::insertEdge(Edge* e, int index, NBNode* from, NBNode* t
 #ifdef DEBUG_LAYER_ELEVATION
     if (e->id == "DEBUGID") {
         std::cout
-            << " id=" << id << " from=" << from->getID() << " fromRailDirection=" << myOSMNodes.find(StringUtils::toLong(from->getID()))->second->myRailDirection 
-            << " to=" << to->getID() << " toRailDirection=" << myOSMNodes.find(StringUtils::toLong(to->getID()))->second->myRailDirection 
-            << " origRailDirection=" << e->myRailDirection
-            << " nodeDirection=" << nodeDirection
-            << "\n";
+                << " id=" << id << " from=" << from->getID() << " fromRailDirection=" << myOSMNodes.find(StringUtils::toLong(from->getID()))->second->myRailDirection
+                << " to=" << to->getID() << " toRailDirection=" << myOSMNodes.find(StringUtils::toLong(to->getID()))->second->myRailDirection
+                << " origRailDirection=" << e->myRailDirection
+                << " nodeDirection=" << nodeDirection
+                << "\n";
     }
 #endif
     if (e->myRailDirection == WAY_UNKNOWN && nodeDirection != WAY_UNKNOWN && nodeDirection != WAY_FORWARD
@@ -923,8 +923,7 @@ NIImporter_OpenStreetMap::NodesHandler::NodesHandler(std::map<long long int, NIO
     myUniqueNodes(uniqueNodes),
     myImportElevation(oc.getBool("osm.elevation")),
     myDuplicateNodes(0),
-    myOptionsCont(oc)
-{
+    myOptionsCont(oc) {
     // init rail signal rules
     for (std::string kv : oc.getStringVector("osm.railsignals")) {
         if (kv == "DEFAULT") {
@@ -2073,7 +2072,7 @@ NIImporter_OpenStreetMap::RelationHandler::myEndElement(int element) {
                 }
                 if (hadGap) {
                     WRITE_WARNINGF(TL("PT line '%' in relation % seems to be split, only keeping first part."), myName, myCurrentRelation);
-                    missingAfter = myStops.size() - missingBefore - ptLine->getStops().size();
+                    missingAfter = (int)myStops.size() - missingBefore - (int)ptLine->getStops().size();
                     break;
                 }