Back to Monaco for examples and benchmarks

.travis.yml

@@ -42,9 +42,7 @@ matrix:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      # Disabled sanitizer since the build was too slow. We need to downgrade our tets dataset from Berlin to Monaco again.
-      #env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_COVERAGE=ON ENABLE_SANITIZER=ON
-      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_COVERAGE=ON ENABLE_SANITIZER=OFF
+      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_COVERAGE=ON ENABLE_SANITIZER=ON
 
     - os: linux
       compiler: "clang-4.0-debug"
@@ -197,7 +195,7 @@ install:
 script:
   - if [[ $TARGET_ARCH == armhf ]] ; then echo "Skip tests for $TARGET_ARCH" && exit 0 ; fi
   - make -C test/data benchmark
-  - ./example/build/osrm-example test/data/ch/berlin.osrm
+  - ./example/build/osrm-example test/data/monaco.osrm
   # All tests assume to be run from the build directory
   - pushd ${OSRM_BUILD_DIR}
   - ./unit_tests/library-tests

appveyor-build.bat

@@ -133,12 +133,12 @@ unit_tests\%Configuration%\server-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 ECHO running library-tests.exe ...
-SET test_region=berlin
-SET test_region_ch=ch\berlin
-SET test_region_corech=corech\berlin
-SET test_region_mld=mld\berlin
+SET test_region=monaco
+SET test_region_ch=ch\monaco
+SET test_region_corech=corech\monaco
+SET test_region_mld=mld\monaco
 SET test_osm=%test_region%.osm.pbf
-IF NOT EXIST %test_osm% powershell Invoke-WebRequest https://s3.amazonaws.com/mapbox/osrm/testing/berlin.osm.pbf -OutFile %test_osm%
+IF NOT EXIST %test_osm% powershell Invoke-WebRequest https://s3.amazonaws.com/mapbox/osrm/testing/monaco.osm.pbf -OutFile %test_osm%
 %Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm%
 MKDIR ch
 XCOPY %test_region%.osrm %test_region%.osrm.* ch\

example/example.cpp

@@ -39,9 +39,9 @@ int main(int argc, const char *argv[])
     // The following shows how to use the Route service; configure this service
     RouteParameters params;
 
-    // Route in Berlin: Alexanderplatz to Hackescher Markt
-    params.coordinates.push_back({util::FloatLongitude{13.414307}, util::FloatLatitude{52.521835}});
-    params.coordinates.push_back({util::FloatLongitude{13.402290}, util::FloatLatitude{52.523728}});
+    // Route in monaco
+    params.coordinates.push_back({util::FloatLongitude{7.419758}, util::FloatLatitude{43.731142}});
+    params.coordinates.push_back({util::FloatLongitude{7.419505}, util::FloatLatitude{43.736825}});
 
     // Response is in JSON format
     json::Object result;
@@ -58,7 +58,7 @@ int main(int argc, const char *argv[])
         const auto distance = route.values["distance"].get<json::Number>().value;
         const auto duration = route.values["duration"].get<json::Number>().value;
 
-        // Warn users if extract does not contain the default Berlin coordinates from above
+        // Warn users if extract does not contain the default coordinates from above
         if (distance == 0 || duration == 0)
         {
             std::cout << "Note: distance or duration is zero. ";

example/example.js

@@ -5,7 +5,7 @@ var OSRM = require('..');
 var path = require('path');
 
 var app = express();
-var osrm = new OSRM(path.join(__dirname,"../test/data/berlin_CH.osrm"));
+var osrm = new OSRM(path.join(__dirname,"../test/data/ch/monaco.osrm"));
 
 // Accepts a query like:
 // http://localhost:8888?start=13.414307,52.521835&end=13.402290,52.523728