update subprojects, refactoring
This commit is contained in:
parent
1c459816de
commit
7a772486d0
5 changed files with 7 additions and 5 deletions
|
@ -1 +1 @@
|
|||
Subproject commit a27c5fee863d1a99fd081d20d1cb57861fb263e7
|
||||
Subproject commit 8e1dd71097cbc2fa1136522a2e2ba3cb574efe96
|
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
|
|
2
src/util
2
src/util
|
@ -1 +1 @@
|
|||
Subproject commit dc9d4a6c701bd2b88c09683a4f901d743dc8999e
|
||||
Subproject commit 767f58404bb5646aa94e35274c9a051a3fd3fdcf
|
2
src/xml
2
src/xml
|
@ -1 +1 @@
|
|||
Subproject commit d6acc51dda15e0d955140b50735840bb0fae6c71
|
||||
Subproject commit 47ac7e399db3ec414f266c8e288e6204e06ee07e
|
Loading…
Reference in a new issue