update subprojects, refactoring

ad-freiburg · Oct 12, 2023 · 7a77248 · 7a77248
1 parent 1c45981
commit 7a77248
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/src/cppgtfs b/src/cppgtfs
diff --git a/src/pfaedle/osm/OsmBuilder.cpp b/src/pfaedle/osm/OsmBuilder.cpp
@@ -1857,6 +1857,8 @@ bool OsmBuilder::keepFullTurn(const trgraph::Node* n, double ang) {
 
     POINT ap, bp;
 
+    if (!a || !b) return false;
+
     if (a->pl().getGeom() && b->pl().getGeom()) {
       ap = a->pl().backHop();
       bp = b->pl().backHop();

diff --git a/src/pfaedle/router/Weights.h b/src/pfaedle/router/Weights.h
@@ -48,7 +48,7 @@ class ExpoTransWeight {
     uint32_t _inf;
     bool _noLineSimiPen;
     mutable const trgraph::Edge* _lastFrom;
-    mutable uint32_t _lastC;
+    mutable uint32_t _lastC = 0;
 
     uint32_t operator()(const trgraph::Edge* from, const trgraph::Node* n,
                         const trgraph::Edge* to) const;
@@ -68,7 +68,7 @@ class ExpoTransWeight {
     uint32_t operator()(const trgraph::Edge* a,
                         const std::set<trgraph::Edge*>& b) const;
     mutable const trgraph::Edge* _lastE;
-    mutable uint32_t _lastC;
+    mutable uint32_t _lastC = 0;
   };
 
   static uint32_t maxCost(double tTime, const RoutingOpts& rOpts);

diff --git a/src/util b/src/util
diff --git a/src/xml b/src/xml