Commit Graph

77 Commits

Author SHA1 Message Date
Patrick Niklaus
af4cb96aa5 get_name_for_id -> GetNameForID 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
a0ff0b1258 fix division by zero 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
1cc9a2f4a1 restructured to only return valid turns to the outside + cleanup 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
a3cf7f09e8 less new names, forks consider road classes, api clean-up 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
831a536224 implement basic turn handling 2016-03-23 17:52:51 +01:00
Daniel Patterson
893c9f7326 Enables the use of multiple segment-speed-files on the osrm-contract
command line, and exposes the file name used for each edge in the debug
tiles.
2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
11572702e9 fix merging of turn instructions 2016-03-23 17:52:51 +01:00
Patrick Niklaus
6d16bb5b25 Include reverse edges again 2016-03-23 17:52:51 +01:00
Patrick Niklaus
89eb2a3778 Formating and logging changes for turn classification 2016-03-23 17:52:51 +01:00
Patrick Niklaus
87408cfd73 Handle case of dead-end edges by inserting an invalid turn 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
1947671ae3 encapsulated into class 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
3189f24a17 improving fork handling on three-way turns 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
dd5c730a01 fix comparison for ramps on three-way turns 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
f0b40c1948 fixes roundabout counting 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
ecefb4a20e fixes assignment for basic turn types / invalid ramp assignment 2016-03-23 17:52:51 +01:00
Patrick Niklaus
9b1861e017 Add edge id assertions 2016-03-23 17:52:51 +01:00
Patrick Niklaus
4fb041391f Don't pass shared_ptr down to functions
"Don’t pass a smart pointer as a function parameter unless you want to
use or manipulate the smart pointer itself, such as to share or transfer
ownership."

Source:
http://herbsutter.com/2013/06/05/gotw-91-solution-smart-pointer-parameters/
2016-03-23 17:52:51 +01:00
Daniel J. Hofmann
cded2501a5 Hide functional road classification based on tags in implementation file 2016-03-23 17:52:51 +01:00
Daniel J. Hofmann
0f600c9262 Fixes multi-line comment 2016-03-23 17:52:51 +01:00
Daniel J. Hofmann
9338d418c8 Runs scripts/format.sh 2016-03-23 17:52:51 +01:00
Patrick Niklaus
4d56b8ff0d Fix coodinate include and unused warnings 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
92b4f14db6 start of four way turns 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
a1f1da4c16 improved fork handling 2016-03-23 17:52:51 +01:00
Patrick Niklaus
c337d55d45 Fix crash on extracting Berlin in guidance 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
be5f231641 bugfixing/classification 2016-03-23 17:52:51 +01:00
Patrick Niklaus
c19fae4a43 Big Restructuring / Cleanup 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
0831e71438 starting on conflict resolution 2016-03-23 17:52:51 +01:00
Lauren Budorick
c44a370dd3 Fixes for gcc compiling, temporary hacks to remove later 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
9f5e79501e handle segregated roads (merge for turn analysis) 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
cf5e722578 structural changes, motorway handling 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
f12bb2fa2f enter and exit roundabout feature - currently not showing turn 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
28d878ed23 migrated out of edge based graph factory 2016-03-23 17:52:51 +01:00
Moritz Kobitzsch
8c67dd4504 advanced guidance on 5.0 2016-03-23 17:52:14 +01:00
Patrick Niklaus
0b5875a412 Fix travel mode passing from profiles up to the API 2016-03-23 17:50:13 +01:00
Patrick Niklaus
9a19086926 First round of lat,lng -> lng,lat switcheroo 2016-03-23 17:50:13 +01:00
Patrick Niklaus
53dbb1eac2 Also exclude the compressed flag from the data format 2016-03-23 17:50:13 +01:00
Daniel J. Hofmann
c78dff9a15 Write out unsigned with a check for edge counter overflow 2016-03-19 00:27:55 +01:00
Daniel J. Hofmann
25fea558ba Fixes the edge-based-graph factory's edge counter serialization.
The counter for original edges is of type `std::size_t`, but we
serialized `sizeof(unsigned)` number of bytes out to the `.osrm.edges`
file.

We should probably check all writes (analogous for reads) and make the
count parameter dependent on `sizeof(variable)`.

    ag '\.write\((.*), sizeof\((.*)\)\);'
2016-03-19 00:27:55 +01:00
Daniel J. Hofmann
ac0279aa83 RAII for auto-closing file streams
Small fixes I didn't want to include in unrelated PRs.

There are a few left in `storage.cpp` but since it's a single function
in 600 lines of code, I didn't want to touch the mess. The others are
safe to remove, cucumber and test run on Finland gives 👍.
2016-03-09 17:46:02 +01:00
Patrick Niklaus
ae4161b780 Fix extraction in case of ways referencing invalid node ids 2016-03-08 20:59:11 +01:00
Patrick Niklaus
ac6218eef2 Simplify EBGF code 2016-03-04 16:37:25 +01:00
Patrick Niklaus
a98cc51ac2 Fix up some PR comments 2016-03-04 16:13:30 +01:00
Daniel Patterson
e595bdb20a More cleanup. 2016-03-03 19:28:48 -08:00
Daniel Patterson
9bd2446901 Cleanup. 2016-03-03 19:27:36 -08:00
Daniel Patterson
27babfec3d Add the uncompressible edges to the compressed edge container during the graph compressor run, rather than in the EdgeBasedGraphFactory. This keeps the logic a lot simpler to follow, although it's not quite as fast. 2016-03-03 18:48:39 -08:00
Daniel Patterson
49441fe204 Make forward/reverse weight/offset calculated at query time,
rather than being cached in the StaticRTree.  This means we
can freely apply traffic data and not have stale values lying
around.  It reduces the size of the RTree on disk, at the expense
of some additional data in RAM.
2016-03-03 10:49:12 -08:00
Daniel Patterson
53542abbb7 Disable compression across traffic lights. Previously, we merged the traffic light penalty into the edge weight. When later considering traffic data, we need to be able to update just the edge weight, and it was impossible to extricate the traffic penalty. This increases the number of edge-based-nodes a little bit, but some quick tests show it should only be about 0.1% overall (only affects traffic signals on edges with no intersections (i.e. degree=2)) 2016-03-02 18:00:31 -08:00
Daniel Patterson
fc908d4687 Fix naming of variable so it's a lot less confusing. 2016-03-02 18:00:31 -08:00
Daniel J. Hofmann
aeee565115 Formats all the files we touch.. 2016-03-01 23:51:25 +01:00
Daniel Patterson
56e35e8ef2 Remove GeoJSON based debugging output, we can now generate vector tiles with roughly the same data on-the-fly. 2016-03-01 23:51:25 +01:00