Dennis Luxen
593dfd0108
Merging and rebasing of develop into shared_memory
...
Conflicts:
DataStructures/SearchEngine.h
DataStructures/StaticRTree.h
Descriptors/DescriptionFactory.cpp
Library/OSRM.cpp
Library/OSRM.h
RoutingAlgorithms/BasicRoutingInterface.h
RoutingAlgorithms/ShortestPathRouting.h
Server/DataStructures/BaseDataFacade.h
Server/DataStructures/InternalDataFacade.h
Server/DataStructures/QueryObjectsStorage.cpp
Server/DataStructures/SharedDataFacade.h
routed.cpp
2013-10-15 17:04:53 +02:00
Dennis Luxen
02e9f8aef3
Rework facades to accept ServerPaths object as configuration
2013-10-15 15:44:35 +02:00
DennisOSRM
27a760c58c
Move edge-based node out ouf surrounding class
2013-10-15 14:35:36 +02:00
Dennis Luxen
29e6b85f79
Add explicit shmem id for data loading
2013-10-15 14:35:34 +02:00
Dennis Luxen
5b03366909
checking if data files actually exist
2013-10-15 14:35:34 +02:00
Dennis Luxen
252113c838
implementing the fetch of name ids in shared memory
2013-10-15 14:32:45 +02:00
Dennis Luxen
203b215093
loading correct file with rtree leafs and not inner nodes
2013-10-15 14:32:44 +02:00
Dennis Luxen
76ee84dae8
printing debug output
2013-10-15 14:32:44 +02:00
Dennis Luxen
4d00b2ebbb
Renaming variables to properly reflect its content
2013-10-15 14:32:43 +02:00
Dennis Luxen
b87a98bbda
street name file is now more canonical
2013-10-15 14:32:43 +02:00
Dennis Luxen
f76361a345
changing file format for coordinates to be canonical
2013-10-15 14:32:43 +02:00
Dennis Luxen
94e9dd8f28
store name id of edges in shmem, too
2013-10-15 14:32:42 +02:00
Dennis Luxen
90215ca0dd
move shmem stored sizes to 64 bits
2013-10-15 14:32:42 +02:00
Dennis Luxen
83205290de
Reordering resource aquisition
2013-10-15 14:32:42 +02:00
Dennis Luxen
02fd528c32
removing debug output
2013-10-15 14:32:42 +02:00
Dennis Luxen
5a04700bae
create sentinel to adjancency array during preprocessing
2013-10-15 14:32:41 +02:00
Dennis Luxen
9522e6e714
properly check for (non-)empty vectors
2013-10-15 14:32:41 +02:00
Dennis Luxen
7836ea4479
implement GetName() for shared memory (copy&paste)
2013-10-15 14:32:40 +02:00
Dennis Luxen
34048497e7
implement GetName for internal memory
2013-10-15 14:32:40 +02:00
Dennis Luxen
5197422482
fetch ptr from shared memory to via node list
2013-10-15 14:32:40 +02:00
Dennis Luxen
d9987c2734
load street names into internal memory
2013-10-15 14:32:40 +02:00
Dennis Luxen
c9671b4712
load via node information from shared memory
2013-10-15 14:32:40 +02:00
Dennis Luxen
bbf03e3060
Load r-tree search data structure from shared memory
2013-10-15 14:32:40 +02:00
Dennis Luxen
2dd2d3dd7b
adjust facade to pass compilation
2013-10-15 14:31:32 +02:00
Dennis Luxen
b018ea7b1b
Give all data types in shared memory
2013-10-15 14:31:31 +02:00
Dennis Luxen
d6cdca35d4
Use typedef instead of base class
2013-10-15 14:31:31 +02:00
Dennis Luxen
056c95670f
Added list of all data types in shared memory
2013-10-15 14:31:31 +02:00
DennisOSRM
642473244e
fixing include typos
2013-10-15 14:19:53 +02:00
Dennis Luxen
7951795ea4
Implementation of internal data storage
2013-10-15 14:19:53 +02:00
Dennis Luxen
9452c7e0c7
further implementation of data facades
2013-10-15 14:19:52 +02:00
Dennis Luxen
092f1a4959
corrected include fence
2013-10-15 14:14:11 +02:00
Dennis Luxen
21bee7e40c
Further includes in Facades
2013-10-15 14:14:10 +02:00
Dennis Luxen
a9ac0ac725
Mockups for data facades
2013-10-15 14:12:30 +02:00
Dennis Luxen
5dc1ed6696
plugging in base facade ptr
2013-10-15 14:09:40 +02:00
Dennis Luxen
b55f66e69c
added graph data access
2013-10-15 14:08:49 +02:00
Dennis Luxen
fa665c5494
Facade base class to provide all data access
2013-10-15 14:05:42 +02:00
Dennis Luxen
4c6f85fd25
Further includes in Facades
2013-10-15 14:04:12 +02:00
Dennis Luxen
b51d3da7e5
Mockups for data facades
2013-10-15 14:04:11 +02:00
Dennis Luxen
861dbd5977
plugging in base facade ptr
2013-10-15 14:02:31 +02:00
Dennis Luxen
5001fcdd53
added graph data access
2013-10-15 14:02:31 +02:00
Dennis Luxen
eeb47dc724
remove unneeded white spaces
2013-10-15 14:02:31 +02:00
Dennis Luxen
18b57fa6aa
Facade base class to provide all data access
2013-10-15 13:45:45 +02:00
Dennis Luxen
12bb4d75fd
Adding shared memory data types
2013-10-15 13:45:45 +02:00
Dennis Luxen
29499f21c5
License change to (simplified) 2-clause BSD. Good riddance, AGPL
2013-10-14 13:42:28 +02:00
DennisOSRM
467cf73635
load timestamp properly
2013-10-13 14:26:42 +02:00
DennisOSRM
457519eae3
Fixes resource leaks and removes deprecated c_str() calls where possible
2013-10-13 14:13:08 +02:00
Emil Tin
644fad8355
allow old capitalized option names in routed, few other adjustments
2013-10-12 09:59:42 +02:00
Emil Tin
613e38d7f8
use boost program_options in osrm-prepare/routed
2013-10-12 09:59:42 +02:00
DennisOSRM
dee7c339b3
Move edge-based node out ouf surrounding class
2013-10-11 16:14:59 +02:00
Dennis Luxen
2211c69455
Add explicit shmem id for data loading
2013-10-08 18:10:31 +02:00
Dennis Luxen
940b740b24
checking if data files actually exist
2013-10-01 17:37:52 +02:00
Dennis Luxen
ca3464512d
implementing the fetch of name ids in shared memory
2013-10-01 13:25:11 +02:00
Dennis Luxen
73234e7782
loading correct file with rtree leafs and not inner nodes
2013-09-30 15:55:29 +02:00
Dennis Luxen
de8d28ea5f
printing debug output
2013-09-30 15:54:32 +02:00
Dennis Luxen
f965b7129b
Renaming variables to properly reflect its content
2013-09-27 12:00:58 +02:00
Dennis Luxen
333aba8be6
street name file is now more canonical
2013-09-26 18:19:51 +02:00
Dennis Luxen
e9d93ae210
changing file format for coordinates to be canonical
2013-09-26 11:52:15 +02:00
Dennis Luxen
4bf1987bb7
store name id of edges in shmem, too
2013-09-25 18:59:07 +02:00
Dennis Luxen
ae45eed2b1
move shmem stored sizes to 64 bits
2013-09-25 18:58:39 +02:00
Dennis Luxen
7579c41a35
Reordering resource aquisition
2013-09-25 18:26:10 +02:00
Dennis Luxen
4e589c2575
removing debug output
2013-09-25 18:00:12 +02:00
Dennis Luxen
14bd1d01f2
create sentinel to adjancency array during preprocessing
2013-09-24 18:48:02 +02:00
Dennis Luxen
6a0e90ef90
properly check for (non-)empty vectors
2013-09-24 16:24:27 +02:00
Dennis Luxen
71fe8ed80d
implement GetName() for shared memory (copy&paste)
2013-09-24 15:12:06 +02:00
Dennis Luxen
b25fe3d127
implement GetName for internal memory
2013-09-24 14:44:25 +02:00
Dennis Luxen
fc4aef6d89
fetch ptr from shared memory to via node list
2013-09-24 13:54:28 +02:00
Dennis Luxen
6b4fa6a40d
load street names into internal memory
2013-09-24 13:53:38 +02:00
Dennis Luxen
6756eea209
load via node information from shared memory
2013-09-24 13:33:38 +02:00
Dennis Luxen
bf3cd37b49
Load r-tree search data structure from shared memory
2013-09-24 12:07:34 +02:00
Dennis Luxen
6f71092aa4
adjust facade to pass compilation
2013-09-23 19:00:08 +02:00
Dennis Luxen
396dc21903
Give all data types in shared memory
2013-09-23 18:02:45 +02:00
Dennis Luxen
5e2b0ba46c
Use typedef instead of base class
2013-09-23 18:02:16 +02:00
Dennis Luxen
83655e9aef
Added list of all data types in shared memory
2013-09-23 13:41:53 +02:00
DennisOSRM
71fcfa4935
fixing include typos
2013-09-20 21:05:47 +02:00
Dennis Luxen
b343a17b29
Implementation of internal data storage
2013-09-20 18:30:47 +02:00
Dennis Luxen
d5c91b9bda
further implementation of data facades
2013-09-19 18:55:49 +02:00
Dennis Luxen
ac14a7b0da
corrected include fence
2013-09-19 13:59:09 +02:00
Dennis Luxen
c5824765f9
Further includes in Facades
2013-09-19 12:00:36 +02:00
Dennis Luxen
2ab04e7e2f
Mockups for data facades
2013-09-19 12:00:36 +02:00
Dennis Luxen
a08fef172e
plugging in base facade ptr
2013-09-19 12:00:35 +02:00
Dennis Luxen
a04f77e7e0
added graph data access
2013-09-19 12:00:35 +02:00
Dennis Luxen
4900f3e54d
remove unneeded white spaces
2013-09-19 12:00:35 +02:00
Dennis Luxen
5abe7bc7e5
Facade base class to provide all data access
2013-09-19 12:00:35 +02:00
Dennis Luxen
a48aef4039
Adding shared memory data types
2013-09-19 12:00:35 +02:00
Dennis Luxen
e1198f29ce
Refactoring according to new coding guidelines
2013-09-19 11:54:24 +02:00
Dennis Luxen
329e619c8c
fixing coverity issue 1046674 Uninitialized pointer field
2013-09-19 10:42:28 +02:00
Dennis Luxen
fb9822b507
street name list is now a char array /w indices array
2013-08-20 17:05:36 +02:00
Dennis Luxen
b01e30acfd
Moving DataStructures out of Plugin directory
2013-08-14 14:09:42 +02:00
Dennis Luxen
311c50df9f
Moving DataStructures out of Plugin directory
2013-08-14 13:57:57 +02:00
Dennis Luxen
06c8656b9e
Moving DataStructures out of Plugin directory
2013-08-14 13:41:23 +02:00
Dennis Luxen
beb9c1ba74
use proper check for empty string
2013-08-13 18:37:21 +02:00
Dennis Luxen
679688705d
properly order includes
2013-08-11 22:53:31 +02:00
Dennis Luxen
83f0a2c094
Applying syntactic sugar
2013-08-11 22:49:33 +02:00
Dennis Luxen
504817058b
remove checks for data that is not used here, log information through SimpleLogger
2013-08-11 22:35:13 +02:00
Dennis Luxen
a542292ce2
Check if files exist and contain data, fixes #693
2013-08-09 17:47:11 +02:00
Dennis Luxen
0765ebf735
Implements #692
2013-08-09 14:47:09 +02:00
Dennis Luxen
ef221e1c6c
Replacing log macros by more sophisticated mechanism
2013-08-08 14:17:01 +02:00
Dennis Luxen
b405029f0f
Refactoring base config class into proper ini file name
2013-08-06 17:23:40 +02:00
Dennis Luxen
54302a53e1
use exceptions instead of hard abort
2013-08-05 17:28:57 +02:00
DennisOSRM
4a39a4af1c
Check for valid data files. Implements #224
2013-07-22 16:34:06 +02:00
Dennis Luxen
29e363e7fb
some refactoring
2013-06-27 16:09:21 -04:00
Dennis Luxen
2c397bfa0b
First implementation of moving the algorithmic core into a library
2013-06-26 19:48:02 -04:00
Dennis Luxen
4430cbc3cb
First implementation of moving the algorithmic core into a library
2013-06-26 19:47:16 -04:00
Dennis Luxen
fa328c5a78
don't about if timestamp is missing, just warn
2013-06-25 13:27:39 -04:00
DennisOSRM
aa42b2494c
Avoids the implicit lock of #630
2013-05-22 12:06:53 +02:00
DennisOSRM
f057054172
Replacing stringstream based int->string conversion with boost karma
...
based generator
2013-05-22 11:59:12 +02:00
Dane Springmeyer
556b498e06
remove lexical cast, its evil
2013-05-14 20:12:47 -07:00
DennisOSRM
6031a45c68
Avoid aborts like issue #601
2013-03-06 13:50:09 +01:00
Project OSRM
c4693602ef
Adding geometry to production rules
2013-02-25 14:52:35 +01:00
drxzcl
c6840496c0
Add basic CORS headers to allow cross-site access.
...
Add ¨Access-Control-Allow-Origin: *¨ to the HTTP headers of all replies.
This allows use in a cross-origin AJAX situation.
In compliance with the recommendations of section 4.2 of RFC2616, the header
is added before the existing entity headers.
2013-02-22 16:01:30 +01:00
DennisOSRM
2b5e110719
Splitting utility header with ambigious name into two files with better
...
names
2013-01-06 19:03:04 +01:00
DennisOSRM
864c2d9f49
stray const keyword removed that prevented build
2013-01-06 17:58:02 +01:00
DennisOSRM
5b3aacb4b2
removing stringstream
2013-01-06 17:48:18 +01:00
DennisOSRM
bf94866ec0
Fixing signed/unsigned comparisons
2012-12-23 19:34:26 +01:00
DennisOSRM
f7fdb8b54e
Fixes issue #533
2012-12-10 17:44:45 +01:00
DennisOSRM
a255f222ef
Extending timestamp to 25 characters
2012-12-10 16:36:54 +01:00
DennisOSRM
86a5bbac51
fixes issue #530
2012-12-06 20:05:43 +01:00
DennisOSRM
870ed96c24
Replacing atoi by boost::spirit::qi
2012-11-20 12:15:40 +01:00
DennisOSRM
aeff6c8caa
rebasing branch on develop and adding new API features
2012-11-14 12:01:19 +01:00
DennisOSRM
954710d6cc
Renaming utility function to set the name of the used routing service
...
(plugin)
2012-11-14 10:53:07 +01:00
DennisOSRM
1ec49c3914
API calls now get parsed through a grammar using boost::spirit::qi
2012-11-14 10:30:35 +01:00
DennisOSRM
75cd287ab0
Partially fixes issue #420
2012-09-19 17:06:35 +02:00
DennisOSRM
ac588911ba
Fixing warning detected by additional compiler flags
2012-09-19 13:48:04 +02:00
DennisOSRM
db0bb3d749
Fixes issue #406
2012-09-11 15:16:35 +02:00
DennisOSRM
b3ae4f5c7b
Fixes issue #189
2012-08-31 10:36:08 +02:00
DennisOSRM
1fdfac4aaf
Refactoring extraction stuff
2012-08-27 17:40:59 +02:00
DennisOSRM
b7bcc401e7
Print user agent into log
2012-06-08 10:12:42 +02:00
DennisOSRM
cbddbb598f
Limit length of timestamp to 15 characters
2012-05-15 16:43:25 +02:00
DennisOSRM
6769f83d5b
Load timestamp string from file
2012-05-15 14:28:13 +02:00
DennisOSRM
765b1cb3a5
Handling default case in switch statement that should never happen.
2012-05-03 20:51:33 +02:00
DennisOSRM
200028f328
Note the referrer of the URL
2012-05-03 11:07:53 +02:00
DennisOSRM
f8761ecea0
Routing datastructure more seperated from data of original edges
2012-04-25 10:51:16 +02:00
DennisOSRM
1173ac17ee
Fixed serious gzip compression mishap, removed linear complexity at
...
string length, fixed initialization of zlib stream object
2012-04-20 17:06:09 +02:00
DennisOSRM
fed4a83a8f
Accept-Encoding: gzip, deflate is getting parsed also when it's the last
...
header.
2012-04-20 16:19:56 +02:00
DennisOSRM
58e88d43a9
Moving object that holds all query data into seperate object.
2012-04-14 20:07:30 +02:00
DennisOSRM
e104017d4c
Skipping ContractionCleantup entirely. Avoids a big allocation. Removing
...
DELETE() macro.
2012-04-12 19:35:47 +02:00
DennisOSRM
e83891b4fc
API Breaking change. Location of nodes can be specified by a hint.
2012-03-05 19:08:10 +01:00
DennisOSRM
f7cc34c807
Parsing hints from request. If no hint is given, then it is initialized
...
to empty string.
2012-03-05 16:19:46 +01:00
DennisOSRM
f332f39ea6
Merge branch 'master' of
...
https://DennisOSRM@github.com/DennisOSRM/Project-OSRM.git
2012-02-29 14:30:19 +01:00
DennisOSRM
e6ce9d3d29
Adding (commented) log output
2012-02-23 17:04:11 +01:00
DennisOSRM
a88ad71be6
Merge branch 'master' of
...
https://DennisOSRM@github.com/DennisOSRM/Project-OSRM.git
2012-02-23 16:29:55 +01:00
DennisOSRM
ae93423116
Forgot to remove debug output.
2012-02-17 14:19:45 +01:00
DennisOSRM
b897b5d0e2
Query string starts with '?' before first parameter and not '&'. See
...
http://en.wikipedia.org/wiki/Query_string for an explanation. Fixes
issue #121 . Thanks Jochen for the reminder!
2012-02-17 08:45:09 +01:00
DennisOSRM
bb8645dd18
Changed debug output to use output macros instead of std::cout directly
2012-02-09 17:51:05 +01:00
Emil Tin
f511af0f0c
fix compilation on mac; openmp issues and an unneeded typename
2011-11-26 16:42:15 +01:00
Dennis Luxen
bcb39b9e69
performance fixes
2011-08-07 10:56:37 +00:00
Dennis Luxen
96f5c1c735
(experimental) LRU cache turned off, safe delete
2011-07-12 17:12:30 +00:00
Dennis Luxen
ae81a8d118
Bugfixes, plus safe delete, less pointers and speed back on track
2011-07-12 14:03:31 +00:00
Dennis Luxen
f29f6c65a5
Refactored various parts for integration of multi-segment paths
2011-07-11 15:16:14 +00:00
Dennis Luxen
717d25cad0
Parsing via points from URL
2011-07-07 09:32:47 +00:00
Dennis Luxen
57809439a8
Setting reply to ok by default
2011-07-07 09:15:43 +00:00
Dennis Luxen
860e73a633
minor typo
2011-05-26 08:44:00 +00:00
Dennis Luxen
9514c4b811
jsonp support by adding "output=json&jsonp=parseResponse" to URL
2011-04-18 09:18:29 +00:00
Dennis Luxen
51d0b94e90
Output format is selectable with additional parameter to URL: &output={kml,json}
2011-04-18 08:12:44 +00:00
Dennis Luxen
2b639a5a14
RequestHandler object is now returned as reference rather than as pointer. Memory handling should be more clear by that change.
2011-03-14 13:39:16 +00:00
Dennis Luxen
da3789f2ce
Fixing regression and rewrote portions of the memory handling of registered server plugins
2011-03-14 13:35:16 +00:00
Dennis Luxen
a2b096b096
Getting rid of third party dependency for boost_program_options
2011-03-11 16:52:30 +00:00
Dennis Luxen
221080e281
Support for gzip compression when using http 1.1; giving gzip precendence
2011-02-13 11:15:56 +00:00
Dennis Luxen
d0547f3d69
Support http 1.1 deflate compression
2011-02-11 16:12:37 +00:00
Dennis Luxen
e32ba24b6a
fixing ticket 20. stxxl should not complain any more. also, there should be no compiler warnings.
2011-01-14 16:54:42 +00:00
Dennis Luxen
7584c78c25
Forgot to comment some debug code
2011-01-09 21:49:27 +00:00
Dennis Luxen
bfd2a8aee2
This is a large update that brings many internal and architectural changes. The most obvious change to the user is the presence of configuration files for extractLargeNetwork and routed. Optimistically speaking, it should not break anything. Thanks to rskr for support patches and suggestions.
2011-01-09 21:42:27 +00:00