From 45a9a6c4df22b511abe2fb9f461cc619f8e9b46e Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Fri, 11 Mar 2016 05:58:42 +0100 Subject: [PATCH] Switch example to monaco --- .travis.yml | 2 +- example/example.cpp | 6 +++--- test/data/Makefile | 18 +++++++++--------- test/data/data.md5sum | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76e79b76d..d485f01a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -163,7 +163,7 @@ script: - mkdir example/build && pushd example/build - cmake .. - make - - ./osrm-example ../../test/data/berlin-latest.osrm + - ./osrm-example ../../test/data/monaco.osrm - popd - | if [ -n "$RUN_CLANG_FORMAT" ]; then diff --git a/example/example.cpp b/example/example.cpp index 1a59b34a0..5aeb897fe 100644 --- a/example/example.cpp +++ b/example/example.cpp @@ -34,10 +34,10 @@ int main(int argc, const char *argv[]) try osrm::OSRM routing_machine(engine_config); osrm::RouteParameters route_parameters; - // route is in Berlin + // route is in Monaco route_parameters.service = "viaroute"; - route_parameters.AddCoordinate(52.519930, 13.438640); - route_parameters.AddCoordinate(52.513191, 13.415852); + route_parameters.AddCoordinate(43.731142, 7.419758); + route_parameters.AddCoordinate(43.736825, 7.419505); osrm::json::Object json_result; const int result_code = routing_machine.RunQuery(route_parameters, json_result); diff --git a/test/data/Makefile b/test/data/Makefile index 075abe406..ea0f10bc8 100755 --- a/test/data/Makefile +++ b/test/data/Makefile @@ -1,29 +1,29 @@ -BERLIN_URL:=https://s3.amazonaws.com/mapbox/node-osrm/testing/berlin-latest.osm.pbf +MONACO_URL:=https://s3.amazonaws.com/mapbox/osrm/testing/monaco.osm.pbf TOOL_ROOT:=../../build PROFILE_ROOT:=../../profiles OSRM_EXTRACT:=$(TOOL_ROOT)/osrm-extract OSRM_CONTRACT:=$(TOOL_ROOT)/osrm-contract PROFILE:=$(PROFILE_ROOT)/car.lua -all: berlin-latest.osrm.hsgr +all: monaco.osrm.hsgr clean: rm berlin-latest.* -berlin-latest.osm.pbf: - wget $(BERLIN_URL) -O berlin-latest.osm.pbf +monaco.osm.pbf: + wget $(MONACO_URL) -O monaco.osm.pbf -berlin-latest.osrm: berlin-latest.osm.pbf $(PROFILE) $(OSRM_EXTRACT) +monaco.osrm: monaco.osm.pbf $(PROFILE) $(OSRM_EXTRACT) @echo "Verifiyng data file integrity..." md5sum -c data.md5sum @echo "Running osrm-extract..." - $(OSRM_EXTRACT) berlin-latest.osm.pbf -p $(PROFILE) + $(OSRM_EXTRACT) monaco.osm.pbf -p $(PROFILE) -berlin-latest.osrm.hsgr: berlin-latest.osrm $(PROFILE) $(OSRM_CONTRACT) +monaco.osrm.hsgr: monaco.osrm $(PROFILE) $(OSRM_CONTRACT) @echo "Running osrm-contract..." - $(OSRM_CONTRACT) berlin-latest.osrm + $(OSRM_CONTRACT) monaco.osrm checksum: - md5sum berlin-latest.osm.pbf > data.md5sum + md5sum monaco.osm.pbf > data.md5sum .PHONY: clean checksum diff --git a/test/data/data.md5sum b/test/data/data.md5sum index 008701a46..47151b4b1 100644 --- a/test/data/data.md5sum +++ b/test/data/data.md5sum @@ -1 +1 @@ -045af81d07eb9f22e5718db13cf337e4 berlin-latest.osm.pbf +2b8dd9343d5e615afc9c67bcc7028a63 monaco.osm.pbf