Patrick Niklaus
ea027a7cc1
Merge commit '62e8601919faca57a0fa4be1a910458390450cc9' as 'third_party/variant'
2016-03-24 21:32:27 +01:00
Patrick Niklaus
62e8601919
Squashed 'third_party/variant/' content from commit b585021
...
git-subtree-dir: third_party/variant
git-subtree-split: b5850212f16efeb409a112edb1e719d5f5edb604
2016-03-24 21:32:27 +01:00
Patrick Niklaus
be2cc7aed9
Remove variant
2016-03-24 21:32:12 +01:00
Patrick Niklaus
17babb22e2
mapbox/variant v1.0 -> v1.1
2016-03-24 21:26:31 +01:00
Patrick Niklaus
21245273b4
Also exclude the compressed flag from the data format
2016-03-24 21:24:08 +01:00
Patrick Niklaus
8d7821c84e
Remove geometry indicator
2016-03-24 21:24:08 +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
b1c84b598f
Print the _local_ endpoint Boost ASIO assigns a port to, fixes #2097
2016-03-18 12:09:28 +01:00
Daniel J. Hofmann
a6aa0a4cb0
Adapts routed to always print port and ip it listens on, fixed #2097
2016-03-16 11:21:20 +01:00
Daniel J. Hofmann
8640129835
Ampersand binds to variable name
2016-03-15 11:47:57 +01:00
Daniel J. Hofmann
655dd2277c
Eliminate extra semicola
2016-03-15 11:47:57 +01:00
Daniel J. Hofmann
40f95191a0
Do not copy pairs in loop
2016-03-15 11:47:57 +01:00
Daniel J. Hofmann
a013da860e
Fixes unneeded includes in contractor header and self-include
2016-03-15 10:44:33 +01:00
Moritz Kobitzsch
4150c804df
Improve the core search stopping criterion
2016-03-15 09:33:10 +01:00
Patrick Niklaus
0446847278
Merge pull request #2093 from arnekaiser/develop
...
Bugfix: set initial uturn indicators
2016-03-14 20:41:47 -04:00
akaiser
2cf8309987
Bugfix: set initial uturn indicators
2016-03-14 17:14:01 +01:00
Daniel J. Hofmann
5b30f92677
Adapts the test makefile clean target to remove monaco files.
...
See: https://github.com/Project-OSRM/osrm-backend/pull/2086#commitcomment-16639848
2016-03-11 12:06:34 +01:00
Patrick Niklaus
88fac0ad2b
Use language: generic
to use the minimal image
...
Since we are pulling all dependencies from PPA this just gives use the
advantage of faster boot up times.
2016-03-11 06:34:17 +01:00
Patrick Niklaus
45a9a6c4df
Switch example to monaco
2016-03-11 05:58:42 +01:00
Daniel J. Hofmann
af554e7ed0
Provide uninstall target, closes #1972
2016-03-10 21:25:27 +01:00
Patrick Niklaus
8912928581
Disable alternatives by defaul fixes #2072
2016-03-10 21:01:30 +01:00
Daniel J. Hofmann
c2e49bd152
Do not install already installed deps. on OSX TraviS build, this should be made future proof
2016-03-10 20:27:46 +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
adc3bacea9
Add pruning based on @MoKob's idea in #1921
2016-03-08 00:43:45 +01:00
Patrick Niklaus
e125f3a897
Add core factor tests
2016-03-07 21:44:32 +01:00
Patrick Niklaus
f86b5a44bc
Adapt shortest_path and viaroute to core search
2016-03-07 21:26:12 +01:00
Daniel J. Hofmann
0c5899b2a2
Disable ccache on Travis until we can cache the ccache cache directory, fixes #2057
2016-03-07 12:39:32 +01:00
Daniel J. Hofmann
a7d83b701f
Provides a CMake variable to disable ccache usage
2016-03-07 12:37:16 +01:00
Daniel J. Hofmann
d0b591307a
We're already on v4.9.1, update CMakeLists, closes #2060
2016-03-07 12:25:54 +01:00
Daniel Patterson
13378a4b55
Only attempt to return PBF if the call to the tile plugin actually returned PBF data. This may occur if bad parameters are passed (e.g. zoom level is < 12))
2016-03-04 17:49:20 -08: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
Patrick Niklaus
92a06c9a28
Renamed prepared -> contracted
2016-03-04 16:12:10 +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
017ff53702
Code review updates.
2016-03-03 13:25:01 -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
03d360b7bf
Enable color output when compiling with clang - makes errors a bit easier to spot.
2016-03-02 18:00:31 -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
e90b1bbead
Allow no sources and no destinations for full table query
2016-03-03 02:00:39 +01:00
Daniel J. Hofmann
ce1ca1b625
Fixes critical error in table plugin accessing uninitialized memory
...
Although we check for valid coordinates in the table plugin via
`check_all_coordinates`, we do not check for #srcs > 0 and #dsts > 0.
This would be fine as the grammar parser combines adding coordinates and
setting their `is_source` and `is_destination` property, which makes
adding coordinates without specifying source or destination impossible.
See: route_parameters.cpp, AddSource, AddDestination, and api_grammar.hpp
In contract, the Polyline codepath does not do this! In fact, it only lets
you set coordinates, but not their `is_source` or `is_destination` property.
See: route_parameters.cpp, SetCoordinatesFromGeometry
Therefore, the following queries only set coordinates:
http 'http://localhost:5000/table?locs=s_hhFg {arEgEfEgEfEgEfEgEfEgEfEgEfEgEfEgEfEgEfE'
http 'http://localhost:5000/table?locs=_p~iF~ps |U_ulLnnqC_mqNvxq`@'
but fail to specify sources and targets!
The distance table plugin now assumes `is_course` and `is_destination`
is the same size as `coordinates`.
And happily accesses uninitialized memory.
2016-03-03 02:00:39 +01:00
Patrick Niklaus
0eaa393065
Limit tile zoomlevel to 12+
2016-03-02 19:59:49 +01:00
Daniel Patterson
6d749777fc
Using bind<T> in this case causes ambiguity with GCC 5.2.1 (see http://www.boost.org/doc/libs/develop/libs/bind/doc/html/bind.html#bind.faq.Q_forms ). Remove template and let the type be deduced automatically.
2016-03-02 09:54:08 -08:00
Patrick Niklaus
6c20a4a874
Merge pull request #2040 from davidlowjw/develop
...
Minor typo fix
2016-03-02 16:40:38 +01:00
David Low
79e8d1aac3
Minor typo fix
2016-03-02 15:16:28 +08:00
Daniel J. Hofmann
becae46296
Enable decltype-based result_of type alias
2016-03-01 23:51:26 +01:00