set correct version

This reverts commit 872054da00.

.clang-format

@@ -0,0 +1,90 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: false
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:   
+  AfterClass:      true
+  AfterControlStatement: true
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: true
+  AfterStruct:     true
+  AfterUnion:      true
+  BeforeCatch:     true
+  BeforeElse:      true
+  IndentBraces:    true
+BreakBeforeBinaryOperators: false
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit:     100
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories:
+  - Regex:           '^<'
+    Priority:        3
+  - Regex:           '^"(osrm|util|engine|extract|contract)/'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        1
+IndentCaseLabels: false
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
+

.clang-tidy

@@ -0,0 +1,4 @@
+---
+Checks:          '-clang-analyzer-*,google-*,llvm-*,misc-*,readability-*,-google-build-explicit-make-pair,-google-explicit-constructor,-google-readability-braces-around-statements,-google-readability-casting,-google-readability-namespace-comments,-google-readability-function,-google-readability-todo,-google-runtime-int,-llvm-namespace-comment,-llvm-header-guard,-llvm-twine-local,-misc-argument-comment,-readability-braces-around-statements,-readability-identifier-naming'
+...
+

.cncc.style

@@ -0,0 +1,14 @@
+# Kind-specific patterns to check AST nodes against. Both python-clang and
+# libclang docs explain CursorKind, with differences in detail. See also:
+#  - https://github.com/llvm-mirror/clang/blob/aca4fe314a55cacae29e1548cb7bfd2119c6df4c/bindings/python/clang/cindex.py#L599
+#  - http://clang.llvm.org/doxygen/group__CINDEX.html#gaaccc432245b4cd9f2d470913f9ef0013
+#  - https://docs.python.org/2/library/re.html#regular-expression-syntax
+
+class_decl: '^([A-Z]+[a-z]+)+$'
+struct_decl: '^([A-Z]+[a-z]+)+$'
+field_decl: '^[a-z_]+$'
+var_decl: '^[a-z]+[a-z0-9_]*$'
+parm_decl: '^[a-z]*[a-z0-9_]*$'
+namespace: '^[a-z_]*$'
+cxx_method: '^([A-Z]+[a-z]+)+$'
+function_decl: '^[a-z]+([A-Z]+[a-z]+)*$'

.eslintrc

@@ -0,0 +1,28 @@
+{
+    "rules": {
+        "indent": [
+            2,
+            4
+        ],
+        "quotes": [
+            1,
+            "single"
+        ],
+        "linebreak-style": [
+            2,
+            "unix"
+        ],
+        "semi": [
+            2,
+            "always"
+        ],
+        "no-console": [
+            1
+        ]
+    },
+    "env": {
+        "es6": true,
+        "node": true
+    },
+    "extends": "eslint:recommended"
+}

.gitignore

@@ -1,2 +1,91 @@
-/.settings
+# pre compiled dependencies #
-/.project
+#############################
+osrm-deps
+
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# build related files #
+#######################
+/build/
+/example/build/
+/test/data/monaco*
+/cmake/postinst
+
+# Eclipse related files #
+#########################
+.setting*
+.scb
+.cproject
+.project
+
+# stxxl related files #
+#######################
+.stxxl
+stxxl.log
+stxxl.errlog
+
+# Compiled Binary Files #
+####################################
+/osrm-extract
+/osrm-io-benchmark
+/osrm-components
+/osrm-routed
+/osrm-datastore
+/osrm-prepare
+/osrm-unlock-all
+/osrm-cli
+/osrm-check-hsgr
+/osrm-springclean
+/nohup.out
+
+# Sandbox folder #
+###################
+/sandbox/
+
+# Test related files #
+######################
+/test/profile.lua
+/test/cache
+/test/speeds.csv
+/test/penalties.csv
+/test/data/monaco.*
+node_modules
+
+# Deprecated config file #
+##########################
+/server.ini
+
+*.swp

.travis.yml

@@ -0,0 +1,198 @@
+language: cpp
+
+git:
+  depth: 10
+
+# sudo:required is needed for trusty images
+sudo: required
+dist: trusty
+
+notifications:
+  email: false
+
+branches:
+  only:
+    - master
+    - "5.3"
+
+cache:
+  ccache: true
+  apt: true
+  directories:
+    - test/cache
+
+env:
+  global:
+   - CCACHE_TEMPDIR=/tmp/.ccache-temp
+   - CCACHE_COMPRESS=1
+   - CASHER_TIME_OUT=1000
+   - JOBS=4
+
+matrix:
+  fast_finish: true
+
+  # We override the compiler names here to yield better ccache behavior, which uses this as key
+  include:
+
+    # Debug Builds
+    - os: linux
+      compiler: "gcc-5-debug"
+      addons: &gcc5
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Debug' COVERAGE=ON
+
+    - os: linux
+      compiler: "gcc-4.8-debug"
+      addons: &gcc48
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+      env: CCOMPILER='gcc-4.8' CXXCOMPILER='g++-4.8' BUILD_TYPE='Debug'
+
+    - os: linux
+      compiler: "clang-3.8-debug"
+      addons: &clang38
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['libstdc++-5-dev', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+      env: CLANG_VERSION='3.8.0' BUILD_TYPE='Debug' RUN_CLANG_FORMAT=ON
+
+    - os: osx
+      osx_image: xcode7.3
+      compiler: clang
+      env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Debug' JOBS=1 CUCUMBER_TIMEOUT=60000
+
+    # Release Builds
+    - os: linux
+      compiler: "gcc-5-release"
+      addons: &gcc5
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release'
+
+    - os: linux
+      compiler: "gcc-5-release-i686"
+      env: TARGET_ARCH='i686' CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release'
+
+    - os: linux
+      compiler: "gcc-4.8-release-armhf"
+      env: TARGET_ARCH='armhf' CCOMPILER='arm-linux-gnueabihf-gcc-4.8' CXXCOMPILER='arm-linux-gnueabihf-g++-4.8' BUILD_TYPE='Release'
+
+      # Disabled because of CI slowness
+      #- os: linux
+      #- compiler: gcc
+      #- addons: &gcc48
+      #-   apt:
+      #-     sources: ['ubuntu-toolchain-r-test']
+      #-     packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      #- env: CCOMPILER='gcc-4.8' CXXCOMPILER='g++-4.8' BUILD_TYPE='Release'
+
+      # Disabled because of CI slowness
+      #- os: linux
+      #- compiler: clang
+      #- addons: &clang38
+      #-   apt:
+      #-     sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
+      #-     packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      #- env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release'
+
+      # Disabled because of CI slowness
+      #- os: osx
+      #- osx_image: xcode7.3
+      #- compiler: clang
+      #- env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Release'
+
+    # Shared Library
+    - os: linux
+      compiler: "gcc-5-release-shared"
+      addons: &gcc5
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
+
+      # Disabled because CI slowness
+      #- os: linux
+      #- compiler: clang
+      #- addons: &clang38
+      #-   apt:
+      #-     sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
+      #-     packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      #- env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
+
+before_install:
+  - if [[ ! -z $TARGET_ARCH ]] ; then source ./scripts/travis/before_install.$TARGET_ARCH.sh ; fi
+  - if [[ $(uname -s) == 'Darwin' ]]; then sudo mdutil -i off /; fi;
+  - source ./scripts/install_node.sh 4
+  - npm install
+  - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
+  - export PATH=${DEPS_DIR}/bin:${PATH} && mkdir -p ${DEPS_DIR}
+  - CMAKE_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/cmake/3.5.2.tar.gz"
+  - travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR} || exit 1
+  - |
+    if [[ ${CLANG_VERSION:-false} != false ]]; then
+      export CCOMPILER='clang'
+      export CXXCOMPILER='clang++'
+      CLANG_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/clang/${CLANG_VERSION}.tar.gz"
+      travis_retry wget --quiet -O - ${CLANG_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR} || exit 1
+    fi
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
+      # implicit deps, but seem to be installed by default with recent images: libxml2 GDAL boost
+      brew install libzip libstxxl lua51 luabind tbb md5sha1sum ccache
+    fi
+
+install:
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+      ./scripts/check_taginfo.py taginfo.json profiles/car.lua
+    fi
+  - mkdir build && pushd build
+  - export CC=${CCOMPILER} CXX=${CXXCOMPILER}
+  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DCOVERAGE=${COVERAGE:-OFF} -DBUILD_TOOLS=1 -DENABLE_CCACHE=ON
+  - echo "travis_fold:start:MAKE"
+  - make osrm-extract --jobs=3
+  - make --jobs=${JOBS}
+  - make tests --jobs=${JOBS}
+  - make benchmarks --jobs=${JOBS}
+  - echo "travis_fold:end:MAKE"
+  - ccache -s
+  - sudo make install
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+      sudo ldconfig
+    fi
+  - popd
+  - mkdir example/build && pushd example/build
+  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
+  - make
+  - popd
+
+script:
+  - if [[ $TARGET_ARCH == armhf ]] ; then echo "Skip tests for $TARGET_ARCH" && exit 0 ; fi
+  - echo "travis_fold:start:BENCHMARK"
+  - make -C test/data benchmark
+  - echo "travis_fold:end:BENCHMARK"
+  - ./example/build/osrm-example test/data/monaco.osrm
+  # All tests assume to be run from the build directory
+  - pushd build
+  - ./unit_tests/library-tests ../test/data/monaco.osrm
+  - ./unit_tests/extractor-tests
+  - ./unit_tests/engine-tests
+  - ./unit_tests/util-tests
+  - ./unit_tests/server-tests
+  - popd
+  - npm test
+
+after_success:
+  - |
+    if [ -n "${RUN_CLANG_FORMAT}" ]; then
+      ./scripts/format.sh # we don't want to fail just yet
+    fi
+  - |
+    if [ -n "${COVERAGE}" ]; then
+      bash <(curl -s https://codecov.io/bash)
+    fi

AUTHORS.md

@@ -1,17 +0,0 @@
-The following people contributed to the Open Source Routing Machine web frontend:
-
-Dennis Schieferdecker 
-Dennis Luxen
-Pascal Neis
-Teemu Koskinen
-Nicolas Belett Vigneron
-Moyg
-Jean-Frederic
-Zbigniew Czernik
-Jonas Häggqvist
-Sabas
-Paul Spencer
-Raphael Pinson
-Juan Luis Rodriguez Ponce
-Lauris Bukšis-Haberkorns
-Barboska

CHANGELOG.md

@@ -0,0 +1,309 @@
+# 5.3.3
+  Changes from 5.3.2
+    - Bugfixes
+      - Fixed an issue that would result in segfaults for viaroutes with an invalid intermediate segment when u-turns were allowed at the via-location
+      - Fixed an issue that could result in segfaults when querying roads that could require looping back to the start of a way while using a core factor
+      - Fixed an issue that could break some testcases when using a core factor
+      - Fixed an issue with parallel edges that could result in weird routes
+
+# 5.3.2
+  Changes from 5.3.1
+    - Bugfixes
+      - fixed a bug that occurred when trimming very short segments at the begin/end of a route (less than 1 meter)
+
+# 5.3.1
+  Changes from 5.3.1
+    - Bugfixes:
+      - Disabled broken lane handling for complex uturn/oneway combinations for now (190 intersections affected on the planet)
+      - Fixed a bug with overlaping geometries, which broke OSRM on recent Egypt extracts with data-modelling issues
+
+# 5.3.0
+  Changes from 5.3.0-rc.3
+    - Guidance
+      - Only announce `use lane` on required turns (not using all lanes to go straight)
+      - Moved `lanes` to the intersection objects. This is BREAKING in relation to other Release Candidates but not with respect to other releases.
+    - Bugfixes
+      - Fix BREAKING: bug that could result in failure to load 'osrm.icd' files. This breaks the dataformat
+      - Fix: bug that results in segfaults when `use lane` instructions are suppressed
+
+  Changes form 5.2.7
+    - API
+      - Introduces new `TurnType` in the form of `use lane`. The type indicates that you have to stick to a lane without turning
+      - Introduces `lanes` to the `Intersection` object. The lane data contains both the markings at the intersection and a flag indicating if they can be chosen for the next turn
+      - Removed unused `-s` from `osrm-datastore`
+    - Guidance
+      - Only announce `use lane` on required turns (not using all lanes to go straight)
+      - Improved detection of obvious turns
+      - Improved turn lane detection
+      - Reduce the number of end-of-road instructions in obvious cases
+    - Profile:
+      - bicycle.lua: Surface speeds never increase the actual speed
+    - Infrastructure
+      - Add 32bit support
+      - Add ARM NEON/VFP support
+      - Fix Windows builds
+      - Optimize speed file updates using mmap
+      - Add option to disable LTO for older compilers
+      - BREAKING: The new turn type changes the turn-type order. This breaks the **data format**.
+      - BREAKING: Turn lane data introduces two new files (osrm.tld,osrm.tls). This breaks the fileformat for older versions.
+    - Bugfixes:
+      - Fix devide by zero on updating speed data using osrm-contract
+
+# 5.3.0 RC3
+  Changes from 5.3.0-rc.2
+    - Guidance
+      - Improved detection of obvious turns
+      - Improved turn lane detection
+    - Bugfixes
+      - Fix bug that didn't chose minimal weights on overlapping edges
+
+# 5.3.0 RC2
+  Changes from 5.3.0-rc.1
+    - Bugfixes
+      - Fixes invalid checks in the lane-extraction part of the car profile
+
+# 5.3.0 RC1
+    - API
+     - Introduces new `TurnType` in the form of `use lane`. The type indicates that you have to stick to a lane without turning
+     - Introduces lanes to the route response. The lane data contains both the markings at the intersection and a flag indicating their involvement in the turn
+
+    - Infrastructure
+     - BREAKING: The new turn type changes the turn-type order. This breaks the **data format**.
+     - BREAKING: Turn lane data introduces two new files (osrm.tld,osrm.tls). This breaks the fileformat for older versions.
+
+# 5.2.5
+  - Bugfixes
+    - Fixes a segfault caused by incorrect trimming logic for very short steps.
+
+# 5.2.4
+  - Bugfixes:
+    - Fixed in issue that arised on roundabouts in combination with intermediate intersections and sliproads
+
+# 5.2.3
+  - Bugfixes:
+    - Fixed an issue with name changes in roundabouts that could result in crashes
+
+# 5.2.2
+  Changes from 5.2.1
+  - Bugfixes:
+    - Buffer overrun in tile plugin response handling
+
+# 5.2.1
+  Changes from 5.2.0
+  - Bugfixes:
+    - Removed debug statement that was spamming the console
+
+# 5.2.0
+  Changes from 5.2.0 RC2
+   - Bugfixes:
+     - Fixed crash when loading shared memory caused by invalid OSM IDs segment size.
+     - Various small instructions handling fixes
+
+   Changes from 5.1.0
+   - API:
+     - new parameter `annotations` for `route`, `trip` and `match` requests.  Returns additional data about each
+       coordinate along the selected/matched route line per `RouteLeg`:
+         - duration of each segment
+         - distance of each segment
+         - OSM node ids of all segment endpoints
+     - Introducing Intersections for Route Steps. This changes the API format in multiple ways.
+         - `bearing_before`/`bearing_after` of `StepManeuver` are now deprecated and will be removed in the next major release
+         - `location` of `StepManeuvers` is now deprecated and will be removed in the next major release
+         - every `RouteStep` now has property `intersections` containing a list of `Intersection` objects.
+     - Support for destination signs. New member `destinations` in `RouteStep`, based on `destination` and `destination:ref`
+     - Support for name pronunciations. New member `pronunciation` in `RouteStep`, based on `name:pronunciation`
+
+   - Profile changes:
+     - duration parser now accepts P[n]DT[n]H[n]M[n]S, P[n]W, PTHHMMSS and PTHH:MM:SS ISO8601 formats.
+     - `result.destinations` allows you to set a way's destinations
+     - `result.pronunciation` allows you to set way name pronunciations
+     - `highway=motorway_link` no longer implies `oneway` as per the OSM Wiki
+
+   - Infrastructure:
+     - BREAKING: Changed the on-disk encoding of the StaticRTree to reduce ramIndex file size. This breaks the **data format**
+     - BREAKING: Intersection Classification adds a new file to the mix (osrm.icd). This breaks the fileformat for older versions.
+     - Better support for osrm-routed binary upgrade on the fly [UNIX specific]:
+       - Open sockets with SO_REUSEPORT to allow multiple osrm-routed processes serving requests from the same port.
+       - Add SIGNAL_PARENT_WHEN_READY environment variable to enable osrm-routed signal its parent with USR1 when it's running and waiting for requests.
+     - Disable http access logging via DISABLE_ACCESS_LOGGING environment variable.
+
+   - Guidance:
+     - BREAKING: modifies the file format with new internal identifiers
+     - improved detection of turning streets, not reporting new-name in wrong situations
+     - improved handling of sliproads (emit turns instead of 'take the ramp')
+     - improved collapsing of instructions. Some 'new name' instructions will be suppressed if they are without alternative and the segment is short
+
+   - Bugfixes
+     - fixed broken summaries for very short routes
+
+# 5.2.0 RC2
+   Changes from 5.2.0 RC1
+
+   - Guidance:
+     - improved handling of sliproads (emit turns instead of 'take the ramp')
+     - improved collapsing of instructions. Some 'new name' instructions will be suppressed if they are without alternative and the segment is short
+     - BREAKING: modifies the file format with new internal identifiers
+
+   - API:
+     - paramater `annotate` was renamed to `annotations`.
+     - `annotation` as accidentally placed in `Route` instead of `RouteLeg`
+     - Support for destination signs. New member `destinations` in `RouteStep`, based on `destination` and `destination:ref`
+     - Support for name pronunciations. New member `pronunciation` in `RouteStep`, based on `name:pronunciation`
+     - Add `nodes` property to `annotation` in `RouteLeg` containing the ids of nodes covered by the route
+
+   - Profile changes:
+     - `result.destinations` allows you to set a way's destinations
+     - `result.pronunciation` allows you to set way name pronunciations
+     - `highway=motorway_link` no longer implies `oneway` as per the OSM Wiki
+
+   - Infrastructure
+     - BREAKING: Changed the on-disk encoding of the StaticRTree to reduce ramIndex file size. This breaks the **data format**
+
+   - Bugfixes
+     - fixed broken summaries for very short routes
+
+# 5.2.0 RC1
+   Changes from 5.1.0
+
+   - API:
+     - new parameter `annotate` for `route` and `match` requests.  Returns additional data about each
+       coordinate along the selected/matched route line.
+     - Introducing Intersections for Route Steps. This changes the API format in multiple ways.
+         - `bearing_before`/`bearing_after` of `StepManeuver` are now deprecated and will be removed in the next major release
+         - `location` of `StepManeuvers` is now deprecated and will be removed in the next major release
+         - every `RouteStep` now has property `intersections` containing a list of `Intersection` objects.
+
+   - Profile changes:
+     - duration parser now accepts P[n]DT[n]H[n]M[n]S, P[n]W, PTHHMMSS and PTHH:MM:SS ISO8601 formats.
+
+   - Infrastructure:
+     - Better support for osrm-routed binary upgrade on the fly [UNIX specific]:
+       - Open sockets with SO_REUSEPORT to allow multiple osrm-routed processes serving requests from the same port.
+       - Add SIGNAL_PARENT_WHEN_READY environment variable to enable osrm-routed signal its parent with USR1 when it's running and waiting for requests.
+     - BREAKING: Intersection Classification adds a new file to the mix (osrm.icd). This breaks the fileformat for older versions.
+     - Disable http access logging via DISABLE_ACCESS_LOGGING environment
+       variable.
+
+   - Guidance:
+     - improved detection of turning streets, not reporting new-name in wrong situations
+
+# 5.1.0
+   Changes with regard to 5.0.0
+
+   - API:
+     - added StepManeuver type `roundabout turn`. The type indicates a small roundabout that is treated as an intersection
+        (turn right at the roundabout for first exit, go straight at the roundabout...)
+     - added StepManeuver type `on ramp` and `off ramp` to distinguish between ramps that enter and exit a highway.
+     - reduced new name instructions for trivial changes
+     - combined multiple turns into a single instruction at segregated roads`
+
+   - Profile Changes:
+    - introduced a suffix_list / get_name_suffix_list to specify name suffices to be suppressed in name change announcements
+    - street names are now consistently assembled for the car, bike and walk profile as: "Name (Ref)" as in "Berlin (A5)"
+    - new `car.lua` dependency `lib/destination.lua`
+    - register a way's .nodes() function for use in the profile's way_function.
+
+   - Infrastructure
+    - BREAKING: reordered internal instruction types. This breaks the **data format**
+    - BREAKING: Changed the on-disk encoding of the StaticRTree for better performance. This breaks the **data format**
+
+   - Fixes:
+    - Issue #2310: post-processing for local paths, fixes #2310
+    - Issue #2309: local path looping, fixes #2309
+    - Issue #2356: Make hint values optional
+    - Issue #2349: Segmentation fault in some requests
+    - Issue #2335: map matching was using shortest path with uturns disabled
+    - Issue #2193: Fix syntax error position indicators in parameters queries
+    - Fix search with u-turn
+    - PhantomNode packing in MSVC now the same on other platforms
+    - Summary is now not malformed when including unnamed roads
+    - Emit new-name on when changing fron unanmed road to named road
+
+# 5.0.0
+   Changes with regard 5.0.0 RC2:
+   - API:
+     - if `geometry=geojson` is passed the resulting geometry can be a LineString or Point
+       depending on how many coordinates are present.
+     - the removal of the summary field was revered. for `steps=flase` the field will always be an empty string.
+
+   Changes with regard to 4.9.1:
+   - API:
+     - BREAKING: Complete rewrite of the HTTP and library API. See detailed documentation in the wiki.
+     - BREAKING: The default coordinate order is now `longitude, latidue`. Exception: Polyline geometry
+         which follow the original Google specification of `latitdue, longitude`.
+     - BREAKING: Polyline geometries now use precision 5, instead of previously 6
+     - BREAKING: Removed GPX support
+     - New service `tile` which serves debug vector tiles of the road network
+     - Completely new engine for guidance generation:
+        - Support for highway ramps
+        - Support for different intersection types (end of street, forks, merges)
+        - Instruction post-processing to merge unimportant instructions
+        - Improved handling of roundabouts
+
+   - Tools:
+     - BREAKING: Renamed osrm-prepare to osrm-contract
+     - BREAKING: Removes profiles from osrm-contract, only needed in osrm-extract.
+     - Abort processing in osrm-extract if there are no snappable edges remaining.
+     - Added .properties file to osrm-extract ouput.
+     - Enables the use of multiple segment-speed-files on the osrm-contract command line
+
+   - Profile changes:
+     - Remove movable bridge mode
+     - Add `maxspeed=none` tag to car profile.
+     - A `side_road` tag support for the OSRM car profile.
+
+   - Fixes:
+     - Issue #2150: Prevents routing over delivery ways and nodes
+     - Issue #1972: Provide uninstall target
+     - Issue #2072: Disable alternatives by default and if core factor < 1.0
+     - Issue #1999: Fix unpacking for self-loop nodes not in core.
+
+   - Infrastructure:
+     - Cucumber test suit is now based on cucumber-js, removes Ruby as dependency
+     - Updated to mapbox/variant v1.1
+     - Updated to libosmium v2.6.1
+     - Remove GeoJSON based debugging output, replaced by debug tiles
+
+
+# 5.0.0 RC2
+   - Profiles:
+      - `properties.allow_uturns_at_via` -> `properties.continue_straight_at_waypoint` (value is inverted!)
+   - API:
+      - Removed summary from legs property
+      - Disable steps and alternatives by default
+      - Fix `code` field: 'ok' -> 'Ok'
+      - Allow 4.json and 4.3.json format
+      - Conform to v5 spec and support "unlimited" as radiuses value.
+      - `uturns` parameter was replaced by `continue_straight` (value is inverted!)
+   - Features:
+      - Report progress for gennerating edge expanded edges in the edge based graph factory
+      - Add maxspeed=none tag to car profile.
+      - Optimize StaticRTree code: speedup 2x (to RC1)
+      - Optimize DouglasPeucker code: speedup 10x (to RC1)
+      - Optimize WebMercator projection: speedup 2x (to RC1)
+   - Bugs:
+      - #2195: Resolves issues with multiple includedirs in pkg-config file
+      - #2219: Internal server error when using the match plugin
+      - #2027: basename -> filename
+      - #2168: Report correct position where parsing failed
+      - #2036: Add license to storage and storage config exposed in public API
+      - Fix uturn detection in match plugin
+      - Add missing -lz to fix linking of server-tests
+
+# 5.0.0 RC1
+   - Renamed osrm-prepare into osrm-contract
+   - osrm-contract does not need a profile parameter anymore
+   - New public HTTP API, find documentation [here](https://github.com/Project-OSRM/osrm-backend/wiki/New-Server-api)
+   - POST support is discontinued, please use library bindings for more complex requests
+   - Removed timestamp plugin
+   - Coordinate order is now Longitude,Latitude
+   - Cucumber tests now based on Javascript (run with `npm test`)
+   - Profile API changed:
+      - `forward_mode` and `backward_mode` now need to be selected from a pre-defined list
+      - Global profile properties are now stored in a global `properties` element. This includes:
+        - `properties.traffic_signal_penalty`
+        - `properties.use_turn_restrictions`
+        - `properties.u_turn_penalty`
+        - `properties.allow_u_turn_at_via`
+
+

CMakeLists.txt

@@ -0,0 +1,500 @@
+cmake_minimum_required(VERSION 2.8.11)
+# we depend on 2.8.11 introducing target_include_directories
+
+if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR AND NOT MSVC_IDE)
+  message(FATAL_ERROR "In-source builds are not allowed.
+Please create a directory and run cmake from there, passing the path to this source directory as the last argument.
+This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. Please delete them.")
+endif()
+
+project(OSRM C CXX)
+set(OSRM_VERSION_MAJOR 5)
+set(OSRM_VERSION_MINOR 3)
+set(OSRM_VERSION_PATCH 3)
+
+# these two functions build up custom variables:
+#   OSRM_INCLUDE_PATHS and OSRM_DEFINES
+# These variables we want to pass to
+# include_directories and add_definitions for both
+# this build and for sharing externally via pkg-config
+
+function(add_dependency_includes includes)
+  list(APPEND OSRM_INCLUDE_PATHS "${includes}")
+  set(OSRM_INCLUDE_PATHS "${OSRM_INCLUDE_PATHS}" PARENT_SCOPE)
+endfunction(add_dependency_includes)
+
+function(add_dependency_defines defines)
+  list(APPEND OSRM_DEFINES "${defines}")
+  set(OSRM_DEFINES "${OSRM_DEFINES}" PARENT_SCOPE)
+endfunction(add_dependency_defines)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+include(CheckCXXCompilerFlag)
+include(FindPackageHandleStandardArgs)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+set(bitness 32)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(bitness 64)
+  message(STATUS "Building on a 64 bit system")
+else()
+  message(STATUS "Building on a 32 bit system")
+endif()
+
+if(WIN32 AND MSVC_VERSION LESS 1900)
+  message(FATAL_ERROR "Building with Microsoft compiler needs Latest Visual Studio 2015 (Community or better)")
+endif()
+
+option(ENABLE_CCACHE "Speed up incremental rebuilds via ccache" ON)
+option(ENABLE_JSON_LOGGING "Adds additional JSON debug logging to the response" OFF)
+option(BUILD_TOOLS "Build OSRM tools" OFF)
+option(BUILD_COMPONENTS "Build osrm-components" OFF)
+option(ENABLE_ASSERTIONS OFF)
+option(COVERAGE OFF)
+option(SANITIZER OFF)
+option(ENABLE_LTO "Use LTO if available" ON)
+
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/)
+
+add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND}
+  "-DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}"
+  "-DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
+  -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/FingerPrint-Config.cmake"
+  COMMENT "Configuring revision fingerprint"
+  VERBATIM)
+
+set(BOOST_COMPONENTS date_time filesystem iostreams program_options regex system thread)
+
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/util/version.hpp.in
+  ${CMAKE_CURRENT_BINARY_DIR}/include/util/version.hpp
+)
+file(GLOB UtilGlob src/util/*.cpp src/util/*/*.cpp)
+file(GLOB ExtractorGlob src/extractor/*.cpp src/extractor/*/*.cpp)
+file(GLOB ContractorGlob src/contractor/*.cpp)
+file(GLOB StorageGlob src/storage/*.cpp)
+file(GLOB ServerGlob src/server/*.cpp src/server/**/*.cpp)
+file(GLOB EngineGlob src/engine/*.cpp src/engine/**/*.cpp)
+
+add_library(UTIL OBJECT ${UtilGlob})
+add_library(EXTRACTOR OBJECT ${ExtractorGlob})
+add_library(CONTRACTOR OBJECT ${ContractorGlob})
+add_library(STORAGE OBJECT ${StorageGlob})
+add_library(ENGINE OBJECT ${EngineGlob})
+add_library(SERVER OBJECT ${ServerGlob})
+
+add_dependencies(UTIL FingerPrintConfigure)
+set_target_properties(UTIL PROPERTIES LINKER_LANGUAGE CXX)
+
+add_executable(osrm-extract src/tools/extract.cpp)
+add_executable(osrm-contract src/tools/contract.cpp)
+add_executable(osrm-routed src/tools/routed.cpp $<TARGET_OBJECTS:SERVER> $<TARGET_OBJECTS:UTIL>)
+add_executable(osrm-datastore src/tools/store.cpp $<TARGET_OBJECTS:UTIL>)
+add_library(osrm src/osrm/osrm.cpp $<TARGET_OBJECTS:ENGINE> $<TARGET_OBJECTS:UTIL> $<TARGET_OBJECTS:STORAGE>)
+add_library(osrm_extract $<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
+add_library(osrm_contract $<TARGET_OBJECTS:CONTRACTOR> $<TARGET_OBJECTS:UTIL>)
+add_library(osrm_store $<TARGET_OBJECTS:STORAGE> $<TARGET_OBJECTS:UTIL>)
+
+# Check the release mode
+if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
+  set(CMAKE_BUILD_TYPE Release)
+endif()
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+  message(STATUS "Configuring OSRM in debug mode")
+  set(ENABLE_ASSERTIONS ON)
+  if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-inline -fno-omit-frame-pointer")
+
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og -ggdb")
+  endif()
+
+  endif()
+endif()
+if(CMAKE_BUILD_TYPE MATCHES Release)
+  message(STATUS "Configuring OSRM in release mode")
+  # Check if LTO is available
+  check_cxx_compiler_flag("-flto" LTO_AVAILABLE)
+  if(ENABLE_LTO AND LTO_AVAILABLE)
+    set(OLD_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+    # GCC in addition allows parallelizing LTO
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+      include(ProcessorCount)
+      ProcessorCount(NPROC)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto=${NPROC}")
+    else()
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
+    endif()
+    set(CHECK_LTO_SRC "int main(){return 0;}")
+    check_cxx_source_compiles("${CHECK_LTO_SRC}" LTO_WORKS)
+    if(LTO_WORKS)
+      message(STATUS "LTO working")
+    else()
+      message(STATUS "LTO broken")
+      set(CMAKE_CXX_FLAGS "${OLD_CXX_FLAGS}")
+    endif()
+
+    # Since gcc 4.9 the LTO format is non-standart ('slim'), so we need to use the build-in tools
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
+        NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW)
+      message(STATUS "Using gcc specific binutils for LTO.")
+      set(CMAKE_AR     "/usr/bin/gcc-ar")
+      set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
+    endif()
+
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0")
+      message(STATUS "Disabling LTO on GCC < 4.9.0 since it is broken, see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57038")
+      set(CMAKE_CXX_FLAGS "${OLD_CXX_FLAGS}")
+    endif()
+  endif()
+endif()
+
+set(MAYBE_COVERAGE_LIBRARIES "")
+if (COVERAGE)
+  if (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+    message(ERROR "COVERAGE=ON only make sense with a Debug build")
+  endif()
+  message(INFO "Enabling coverage")
+  set(MAYBE_COVERAGE_LIBRARIES "gcov")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs")
+endif()
+if (SANITIZER)
+  if (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+    message(ERROR "SANITIZER=ON only make sense with a Debug build")
+  endif()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+endif()
+
+# Configuring compilers
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wuninitialized -Wunreachable-code -Wstrict-overflow=2 -D_FORTIFY_SOURCE=2 -fPIC -fcolor-diagnostics")
+elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+  set(COLOR_FLAG "-fdiagnostics-color=auto")
+  check_cxx_compiler_flag("-fdiagnostics-color=auto" HAS_COLOR_FLAG)
+  if(NOT HAS_COLOR_FLAG)
+    set(COLOR_FLAG "")
+  endif()
+  # using GCC
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wuninitialized -Wunreachable-code -Wstrict-overflow=1 -D_FORTIFY_SOURCE=2 ${COLOR_FLAG} -fPIC")
+  if(WIN32) # using mingw
+    add_dependency_defines(-DWIN32)
+    set(OPTIONAL_SOCKET_LIBS ws2_32 wsock32)
+  endif()
+elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+  # using Intel C++
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel -wd10237 -Wall -ipo -fPIC")
+elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+  # using Visual Studio C++
+  set(BOOST_COMPONENTS ${BOOST_COMPONENTS} date_time chrono zlib)
+  add_dependency_defines(-DBOOST_LIB_DIAGNOSTIC)
+  add_dependency_defines(-D_CRT_SECURE_NO_WARNINGS)
+  add_dependency_defines(-DNOMINMAX) # avoid min and max macros that can break compilation
+  add_dependency_defines(-D_USE_MATH_DEFINES) #needed for M_PI with cmath.h
+  add_dependency_defines(-D_WIN32_WINNT=0x0501)
+  add_dependency_defines(-DXML_STATIC)
+  find_library(ws2_32_LIBRARY_PATH ws2_32)
+  target_link_libraries(osrm-extract wsock32 ws2_32)
+endif()
+
+# Configuring linker
+execute_process(COMMAND ${CMAKE_CXX_COMPILER} "-Wl,--version" ERROR_QUIET OUTPUT_VARIABLE LINKER_VERSION)
+# For ld.gold and ld.bfs (the GNU linkers) we optimize hard
+if("${LINKER_VERSION}" MATCHES "GNU gold" OR "${LINKER_VERSION}" MATCHES "GNU ld")
+  message(STATUS "Setting linker optimizations")
+  if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+    # Tell compiler to put every function in separate section, linker can then match sections and functions
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections")
+    # Tell linker to do dead code and data eminination during link time discarding sections
+    set(LINKER_FLAGS "${LINKER_FLAGS} -Wl,--gc-sections")
+  endif()
+  # Default linker optimization flags
+  set(LINKER_FLAGS "${LINKER_FLAGS} -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common")
+else()
+  message(STATUS "Using unknown linker, not setting linker optimizations")
+endif ()
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
+set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
+
+# Activate C++11
+if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+endif()
+
+# Configuring other platform dependencies
+if(APPLE)
+  set(CMAKE_OSX_ARCHITECTURES "x86_64")
+  message(STATUS "Set Architecture to x64 on OS X")
+  exec_program(uname ARGS -v  OUTPUT_VARIABLE DARWIN_VERSION)
+  string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
+  if(OSXLIBSTD)
+    message(STATUS "linking against ${OSXLIBSTD}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=${OSXLIBSTD}")
+  elseif(DARWIN_VERSION GREATER 12)
+    message(STATUS "linking against libc++")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+  endif()
+endif()
+
+if(UNIX AND NOT APPLE)
+  set(MAYBE_RT_LIBRARY rt)
+endif()
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/cmake")
+set(OSMIUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include")
+find_package(Osmium REQUIRED COMPONENTS io)
+add_dependency_includes(${OSMIUM_INCLUDE_DIR})
+
+
+find_package(Boost 1.49.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+
+# collect a subset of the boost libraries needed
+# by libosrm
+foreach(lib ${Boost_LIBRARIES})
+  if(NOT WIN32)
+    if(lib MATCHES filesystem OR lib MATCHES thread OR lib MATCHES iostreams OR lib MATCHES system)
+       list(APPEND BOOST_ENGINE_LIBRARIES "${lib}")
+    endif()
+  else()
+    list(APPEND BOOST_ENGINE_LIBRARIES "${lib}")
+  endif()
+endforeach(lib)
+
+if(NOT WIN32 AND NOT Boost_USE_STATIC_LIBS)
+  add_dependency_defines(-DBOOST_TEST_DYN_LINK)
+endif()
+add_dependency_defines(-DBOOST_SPIRIT_USE_PHOENIX_V3)
+add_dependency_defines(-DBOOST_RESULT_OF_USE_DECLTYPE)
+add_dependency_defines(-DBOOST_FILESYSTEM_NO_DEPRECATED)
+add_dependency_includes(${Boost_INCLUDE_DIRS})
+
+find_package(Threads REQUIRED)
+
+find_package(TBB REQUIRED)
+add_dependency_includes(${TBB_INCLUDE_DIR})
+if(WIN32 AND CMAKE_BUILD_TYPE MATCHES Debug)
+  set(TBB_LIBRARIES ${TBB_DEBUG_LIBRARIES})
+endif()
+
+find_package(Luabind REQUIRED)
+include(check_luabind)
+add_dependency_includes(${LUABIND_INCLUDE_DIR})
+
+set(USED_LUA_LIBRARIES ${LUA_LIBRARY})
+if(LUAJIT_FOUND)
+  set(USED_LUA_LIBRARIES, LUAJIT_LIBRARIES)
+endif()
+add_dependency_includes(${LUA_INCLUDE_DIR})
+
+find_package(EXPAT REQUIRED)
+add_dependency_includes(${EXPAT_INCLUDE_DIRS})
+
+find_package(STXXL REQUIRED)
+add_dependency_includes(${STXXL_INCLUDE_DIR})
+
+set(OpenMP_FIND_QUIETLY ON)
+find_package(OpenMP)
+if(OPENMP_FOUND)
+  message(STATUS "OpenMP support found. Linking just in case for stxxl")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+endif()
+
+find_package(BZip2 REQUIRED)
+add_dependency_includes(${BZIP2_INCLUDE_DIR})
+
+find_package(ZLIB REQUIRED)
+add_dependency_includes(${ZLIB_INCLUDE_DIRS})
+
+if (ENABLE_JSON_LOGGING)
+  message(STATUS "Enabling json logging")
+  add_dependency_defines(-DENABLE_JSON_LOGGING)
+endif()
+
+add_definitions(${OSRM_DEFINES})
+include_directories(SYSTEM ${OSRM_INCLUDE_PATHS})
+
+# Binaries
+target_link_libraries(osrm-datastore osrm_store ${Boost_LIBRARIES})
+target_link_libraries(osrm-extract osrm_extract ${Boost_LIBRARIES})
+target_link_libraries(osrm-contract ${Boost_LIBRARIES} ${TBB_LIBRARIES} osrm_contract)
+target_link_libraries(osrm-routed osrm ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} ${ZLIB_LIBRARY})
+
+set(EXTRACTOR_LIBRARIES
+    ${BZIP2_LIBRARIES}
+    ${Boost_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${EXPAT_LIBRARIES}
+    ${LUABIND_LIBRARY}
+    ${USED_LUA_LIBRARIES}
+    ${OSMIUM_LIBRARIES}
+    ${STXXL_LIBRARY}
+    ${TBB_LIBRARIES}
+    ${ZLIB_LIBRARY}
+    ${MAYBE_COVERAGE_LIBRARIES})
+set(CONTRACTOR_LIBRARIES
+    ${Boost_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${LUABIND_LIBRARY}
+    ${USED_LUA_LIBRARIES}
+    ${STXXL_LIBRARY}
+    ${TBB_LIBRARIES}
+    ${MAYBE_RT_LIBRARY}
+    ${MAYBE_COVERAGE_LIBRARIES})
+set(ENGINE_LIBRARIES
+    ${BOOST_ENGINE_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${TBB_LIBRARIES}
+    ${MAYBE_RT_LIBRARY}
+    ${MAYBE_COVERAGE_LIBRARIES}
+    ${ZLIB_LIBRARY})
+set(STORAGE_LIBRARIES
+    ${Boost_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${TBB_LIBRARIES}
+    ${MAYBE_RT_LIBRARY}
+    ${MAYBE_COVERAGE_LIBRARIES})
+set(UTIL_LIBRARIES
+    ${Boost_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${STXXL_LIBRARY}
+    ${TBB_LIBRARIES}
+    ${MAYBE_COVERAGE_LIBRARIES})
+# Libraries
+target_link_libraries(osrm ${ENGINE_LIBRARIES})
+target_link_libraries(osrm_contract ${CONTRACTOR_LIBRARIES})
+target_link_libraries(osrm_extract ${EXTRACTOR_LIBRARIES})
+target_link_libraries(osrm_store ${STORAGE_LIBRARIES})
+
+if(BUILD_COMPONENTS)
+  find_package(GDAL)
+  if(GDAL_FOUND)
+    add_executable(osrm-components src/tools/components.cpp $<TARGET_OBJECTS:UTIL>)
+    target_link_libraries(osrm-components ${TBB_LIBRARIES})
+    include_directories(SYSTEM ${GDAL_INCLUDE_DIR})
+    target_link_libraries(osrm-components ${GDAL_LIBRARIES} ${Boost_LIBRARIES})
+    install(TARGETS osrm-components DESTINATION bin)
+  else()
+    message(WARNING "libgdal and/or development headers not found")
+  endif()
+endif()
+
+if(BUILD_TOOLS)
+  message(STATUS "Activating OSRM internal tools")
+  add_executable(osrm-io-benchmark src/tools/io-benchmark.cpp $<TARGET_OBJECTS:UTIL>)
+  target_link_libraries(osrm-io-benchmark ${Boost_LIBRARIES})
+  add_executable(osrm-unlock-all src/tools/unlock_all_mutexes.cpp $<TARGET_OBJECTS:UTIL>)
+  target_link_libraries(osrm-unlock-all ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+  if(UNIX AND NOT APPLE)
+    target_link_libraries(osrm-unlock-all rt)
+  endif()
+  add_executable(osrm-springclean src/tools/springclean.cpp $<TARGET_OBJECTS:UTIL>)
+  target_link_libraries(osrm-springclean ${Boost_LIBRARIES})
+
+  install(TARGETS osrm-io-benchmark DESTINATION bin)
+  install(TARGETS osrm-unlock-all DESTINATION bin)
+  install(TARGETS osrm-springclean DESTINATION bin)
+endif()
+
+if (ENABLE_ASSERTIONS)
+  message(STATUS "Enabling assertions")
+  add_definitions(-DBOOST_ENABLE_ASSERT_HANDLER)
+endif()
+
+# Add RPATH info to executables so that when they are run after being installed
+# (i.e., from /usr/local/bin/) the linker can find library dependencies. For
+# more info see http://www.cmake.org/Wiki/CMake_RPATH_handling
+set_property(TARGET osrm-extract PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
+set_property(TARGET osrm-contract PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
+set_property(TARGET osrm-datastore PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
+set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+file(GLOB VariantGlob third_party/variant/*.hpp)
+file(GLOB LibraryGlob include/osrm/*.hpp)
+file(GLOB ParametersGlob include/engine/api/*_parameters.hpp)
+set(EngineHeader include/engine/status.hpp include/engine/engine_config.hpp include/engine/hint.hpp include/engine/bearing.hpp include/engine/phantom_node.hpp)
+set(UtilHeader include/util/coordinate.hpp include/util/json_container.hpp include/util/typedefs.hpp include/util/strong_typedef.hpp)
+set(ExtractorHeader include/extractor/extractor.hpp include/extractor/extractor_config.hpp include/extractor/travel_mode.hpp)
+set(ContractorHeader include/contractor/contractor.hpp include/contractor/contractor_config.hpp)
+set(StorageHeader include/storage/storage.hpp include/storage/storage_config.hpp)
+install(FILES ${EngineHeader} DESTINATION include/osrm/engine)
+install(FILES ${UtilHeader} DESTINATION include/osrm/util)
+install(FILES ${StorageHeader} DESTINATION include/osrm/storage)
+install(FILES ${ExtractorHeader} DESTINATION include/osrm/extractor)
+install(FILES ${ContractorHeader} DESTINATION include/osrm/contractor)
+install(FILES ${LibraryGlob} DESTINATION include/osrm)
+install(FILES ${ParametersGlob} DESTINATION include/osrm/engine/api)
+install(FILES ${VariantGlob} DESTINATION include/variant)
+install(TARGETS osrm-extract DESTINATION bin)
+install(TARGETS osrm-contract DESTINATION bin)
+install(TARGETS osrm-datastore DESTINATION bin)
+install(TARGETS osrm-routed DESTINATION bin)
+install(TARGETS osrm DESTINATION lib)
+install(TARGETS osrm_extract DESTINATION lib)
+install(TARGETS osrm_contract DESTINATION lib)
+install(TARGETS osrm_store DESTINATION lib)
+
+list(GET ENGINE_LIBRARIES 1 ENGINE_LIBRARY_FIRST)
+foreach(lib ${ENGINE_LIBRARIES})
+  get_filename_component(ENGINE_LIBRARY_PATH "${ENGINE_LIBRARY_FIRST}" PATH)
+  get_filename_component(ENGINE_LIBRARY_NAME "${lib}" NAME_WE)
+  string(REPLACE "lib" "" ENGINE_LIBRARY_NAME ${ENGINE_LIBRARY_NAME})
+  string(REPLACE "-l" "" ENGINE_LIBRARY_NAME ${ENGINE_LIBRARY_NAME})
+  set(ENGINE_LIBRARY_LISTING "${ENGINE_LIBRARY_LISTING} -L${ENGINE_LIBRARY_PATH} -l${ENGINE_LIBRARY_NAME}")
+endforeach()
+
+if(BUILD_DEBIAN_PACKAGE)
+  include(CPackDebianConfig)
+  include(CPack)
+endif()
+
+function(JOIN VALUES GLUE OUTPUT)
+  string (REPLACE ";" "${GLUE}" _TMP_STR "${VALUES}")
+  set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
+endfunction()
+
+# Set up variables, then write to pkgconfig file
+JOIN("${OSRM_DEFINES}" " " OSRM_DEFINES_STRING)
+JOIN("-I${OSRM_INCLUDE_PATHS}" " -I" OSRM_INCLUDE_PATHS_STRING)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in libosrm.pc @ONLY)
+install(FILES ${PROJECT_BINARY_DIR}/libosrm.pc DESTINATION lib/pkgconfig)
+
+# add a target to generate API documentation with Doxygen
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+add_custom_target(doc
+${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+COMMENT "Generating API documentation with Doxygen" VERBATIM
+)
+endif()
+
+# prefix compilation with ccache by default if available and on clang or gcc
+if(ENABLE_CCACHE AND (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU"))
+  find_program(CCACHE_FOUND ccache)
+  if(CCACHE_FOUND)
+    message(STATUS "Using ccache to speed up incremental builds")
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+    set(ENV{CCACHE_CPP2} "true")
+  endif()
+endif()
+
+# uninstall target
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
+    IMMEDIATE @ONLY)
+
+add_custom_target(uninstall
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake)
+
+
+# Modular build system: each directory registered here provides its own CMakeLists.txt
+add_subdirectory(unit_tests)
+add_subdirectory(src/benchmarks)

CONTRIBUTING.md

@@ -0,0 +1,55 @@
+# User
+
+Before you open a new issue, please search for older ones that cover the same issue.
+In general "me too" comments/issues are frowned upon.
+You can add a :+1: emoji to the issue if you want to express interest in this.
+
+# Developer
+
+We use `clang-format` version `3.8` to consistently format the code base. There is a helper script under `scripts/format.sh`.
+
+In general changes that affect the API and/or increase the memory consumption need to be discussed first.
+Often we don't include changes that would increase the memory consumption a lot if they are not generally usable (e.g. elevation data is a good example).
+
+## Pull Request
+
+Every pull-request that changes the API needs to update the docs in `docs/http.md` and add an entry to `CHANGELOG.md`.
+Breaking changes need to have a BREAKING prefix. See the [releasing documentation](docs/releasing.md) on how this affects the version.
+
+Early feedback is also important.
+You will see that a lot of the PR have tags like `[not ready]` or `[wip]`.
+We like to open PRs as soon as we are starting to work on something to make it visible to the rest of the team.
+If your work is going in entirely the wrong direction, there is a good chance someone will pick up on this before it is too late.
+Everyone is encouraged to read PRs of other people and give feedback.
+
+For every significant code change we require a pull request review before it is merged.
+If your pull request modifies the API this need to be signed of by a team discussion.
+This means you will need to find another member of the team with commit access and request a review of your pull request.
+
+Once your pull request is reviewed you can merge it! If you don't have commit access, ping someone that has commit access.
+If you do have commit access there are in general two accepted styles to merging:
+
+1. Make sure the branch is up to date with `master`. Run `git rebase master` to find out.
+2. Once that is ensured you can either:
+  - Click the nice green merge button (for a non-fast-forward merge)
+  - Merge by hand using a fast-forward merge
+
+Which merge you prefer is up to personal preference. In general it is recommended to use fast-forward merges because it creates a history that is sequential and easier to understand.
+
+# Maintainer
+
+## Doing a release
+
+There is an in-depth guide around how to push out a release once it is ready [here](docs/releasing.md).
+
+## The API
+
+Changes to the API need to be discussed and signed off by the team. Breaking changes even more so than additive changes.
+
+## Milestones
+
+If a pull request or an issue is applicable for the current or next milestone, depends on the target version number.
+Since we use semantic versioning we restrict breaking changes to major releases.
+After a Release Candidate is released we usually don't change the API anymore if it is not critical.
+Bigger code changes after a RC was released should also be avoided.
+

Doxyfile.in

@@ -0,0 +1,44 @@
+PROJECT_NAME           = "Project OSRM"
+PROJECT_BRIEF          = "Open Source Routing Machine"
+BUILTIN_STL_SUPPORT    = YES
+
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = YES
+EXTRACT_PACKAGE        = YES
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_ANON_NSPACES   = YES
+
+QUIET                  = YES
+
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@
+USE_MDFILE_AS_MAINPAGE = @CMAKE_CURRENT_SOURCE_DIR@/README.md
+FILE_PATTERNS          = *.h *.hpp *.c *.cc *.cpp *.md
+RECURSIVE              = YES
+
+EXCLUDE                = @CMAKE_CURRENT_SOURCE_DIR@/third_party \
+                         @CMAKE_CURRENT_SOURCE_DIR@/build \
+                         @CMAKE_CURRENT_SOURCE_DIR@/node_modules \
+                         @CMAKE_CURRENT_SOURCE_DIR@/unit_tests \
+			 @CMAKE_CURRENT_SOURCE_DIR@/benchmarks \
+                         @CMAKE_CURRENT_SOURCE_DIR@/features
+
+SOURCE_BROWSER         = YES
+
+CLANG_ASSISTED_PARSING = NO
+
+HTML_COLORSTYLE_HUE    = 217
+HTML_COLORSTYLE_SAT    = 71
+HTML_COLORSTYLE_GAMMA  = 50
+
+GENERATE_TREEVIEW      = YES
+
+HAVE_DOT               = @DOXYGEN_DOT_FOUND@
+CALL_GRAPH             = YES
+CALLER_GRAPH           = YES
+
+DOT_IMAGE_FORMAT       = svg
+INTERACTIVE_SVG        = YES
+DOT_GRAPH_MAX_NODES    = 500
+DOT_TRANSPARENT        = YES
+DOT_MULTI_TARGETS      = YES

LICENCE.TXT

@@ -0,0 +1,22 @@
+Copyright (c) 2016, Project OSRM contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,72 +1,84 @@
-Overview
+## About
---------
-The repository provides a Leaflet [(1)] based web frontend to the Open Source Routing Machine (Project-OSRM [(2)]).
-The frontend is implemented in Javascript.
-Data is fetched from routing and geocoding servers using JSONP queries.
-The website is XHTML 1.0 Strict compliant.
-A deployed version of the the web frontend can be seen at [(3)].
 
+The Open Source Routing Machine is a high performance routing engine written in C++11 designed to run on OpenStreetMap data.
 
-Setup
+## Current build status
------
-The frontend should work directly as provided.
-Several settings - including the URL for the routing server and the geocoder server - can be specified in `OSRM.config.js`.
-Different tile servers can be specified in `OSRM.Map.js`.
-Note that the URL shortener used for generating route links only works with URLs pointing to the official Project-OSRM website.
 
+| build config | status |
+|:-------------|:-------|
+| Linux        | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=master)](https://travis-ci.org/Project-OSRM/osrm-backend) |
+| Windows      | [![Build status](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) |
+| Coverage     | [![codecov](https://codecov.io/gh/Project-OSRM/osrm-backend/branch/master/graph/badge.svg)](https://codecov.io/gh/Project-OSRM/osrm-backend) |
 
-Branches
+## Building
---------
-* The `master` branch will always point to the latest released version of the frontend.
-* The `develop` branch should always point to a working version with new features and bugfixes (think of it as a nightly-build).
-* Other branches contain various work in progress.
 
+For instructions on how to [build](https://github.com/Project-OSRM/osrm-backend/wiki/Building-OSRM) and [run OSRM](https://github.com/Project-OSRM/osrm-backend/wiki/Running-OSRM), please consult [the Wiki](https://github.com/Project-OSRM/osrm-backend/wiki).
 
-Bugtracking
+To quickly try OSRM use our [free and daily updated online service](http://map.project-osrm.org)
------------
-Please use the OSRM-Project bug tracker [(4)] for submitting any bug reports or feature requests.
 
+## Documentation
 
-Contribute
+### Full documentation
-----------
-If you like to contribute, simply fork the project and start coding.
-It is best practice to create a new branch (from the current master) with a descriptive name for your contributions.
-When you are done, send a pull request from that branch.
-With this workflow, each pull request is isolated and can be easily merged.
 
+- [osrm-routed HTTP API documentation](docs/http.md)
+- [libosrm API documentation](docs/libosrm.md)
 
-Integration into Project-OSRM repository
+### Quick start
-----------------------------------------
-The Project-OSRM repository already contains the frontend repository as a submodule.
-It will always point to the latest deployed version.
-To successfully work a repository that contains submodules, use the following git commands (available in git 1.7.1+):
 
-* `git clone --recursive`  
+Building OSRM assuming all dependencies are installed:
-	to clone a repository and the contained submodules
 
-* `git pull && git submodule update`  
+```
-	to pull the latest version of the repository and update its submodules if required
+mkdir -p build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release
+cmake --build .
+sudo cmake --build . --target install
+```
 
-Note that the frontend can also be checked out independently of the Project-OSRM repository.
+Loading preparing a dataset and starting the server:
 
+```
+osrm-extract data.osm.pbf -p profiles/car.lua
+osrm-contract data.osrm
+osrm-routed data.osrm
+```
 
-Compatibility
+Running a query on your local server:
--------------
-The frontend has been tested with Firefox 3.0+, Internet Explorer 8+ and Chrome 18+.
-Certain visuals like rounded corners or moving boxes will only show in newer browser versions.
-But no actual functionality is affected by this.
-Note that the frontend will not work with Internet Explorer 6 or 7.
 
+```
+curl http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true
+```
 
-References
+### Running a request against the Demo Server
-----------
-[(1)] Cloudmade Leaflet: http://leaflet.cloudmade.com/  
-[(2)] Project OSRM: http://project-osrm.org/  
-[(3)] Project OSRM Frontend: http://map.project-osrm.org/  
-[(4)] Project OSRM Bugtracker: https://github.com/DennisOSRM/Project-OSRM/issues/
 
+First read the [API usage policy](https://github.com/Project-OSRM/osrm-backend/wiki/Api-usage-policy).
+
+Then run simple query with instructions and alternatives on Berlin:
+
+```
+curl https://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true
+```
+
+## References in publications
+
+When using the code in a (scientific) publication, please cite
+
+```
+@inproceedings{luxen-vetter-2011,
+ author = {Luxen, Dennis and Vetter, Christian},
+ title = {Real-time routing with OpenStreetMap data},
+ booktitle = {Proceedings of the 19th ACM SIGSPATIAL International Conference on Advances in Geographic Information Systems},
+ series = {GIS '11},
+ year = {2011},
+ isbn = {978-1-4503-1031-4},
+ location = {Chicago, Illinois},
+ pages = {513--516},
+ numpages = {4},
+ url = {http://doi.acm.org/10.1145/2093973.2094062},
+ doi = {10.1145/2093973.2094062},
+ acmid = {2094062},
+ publisher = {ACM},
+ address = {New York, NY, USA},
+}
+```
 
-[(1)]: http://leaflet.cloudmade.com/ "Cloudmade Leaflet"
-[(2)]: http://project-osrm.org/ "Project OSRM"
-[(3)]: http://map.project-osrm.org/ "Project-OSRM Frontend" 
-[(4)]: https://github.com/DennisOSRM/Project-OSRM/issues/ "Project-OSRM Bugtracker"

WebContent/OSRM.base.js

@@ -1,28 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM base class
-// [has to be loaded before all other OSRM classes]
-
-var OSRM = {};
-OSRM.VERSION = '0.1.7';
-OSRM.DATE = '120705';
-OSRM.CONSTANTS = {};
-OSRM.DEFAULTS = {};
-OSRM.GLOBALS = {};
-OSRM.G = OSRM.GLOBALS;		// abbreviations
-OSRM.C = OSRM.CONSTANTS;

WebContent/OSRM.config.js

@@ -1,98 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM config file
-// [has to be loaded directly after OSRM.base]
-
-OSRM.DEFAULTS = {
-	HOST_ROUTING_URL: 'http://router.project-osrm.org/viaroute',
-	HOST_SHORTENER_URL: 'http://map.project-osrm.org/shorten/',
-	HOST_TIMESTAMP_URL: 'http://router.project-osrm.org/timestamp',
-	HOST_GEOCODER_URL: 'http://nominatim.openstreetmap.org/search',
-	HOST_REVERSE_GEOCODER_URL: 'http://nominatim.openstreetmap.org/reverse',
-	WEBSITE_URL: document.URL.replace(/#*(\?.*|$)/i,""),					// truncates URL before first ?, and removes tailing #
-	JSONP_TIMEOUT: 10000,
-	ZOOM_LEVEL: 14,
-	ONLOAD_ZOOM_LEVEL: 5,
-	ONLOAD_LATITUDE: 48.84,
-	ONLOAD_LONGITUDE: 10.10,
-	ONLOAD_SOURCE: "",
-	ONLOAD_TARGET: "",
-	HIGHLIGHT_ZOOM_LEVEL: 16,
-	DISTANCE_FORMAT: 0,														// 0: km, 1: miles
-	GEOCODER_BOUNDS: '',													// the world is not enough!
-	//GEOCODER_BOUNDS: '&bounded=1&viewbox=-27.0,72.0,46.0,36.0',			// bounds for Europe
-	
-	SHORTENER_PARAMETERS: '%url&jsonp=%jsonp',
-	SHORTENER_REPLY_PARAMETER: 'ShortURL',
-	
-	LANGUAGE: "en",
-	LANUGAGE_ONDEMAND_RELOADING: true,
-	LANGUAGE_SUPPORTED: [ 
-		{encoding:"en", name:"English"},
-		{encoding:"de", name:"Deutsch"},
-		{encoding:"dk", name:"Dansk"},
-		{encoding:"es", name:"Español"},
-		{encoding:"fi", name:"Suomi"},
-		{encoding:"fr", name:"Français"},
-		{encoding:"it", name:"Italiano"},
-		{encoding:"lv", name:"Latviešu"},
-		{encoding:"pl", name:"Polski", culture:"en-US"},
-		{encoding:"ru", name:"Русский"}
-	],
-		
-	TILE_SERVERS: [
-		{	display_name: 'osm.org',
-			url:'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-			attribution:'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 Mapnik',
-			options:{maxZoom: 18}
-		},
-		{	display_name: 'osm.de',
-			url:'http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png',
-			attribution:'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 Mapnik',
-			options:{maxZoom: 18}
-		},
-		{	display_name: 'MapQuest',
-			url:'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
-			attribution:'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 MapQuest',
-			options:{maxZoom: 18, subdomains: '1234'}
-		},
-		{	display_name: 'CloudMade',
-			url:'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
-			attribution:'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
-			options:{maxZoom: 18}
-		},
-		{
-			display_name: 'Bing Road',
-			apikey:'AjCb2f6Azv_xt9c6pl_xok96bgAYrXQNctnG4o07sTj4iS9N68Za4B3pRJyeCjGr',	// please use your own apikey (http://msdn.microsoft.com/en-us/library/ff428642.aspx) 
-			type:"Road",
-			options:{minZoom: 1},
-			bing:true,
-		},
-		{
-			display_name: 'Bing Aerial',
-			apikey:'AjCb2f6Azv_xt9c6pl_xok96bgAYrXQNctnG4o07sTj4iS9N68Za4B3pRJyeCjGr',	// please use your own apikey (http://msdn.microsoft.com/en-us/library/ff428642.aspx)
-			type:"Aerial",
-			options:{minZoom: 1},
-			bing:true,
-		}
-	],
-	
-	MAINTENANCE: false,
-	MAINTENANCE_HEADER: "Scheduled Maintenance",
-	MAINTENANCE_TEXT: "The OSRM Website is down for a scheduled maintenance. Please be patient while required updates are performed. The site will be back online shortly.<br/><br/>In the meantime you may want to go out an map a friendly neighborhood near you...<br/><br/><br/>[OSRM]",	
-};

WebContent/base/OSRM.Geocoder.js

@@ -1,274 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM geocoding routines
-// [geocoder query, management and display of geocoder results]
-
-// some constants
-OSRM.CONSTANTS.SOURCE_LABEL = "source";
-OSRM.CONSTANTS.TARGET_LABEL = "target";
-OSRM.CONSTANTS.VIA_LABEL = "via";
-OSRM.CONSTANTS.DO_FALLBACK_TO_LAT_LNG = true;
-
-
-OSRM.Geocoder = {
-
-//[normal geocoding]
-
-// process input request and call geocoder if needed
-call: function(marker_id, query) {
-	if(query=="")
-		return;
-	
-	// geo coordinates given -> directly draw results
-	if(query.match(/^\s*[-+]?[0-9]*\.?[0-9]+\s*[,;]\s*[-+]?[0-9]*\.?[0-9]+\s*$/)){
-		var coord = query.split(/[,;]/);
-		OSRM.Geocoder._onclickResult(marker_id, coord[0], coord[1]);
-		OSRM.Geocoder.updateAddress( marker_id );
-		return;
-	}
-	
-	// build basic request for geocoder
-	var call = OSRM.DEFAULTS.HOST_GEOCODER_URL + "?format=json&json_callback=%jsonp" + OSRM.DEFAULTS.GEOCODER_BOUNDS + "&accept-language="+OSRM.Localization.current_language+"&limit=30&q=" + query;
-	// prioritize results in currently shown mapview
-	var bounds = OSRM.G.map.getBounds();
-	call += "&viewbox=" + bounds._southWest.lat + "," + bounds._northEast.lng + "," + bounds._northEast.lat + "," + bounds._southWest.lng;
-	OSRM.JSONP.call( call, OSRM.Geocoder._showResults, OSRM.Geocoder._showResults_Timeout, OSRM.DEFAULTS.JSONP_TIMEOUT, "geocoder_"+marker_id, {marker_id:marker_id,query:query} );
-},
-
-
-// helper function for clicks on geocoder search results
-_onclickResult: function(marker_id, lat, lon) {
-	var index;
-	if( marker_id == OSRM.C.SOURCE_LABEL )
-		index = OSRM.G.markers.setSource( new L.LatLng(lat, lon) );
-	else if( marker_id == OSRM.C.TARGET_LABEL )
-		index = OSRM.G.markers.setTarget( new L.LatLng(lat, lon) );
-	else
-		return;
-	
-	OSRM.G.markers.route[index].show();
-	OSRM.G.markers.route[index].centerView();	
-	if( OSRM.G.markers.route.length > 1 )
-		OSRM.Routing.getRoute();
-},
-
-
-// process geocoder response
-_showResults: function(response, parameters) {
-	if(!response){
-		OSRM.Geocoder._showResults_Empty(parameters);
-		return;
-	}
-	
-	if(response.length == 0) {
-		OSRM.Geocoder._showResults_Empty(parameters);
-		return;
-	}
-	
-	// filter/sort inputs
-	var filtered_response = [];
-	for(var i=0; i < response.length; i++){
-		var result = response[i];
-		if( OSRM.Geocoder._filterResult( result ) )
-			continue;
-		filtered_response.push( result );
-	}
-	filtered_response.sort( OSRM.Geocoder._compareResults );
-	
-	// show first result
-	OSRM.Geocoder._onclickResult(parameters.marker_id, filtered_response[0].lat, filtered_response[0].lon);
-	if( OSRM.G.markers.route.length > 1 )		// if a route is displayed, we don't need to show other possible geocoding results
-		return;	
-	
-	// show possible results for input
-	var html = "";
-	html += '<table class="results medium-font">';	
-	for(var i=0; i < filtered_response.length; i++){
-		var result = filtered_response[i];
-		
-		//odd or even ?
-		var rowstyle='results-body-odd';
-		if(i%2==0) { rowstyle='results-body-even'; }
- 
-		html += '<tr class="'+rowstyle+'">';
-		if(!result.icon)
-			result.icon = "http://nominatim.openstreetmap.org/images/mapicons/poi_point_of_interest.glow.12.png";
-		html += '<td class="results-body-counter"><img src="'+ result.icon + '" alt=""/></td>';
-		html += '<td class="results-body-items">';
-
-		if(result.display_name){
-			html += '<div class="results-body-item" onclick="OSRM.Geocoder._onclickResult(\''+parameters.marker_id+'\', '+result.lat+', '+result.lon+');">'+result.display_name;
-			// debug output to show osm_type, class, type			
-			// html += '<br/><span class="results-body-item-remark small-font">[osm_type: ' + result.osm_type + ', class: ' + result.class + ', type: ' + result.type + ']</span>';
-			html += '</div>';
-		}
-		html += "</td></tr>";
-	}
-	html += '</table>';
-		
-	document.getElementById('information-box-header').innerHTML = 
-		"<div class='header-title'>"+OSRM.loc("SEARCH_RESULTS")+"</div>" +
-		"<div class='header-content'>("+OSRM.loc("FOUND_X_RESULTS").replace(/%i/,filtered_response.length)+")</div>";
-		"<div class='header-content'>(found "+filtered_response.length+" results)"+"</div>";
-	document.getElementById('information-box').innerHTML = html;
-},
-_showResults_Empty: function(parameters) {
-	document.getElementById('information-box-header').innerHTML =
-		"<div class='header-title'>"+OSRM.loc("SEARCH_RESULTS")+"</div>" +
-		"<div class='header-content'>("+OSRM.loc("FOUND_X_RESULTS").replace(/%i/,0)+")</div>";		
-	if(parameters.marker_id == OSRM.C.SOURCE_LABEL)
-		document.getElementById('information-box').innerHTML = "<div class='no-results big-font'>"+OSRM.loc("NO_RESULTS_FOUND_SOURCE")+": "+parameters.query +"</div>";
-	else if(parameters.marker_id == OSRM.C.TARGET_LABEL)
-		document.getElementById('information-box').innerHTML = "<div class='no-results big-font'>"+OSRM.loc("NO_RESULTS_FOUND_TARGET")+": "+parameters.query +"</div>";
-	else
-		document.getElementById('information-box').innerHTML = "<div class='no-results big-font'>"+OSRM.loc("NO_RESULTS_FOUND")+": "+parameters.query +"</div>";
-},
-_showResults_Timeout: function() {
-	document.getElementById('information-box-header').innerHTML =
-		"<div class='header-title'>"+OSRM.loc("SEARCH_RESULTS")+"</div>" +
-		"<div class='header-content'>("+OSRM.loc("FOUND_X_RESULTS").replace(/%i/,0)+")</div>";		
-	document.getElementById('information-box').innerHTML = "<div class='no-results big-font'>"+OSRM.loc("TIMED_OUT")+"</div>";	
-},
-
-
-// filter search results [true: result will not be displayed]
-_filterResult: function(result) {
-	if( result.osm_type == "relation")
-		return true;
-	if( result.type == "aerial_views")
-		return true;	
-	return false;
-},
-
-
-// comparator for sorting results [higher weight: result will appear first]
-_compare_class_weights: {
-	place: 9000,
-	highway: 8000,
-	boundary: 7000
-}, 
-_compare_type_weights: {
-	country: 13,
-	state: 12,
-	county: 11,
-	city: 10, 
-	town: 9,
-	village: 8,
-	hamlet: 7,
-	suburb: 6,
-	locality: 5,
-	farm: 4
-},
-_compareResults: function(lhs, rhs) {
-	var class_values = OSRM.Geocoder._compare_class_weights;
-	var type_values = OSRM.Geocoder._compare_type_weights;
-	
-	var lhs_value = (-class_values[ lhs.class ] || 0) + (-type_values[ lhs.type ] || 0);
-	var rhs_value = (-class_values[ rhs.class ] || 0) + (-type_values[ rhs.type ] || 0);
-
-	return (lhs_value - rhs_value);
-},
-
-
-// [reverse geocoding]
-
-//update geo coordinates in input boxes
-updateLocation: function(marker_id) {
-	if (marker_id == OSRM.C.SOURCE_LABEL && OSRM.G.markers.hasSource()) {
-		document.getElementById("gui-input-source").value = OSRM.G.markers.route[0].getLat().toFixed(6) + ", " + OSRM.G.markers.route[0].getLng().toFixed(6);
-	} else if (marker_id == OSRM.C.TARGET_LABEL && OSRM.G.markers.hasTarget()) {
-		document.getElementById("gui-input-target").value = OSRM.G.markers.route[OSRM.G.markers.route.length-1].getLat().toFixed(6) + ", " + OSRM.G.markers.route[OSRM.G.markers.route.length-1].getLng().toFixed(6);		
-	}
-},
-
-
-// update address in input boxes
-updateAddress: function(marker_id, do_fallback_to_lat_lng) {
-	// build request for reverse geocoder
-	var lat = null;
-	var lng = null;
-	
-	if(marker_id == OSRM.C.SOURCE_LABEL && OSRM.G.markers.hasSource()) {
-		lat = OSRM.G.markers.route[0].getLat();
-		lng = OSRM.G.markers.route[0].getLng();
-	} else if(marker_id == OSRM.C.TARGET_LABEL && OSRM.G.markers.hasTarget() ) {
-		lat = OSRM.G.markers.route[OSRM.G.markers.route.length-1].getLat();
-		lng = OSRM.G.markers.route[OSRM.G.markers.route.length-1].getLng();
-	} else
-		return;
-	
-	var call = OSRM.DEFAULTS.HOST_REVERSE_GEOCODER_URL + "?format=json&json_callback=%jsonp" + "&accept-language="+OSRM.Localization.current_language + "&lat=" + lat.toFixed(6) + "&lon=" + lng.toFixed(6);
-	OSRM.JSONP.call( call, OSRM.Geocoder._showReverseResults, OSRM.Geocoder._showReverseResults_Timeout, OSRM.DEFAULTS.JSONP_TIMEOUT, "reverse_geocoder_"+marker_id, {marker_id:marker_id, do_fallback: do_fallback_to_lat_lng} );
-},
-
-
-// processing JSONP response of reverse geocoder
-_showReverseResults: function(response, parameters) {
- 	if(!response) {
- 		OSRM.Geocoder._showReverseResults_Timeout(response, parameters);
-		return;
-	}
- 	
-	if(response.address == undefined) {
-		OSRM.Geocoder._showReverseResults_Timeout(response, parameters);
-		return;
-	}
-
-	// build reverse geocoding address
-	var used_address_data = 0;
-	var address = "";
-	if( response.address.road) {
-		address += response.address.road;
-		used_address_data++;
-	}
-	if( response.address.city ) {
-		if( used_address_data > 0 )
-			address += ", ";
-		address += response.address.city;
-		used_address_data++;
-	} else if( response.address.village ) {
-		if( used_address_data > 0 )
-			address += ", ";
-		address += response.address.village;
-		used_address_data++;
-	}
-	if( used_address_data < 2 && response.address.country ) {
-		if( used_address_data > 0 )
-			address += ", ";
-		address += response.address.country;
-		used_address_data++;
-	}
-	if( used_address_data == 0 ) {
-		OSRM.Geocoder._showReverseResults_Timeout(response, parameters);
-		return;
-	}
-		
-	// add result to DOM
-	if(parameters.marker_id == OSRM.C.SOURCE_LABEL && OSRM.G.markers.hasSource() )
-		document.getElementById("gui-input-source").value = address;
-	else if(parameters.marker_id == OSRM.C.TARGET_LABEL && OSRM.G.markers.hasTarget() )
-		document.getElementById("gui-input-target").value = address;
-},
-_showReverseResults_Timeout: function(response, parameters) {
-	if(!parameters.do_fallback)
-		return;
-		
-	OSRM.Geocoder.updateLocation(parameters.marker_id);
-}
-
-};

WebContent/base/OSRM.HistoryRoutes.js

@@ -1,193 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM route management (handles drawing of route geometry - current route, old route, unnamed route, highlight unnamed streets) 
-// [this holds the route geometry]
-
-
-OSRM.HistoryRoute = function() {
-	// style and count of history routes
-	this._history_styles = [{dashed:false, color:'#FFFFFF', opacity:0.5, weight:5},
-	                        {dashed:false, color:'#0000DD', opacity:0.45, weight:5},
-	                        {dashed:false, color:'#0000BB', opacity:0.40, weight:5},
-	                        {dashed:false, color:'#000099', opacity:0.35, weight:5},
-	                        {dashed:false, color:'#000077', opacity:0.30, weight:5},
-	                        {dashed:false, color:'#000055', opacity:0.25, weight:5},
-	                        {dashed:false, color:'#000033', opacity:0.20, weight:5},
-	                        {dashed:false, color:'#000011', opacity:0.15, weight:5},
-	                        {dashed:false, color:'#000000', opacity:0.10, weight:5}	                              
-	                        ];
-	this._history_length = this._history_styles.length;
-	
-	// actual history data
-	this._history = [];
-	for(var i=0, size=this._history_length; i<size; i++) {
-		var history = {};
-		history.route = new OSRM.SimpleRoute("current" , {dashed:false} );
-		history.markers = [];
-		history.checksum = null;
-		this._history.push(history);
-	}
-	
-	// helper functions bound to this
-	this._initiate_redrawHistory = OSRM.bind(this, this._getRoute_RedrawHistory);
-	this._callback_redrawHistory = OSRM.bind(this, this._showRoute_RedrawHistory);
-};
-OSRM.extend( OSRM.HistoryRoute,{
-	// switch history routes on/off
-	activate: function() {
-		this.storeHistoryRoute = this._storeHistoryRoute;
-		this.fetchHistoryRoute = this._fetchHistoryRoute;
-		this.showHistoryRoutes = this._showHistoryRoutes;
-		this.clearHistoryRoutes = this._clearHistoryRoutes;
-		OSRM.G.map.on('zoomend', this._initiate_redrawHistory );
-		
-		this.storeHistoryRoute();
-	},
-	deactivate: function() {
-		this.clearHistoryRoutes();
-		
-		this.storeHistoryRoute = this.empty;
-		this.fetchHistoryRoute = this.empty;
-		this.showHistoryRoutes = this.empty;
-		this.clearHistoryRoutes = this.empty;
-		OSRM.G.map.off('zoomend', this._initiate_redrawHistory );
-	},
-	
-	// empty function
-	empty: function() {},
-	storeHistoryRoute: function() {},
-	fetchHistoryRoute: function() {},
-	showHistoryRoutes: function() {},
-	clearHistoryRoutes: function() {},
-	
-	// actual functions
-	_storeHistoryRoute: function() {
-		var route = OSRM.G.route;
-		if( !route.isShown() || !route.isRoute() )
-			return;
-			
-		// store current route in staging spot
-		var hint_data = OSRM.G.response.hint_data;
-		this._history[0].route.setPositions( route.getPositions() );
-		this._history[0].checksum = hint_data.checksum;
-		this._history[0].markers = [];
-
-		var markers = this._getCurrentMarkers();
-		for(var i=0,size=markers.length; i<size; i++) {
-			var position = { lat:markers[i].lat, lng:markers[i].lng, hint:hint_data.locations[i] };
-			this._history[0].markers.push(position);
-		}
-	},
-	_fetchHistoryRoute: function() {
-		if( this._history[0].markers.length == 0 )
-			return;
-		if( OSRM.G.route.isShown() && this._equalMarkers(this._history[0].markers, this._getCurrentMarkers()) )
-			return;
-		if( this._equalMarkers(this._history[0].markers, this._history[1].markers) )
-			return;		
-
-		// move all routes down one position
-		for(var i=this._history_length-1; i>0; i--) {
-			this._history[i].route.setPositions( this._history[i-1].route.getPositions() ); // copying positions quicker than creating new route!
-			this._history[i].markers = this._history[i-1].markers;
-			this._history[i].checksum = this._history[i-1].checksum;
-		}		
-		// reset staging spot
-		this._history[0].route.setPositions( [] );
-		this._history[0].markers = [];
-		this._history[0].checksum = null;
-	},	
-	_showHistoryRoutes: function() {
-		for(var i=1,size=this._history_length; i<size; i++) {
-			this._history[i].route.setStyle( this._history_styles[i] );
-			this._history[i].route.show();
-			OSRM.G.route.hideOldRoute();
-		}
-	},
-	_clearHistoryRoutes: function() {
-		for(var i=0,size=this._history_length; i<size; i++) {
-			this._history[i].route.hide();
-			this._history[i].route.setPositions( [] );
-			this._history[i].markers = [];
-			this._history[i].checksum = null;
-		}
-	},
-	
-	// get positions of current markers (data of jsonp response used, as not all data structures up-to-date!)
-	_getCurrentMarkers: function() {
-		var route = [];
-		
-		var positions = OSRM.G.route.getPositions();
-		if(positions.length == 0)
-			return route;
-		
-		for(var i=0; i<OSRM.G.response.via_points.length; i++)
-			route.push( {lat:OSRM.G.response.via_points[i][0], lng:OSRM.G.response.via_points[i][1]} );
-		return route;
-	},
-	
-	// check if two routes are equivalent by checking their markers
-	_equalMarkers: function(lhs, rhs) {
-		if(lhs.length != rhs.length)
-			return false;
-		for(var i=0,size=lhs.length; i<size; i++) {
-			if( lhs[i].lat.toFixed(5) != rhs[i].lat.toFixed(5) || lhs[i].lng.toFixed(5) != rhs[i].lng.toFixed(5) )
-				return false;
-		}
-		return true;
-	},
-	
-	// requery history routes
-	_showRoute_RedrawHistory: function(response, history_id) {
-		if(!response)
-			return;
-		
-		var positions = OSRM.RoutingGeometry._decode(response.route_geometry, 5);
-		this._history[history_id].route.setPositions(positions);
-		this._updateHints(response, history_id);
-	},
-	_getRoute_RedrawHistory: function() {
-		for(var i=0,size=this._history_length; i<size; i++)
-			if( this._history[i].markers.length > 0 ) {
-				OSRM.JSONP.clear('history'+i);
-				OSRM.JSONP.call(this._buildCall(i)+'&instructions=false', this._callback_redrawHistory, OSRM.JSONP.empty, OSRM.DEFAULTS.JSONP_TIMEOUT, 'history'+i, i);
-			}
-	},
-	_buildCall: function(history_id) {
-		var source = OSRM.DEFAULTS.HOST_ROUTING_URL;
-		source += '?z=' + OSRM.G.map.getZoom() + '&output=json&jsonp=%jsonp';
-		
-		if(this._history[history_id].checksum)
-			source += '&checksum=' + this._history[history_id].checksum;
-		
-		var history_markers = this._history[history_id].markers; 
-		for(var i=0,size=history_markers.length; i<size; i++) {
-			source += '&loc='  + history_markers[i].lat.toFixed(6) + ',' + history_markers[i].lng.toFixed(6);
-			if( history_markers[i].hint )
-				source += '&hint=' + history_markers[i].hint;
-		}
-		return source;
-	},
-	_updateHints: function(response, history_id) {
-		this._history[history_id].checksum = response.hint_data.checksum;
-		
-		var hints = response.hint_data.locations;
-		for(var i=0; i<hints.length; i++)
-			this._history[history_id].markers[i].hint = hints[i];		
-	}
-});

WebContent/base/OSRM.Map.js

@@ -1,106 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM map handling
-// [initialization, event handling, centering relative to UI]
-
-// will hold the map object
-OSRM.GLOBALS.map = null;
-
-
-// map controller
-// [map initialization, event handling]
-OSRM.Map = {
-
-// map initialization
-init: function() {
-	// check if GUI is initialized!
-	if(OSRM.G.main_handle == null)
-		OSRM.GUI.init();
-	
-	// setup tile servers
-	var tile_servers = OSRM.DEFAULTS.TILE_SERVERS;
-	var base_maps = {};
-	for(var i=0, size=tile_servers.length; i<size; i++) {
-		if( tile_servers[i].bing == true ) {
-			base_maps[ tile_servers[i].display_name ] = new L.TileLayer.Bing( tile_servers[i].apikey, tile_servers[i].type, tile_servers[i].options );		
-		} else {
-			tile_servers[i].options.attribution = tile_servers[i].attribution; 
-			base_maps[ tile_servers[i].display_name ] = new L.TileLayer( tile_servers[i].url, tile_servers[i].options );
-		}
-	}
-
-	// setup map
-	OSRM.G.map = new OSRM.MapView('map', {
-    	center: new L.LatLng(OSRM.DEFAULTS.ONLOAD_LATITUDE, OSRM.DEFAULTS.ONLOAD_LONGITUDE),
-	    zoom: OSRM.DEFAULTS.ONLOAD_ZOOM_LEVEL,
-	    layers: [base_maps[tile_servers[0].display_name]],	    
-	    zoomAnimation: false,								// remove animations -> routes are not hidden during zoom
-	    fadeAnimation: false
-	});
-
-	// add layer control
-	var layerControl = new L.Control.QueryableLayers(base_maps, {});
-	OSRM.G.map.addLayerControl(layerControl);
-
-    // move zoom markers
-	OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.left=(OSRM.G.main_handle.boxWidth()+10)+"px";
-	OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.top="5px";
-
-	// map events
-	OSRM.G.map.on('zoomend', OSRM.Map.zoomed );
-	OSRM.G.map.on('click', OSRM.Map.click );
-	OSRM.G.map.on('contextmenu', OSRM.Map.contextmenu );
-	OSRM.G.map.on('mousemove', OSRM.Map.mousemove );
-},
-
-// init map position and zoom (respect UI visibility / use browser geolocation) 
-initPosition: function() {
-	var position = new L.LatLng( OSRM.DEFAULTS.ONLOAD_LATITUDE, OSRM.DEFAULTS.ONLOAD_LONGITUDE);
-	OSRM.G.map.setViewUI( position, OSRM.DEFAULTS.ONLOAD_ZOOM_LEVEL, true);
-	if (navigator.geolocation && document.URL.indexOf("file://") == -1)		// convenience: FF does not save access rights for local files 
-		navigator.geolocation.getCurrentPosition(OSRM.Map.geolocationResponse);
-},
-
-// map event handlers
-zoomed: function(e) {
-	if(OSRM.G.dragging)
-		OSRM.Routing.getRoute_Dragging();
-	else
-		OSRM.Routing.getRoute_Redraw({keepAlternative:true});
-},
-contextmenu: function(e) {;},
-mousemove: function(e) { OSRM.Via.drawDragMarker(e); },
-click: function(e) {
-	OSRM.GUI.deactivateTooltip( "clicking" );	
-	if( !OSRM.G.markers.hasSource() ) {
-		var index = OSRM.G.markers.setSource( e.latlng );
-		OSRM.Geocoder.updateAddress( OSRM.C.SOURCE_LABEL, OSRM.C.DO_FALLBACK_TO_LAT_LNG );
-		OSRM.G.markers.route[index].show();		
-		OSRM.Routing.getRoute( {recenter:OSRM.G.markers.route.length == 2} );	// allow recentering when the route is first shown 
-	} else if( !OSRM.G.markers.hasTarget() ) {
-		var index = OSRM.G.markers.setTarget( e.latlng );
-		OSRM.Geocoder.updateAddress( OSRM.C.TARGET_LABEL, OSRM.C.DO_FALLBACK_TO_LAT_LNG );
-		OSRM.G.markers.route[index].show();
-		OSRM.Routing.getRoute( {recenter:OSRM.G.markers.route.length == 2} );	// allow recentering when the route is first shown
-	}
-},
-geolocationResponse: function(response) {
-	var latlng = new L.LatLng(response.coords.latitude, response.coords.longitude);		
-	OSRM.G.map.setViewUI(latlng, OSRM.DEFAULTS.ZOOM_LEVEL );
-}
-};

WebContent/base/OSRM.Markers.js

@@ -1,141 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM marker management (all route markers should only be set and deleted with these routines!)
-// [this holds the vital information of the route]
-
-OSRM.Markers = function() {
-	this.route = new Array();
-	this.highlight = new OSRM.DragMarker("highlight", {zIndexOffset:-1,draggable:true,icon:OSRM.G.icons['marker-highlight'],dragicon:OSRM.G.icons['marker-highlight-drag']});;
-	this.dragger = new OSRM.DragMarker("drag", {draggable:true,icon:OSRM.G.icons['marker-drag'],dragicon:OSRM.G.icons['marker-drag']});;
-};
-OSRM.extend( OSRM.Markers,{
-reset: function() {
-	// remove route markers
-	for(var i=0; i<this.route.length;i++)
-		this.route[i].hide();
-	this.route.splice(0, this.route.length);
-	document.getElementById('gui-delete-source').style.visibility = "hidden";
-	document.getElementById('gui-delete-target').style.visibility = "hidden";
-	// remove special markers
-	this.highlight.hide();
-	this.dragger.hide();
-},
-removeVias: function() {
-	// assert correct route array s - v - t
-	for(var i=1; i<this.route.length-1;i++)
-		this.route[i].hide();
-	this.route.splice(1, this.route.length-2);
-},
-setSource: function(position) {
-	// source node is always first node
-	if( this.route[0] && this.route[0].label == OSRM.C.SOURCE_LABEL )
-		this.route[0].setPosition(position);
-	else
-		this.route.splice(0,0, new OSRM.RouteMarker(OSRM.C.SOURCE_LABEL, {draggable:true,icon:OSRM.G.icons['marker-source'],dragicon:OSRM.G.icons['marker-source-drag']}, position));
-	document.getElementById('gui-delete-source').style.visibility = "visible";
-	return 0;	
-},
-setTarget: function(position) {
-	// target node is always last node
-	if( this.route[this.route.length-1] && this.route[ this.route.length-1 ].label == OSRM.C.TARGET_LABEL )
-		this.route[this.route.length-1].setPosition(position);
-	else
-		this.route.splice( this.route.length,0, new OSRM.RouteMarker(OSRM.C.TARGET_LABEL, {draggable:true,icon:OSRM.G.icons['marker-target'],dragicon:OSRM.G.icons['marker-target-drag']}, position));
-	document.getElementById('gui-delete-target').style.visibility = "visible";
-	return this.route.length-1;
-},
-setVia: function(id, position) {
-	// via nodes only between source and target nodes
-	if( this.route.length<2 || id > this.route.length-2 )
-		return -1;
-	
-	this.route.splice(id+1,0, new OSRM.RouteMarker(OSRM.C.VIA_LABEL, {draggable:true,icon:OSRM.G.icons['marker-via'],dragicon:OSRM.G.icons['marker-via-drag']}, position));
-	return id+1;
-},
-removeMarker: function(id) {
-	if( id >= this.route.length )
-		return;
-	
-	// also remove vias if source or target are removed
-	if( id==0 && this.route[0].label == OSRM.C.SOURCE_LABEL ) {
-		this.removeVias();
-		document.getElementById('gui-input-source').value = "";
-		document.getElementById('information-box').innerHTML = "";
-		document.getElementById('information-box-header').innerHTML = "";
-		document.getElementById('gui-delete-source').style.visibility = "hidden";
-	} else if( id == this.route.length-1 && this.route[ this.route.length-1 ].label == OSRM.C.TARGET_LABEL ) {
-		this.removeVias();
-		id = this.route.length-1;
-		document.getElementById('gui-input-target').value = "";
-		document.getElementById('information-box').innerHTML = "";
-		document.getElementById('information-box-header').innerHTML = "";
-		document.getElementById('gui-delete-target').style.visibility = "hidden";
-	}
-	
-	this.route[id].hide();
-	this.route.splice(id, 1);
-},
-reverseMarkers: function() {
-	var size = this.route.length;
-	
-	// invert route, if a route is shown	
-	if( size > 1 ) {
-		// switch positions in nodes
-		var temp_position = this.route[0].getPosition();
-		this.route[0].setPosition( this.route[size-1].getPosition() );
-		this.route[size-1].setPosition( temp_position );
-		// switch nodes in array
-		var temp_node = this.route[0];
-		this.route[0] = this.route[size-1];
-		this.route[size-1] = temp_node;
-		// reverse route
-		this.route.reverse();
-		// clear information (both delete markers stay visible)
-		document.getElementById('information-box').innerHTML = "";
-		document.getElementById('information-box-header').innerHTML = "";
-		
-	// invert marker, if only one marker is shown (implicit clear of information / delete markers)
-	} else if( size > 0 ) {
-		var position = this.route[0].getPosition();
-		var label = this.route[0].label;
-		this.removeMarker(0);
-		if( label == OSRM.C.TARGET_LABEL )			
-			this.setSource( position );
-		else if( label == OSRM.C.SOURCE_LABEL )
-			this.setTarget( position );
-		this.route[0].show();
-	}
-
-},
-hasSource: function() {
-	if( this.route[0] && this.route[0].label == OSRM.C.SOURCE_LABEL )
-		return true;
-	return false;
-},
-hasTarget: function() {
-	if( this.route[this.route.length-1] && this.route[this.route.length-1].label == OSRM.C.TARGET_LABEL )
-		return true;
-	return false;
-},
-
-//relabel all via markers
-relabelViaMarkers: function() {
-	for(var i=1, size=this.route.length-1; i<size; i++)
-		this.route[i].marker.setLabel(i);
-}
-});

WebContent/base/OSRM.Routes.js

@@ -1,149 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM route management (handles drawing of route geometry - current route, old route, unnamed route, highlight unnamed streets) 
-// [this holds the route geometry]
-
-
-OSRM.Route = function() {
-	this._current_route		= new OSRM.SimpleRoute("current" , {dashed:false} );
-	this._alternative_route	= new OSRM.SimpleRoute("alternative" , {dashed:false} );
-	this._old_route			= new OSRM.SimpleRoute("old", {dashed:false,color:"#123"} );
-	this._unnamed_route		= new OSRM.MultiRoute("unnamed");
-	
-	this._current_route_style	= {dashed:false,color:'#0033FF', weight:5};
-	this._current_noroute_style	= {dashed:true, color:'#222222', weight:2};
-	this._old_route_style	= {dashed:false,color:'#112233', weight:5};
-	this._old_noroute_style	= {dashed:true, color:'#000000', weight:2};
-	this._unnamed_route_style = {dashed:false, color:'#FF00FF', weight:10};
-	this._old_unnamed_route_style = {dashed:false, color:'#990099', weight:10};
-	this._alternative_route_style	= {dashed:false,color:'#770033', weight:5, opacity:0.6};
-	
-	this._noroute = OSRM.Route.ROUTE;
-	this._history = new OSRM.HistoryRoute();
-};
-OSRM.Route.NOROUTE = true;
-OSRM.Route.ROUTE = false;
-OSRM.extend( OSRM.Route,{
-
-	// show/hide route
-	showRoute: function(positions, noroute) {
-		this._noroute = noroute;
-		this._current_route.setPositions( positions );
-		if ( this._noroute == OSRM.Route.NOROUTE )
-			this._current_route.setStyle( this._current_noroute_style );
-		else
-			this._current_route.setStyle( this._current_route_style );
-		this._current_route.show();
-		//this._raiseUnnamedRoute();
-
-		this._history.fetchHistoryRoute();
-		this._history.showHistoryRoutes();		
-		this._history.storeHistoryRoute();		
-	},
-	hideRoute: function() {
-		this._current_route.hide();
-		this._unnamed_route.hide();
-		
-		this._history.fetchHistoryRoute();
-		this._history.showHistoryRoutes();		
-		// deactivate GUI features that need a route
-		OSRM.GUI.deactivateRouteFeatures();
-	},
-	
-	// show/hide highlighting for unnamed routes
-	showUnnamedRoute: function(positions) {
-		this._unnamed_route.clearRoutes();
-		for(var i=0; i<positions.length; i++) {
-			this._unnamed_route.addRoute(positions[i]);	
-		}
-		this._unnamed_route.setStyle( this._unnamed_route_style );
-		this._unnamed_route.show();
-	},
-	hideUnnamedRoute: function() {
-		this._unnamed_route.hide();
-	},
-	// TODO: hack to put unnamed_route above old_route -> easier way in will be available Leaflet 0.4	
-	_raiseUnnamedRoute: function() {
-		if(this._unnamed_route.isShown()) {
-			this._unnamed_route.hide();
-			this._unnamed_route.show();
-		}		
-	},
-	
-	// show/hide previous route as shadow
-	showOldRoute: function() {
-		this._old_route.setPositions( this._current_route.getPositions() );
-		if ( this._noroute == OSRM.Route.NOROUTE)
-			this._old_route.setStyle( this._old_noroute_style );
-		else
-			this._old_route.setStyle( this._old_route_style );
-		this._old_route.show();
-		this._raiseUnnamedRoute();
-		// change color of unnamed route highlighting - no separate object as dragged route does not have unnamed route highlighting
-		this._unnamed_route.setStyle( this._old_unnamed_route_style );
-	},
-	hideOldRoute: function() {
-		this._old_route.hide();
-	},
-	
-	// show/hide alternative route
-	showAlternativeRoute: function(positions) {
-		this._alternative_route.setPositions( positions );
-		this._alternative_route.setStyle( this._alternative_route_style );
-		this._alternative_route.show();		
-	},
-	hideAlternativeRoute: function() {
-		this._alternative_route.hide();
-	},
-	
-	// query routines
-	isShown: function() {
-		return this._current_route.isShown();
-	},
-	isRoute: function() {
-		return !(this._noroute);
-	},	
-	getPositions: function() {
-		return this._current_route.getPositions();
-	},
-	getPoints: function() {
-		return this._current_route.getPoints();
-	},
-	
-	// helper routines
-	reset: function() {
-		this.hideRoute();
-		this._old_route.hide();
-		this._noroute = OSRM.Route.ROUTE;
-		this._history.clearHistoryRoutes();
-	},
-	fire: function(type,event) {
-		this._current_route.route.fire(type,event);
-	},
-	centerView: function() {
-		this._current_route.centerView();
-	},	
-	
-	// handle history routes
-	activateHistoryRoutes: function() {
-		this._history.activate();
-	},
-	deactivateHistoryRoutes: function() {
-		this._history.deactivate();
-	}	
-});

WebContent/base/OSRM.Via.js

@@ -1,119 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM via marker routines
-// [find correct position for a via marker]
-
-
-OSRM.Via = {
-		
-// find route segment of current route geometry that is closest to the new via node (marked by index of its endpoint)
-_findNearestRouteSegment: function( new_via ) {
-	var min_dist = Number.MAX_VALUE;
-	var min_index = undefined;
-
-	var p = OSRM.G.map.latLngToLayerPoint( new_via );
-	var positions = OSRM.G.route.getPoints();
-	for(var i=1; i<positions.length; i++) {
-		var _sqDist = L.LineUtil._sqClosestPointOnSegment(p, positions[i-1], positions[i], true);
-		if( _sqDist < min_dist) {
-			min_dist = _sqDist;
-			min_index = i;
-		}
-	}
-
-	return min_index;
-},
-
-
-// find the correct index among all via nodes to insert the new via node, and insert it  
-findViaIndex: function( new_via_position ) {
-	// find route segment that is closest to click position (marked by last index)
-	var nearest_index = OSRM.Via._findNearestRouteSegment( new_via_position );
-
-	// find correct index to insert new via node
-	var via_points = OSRM.G.response.via_points;
-	var new_via_index = via_points.length-2;
-	var via_index = Array();
-	for(var i=1; i<via_points.length-1; i++) {
-		via_index[i-1] = OSRM.Via._findNearestRouteSegment( new L.LatLng(via_points[i][0], via_points[i][1]) );
-		if(via_index[i-1] > nearest_index) {
-			new_via_index = i-1;
-			break;
-		}
-	}
-
-	// add via node
-	return new_via_index;
-},
-
-
-//function that draws a drag marker
-dragTimer: new Date(),
-
-drawDragMarker: function(event) {
-	if( OSRM.G.route.isShown() == false)
-		return;
-	if( OSRM.G.dragging == true )
-		return;
-	
-	// throttle computation
-	if( (new Date() - OSRM.Via.dragTimer) < 25 )
-		return;
-	OSRM.Via.dragTimer = new Date();
-	
-	// get distance to route
-	var minpoint = OSRM.G.route._current_route.route.closestLayerPoint( event.layerPoint );
-	var min_dist = minpoint ? minpoint._sqDist : 1000;
-	
-	// get distance to markers
-	var mouse = event.latlng;
-	for(var i=0, size=OSRM.G.markers.route.length; i<size; i++) {
-		if(OSRM.G.markers.route[i].label=='drag')
-			continue;
-		var position = OSRM.G.markers.route[i].getPosition();
-		var dist = OSRM.G.map.project(mouse).distanceTo(OSRM.G.map.project(position));
-		if( dist < 20 )
-			min_dist = 1000;
-	}
-	
-	// check whether mouse is over another marker
-	var pos = OSRM.G.map.layerPointToContainerPoint(event.layerPoint);
-	var obj = document.elementFromPoint(pos.x,pos.y);
-	for(var i=0, size=OSRM.G.markers.route.length; i<size; i++) {
-		if(OSRM.G.markers.route[i].label=='drag')
-			continue;
-		if( obj == OSRM.G.markers.route[i].marker._icon)
-			min_dist = 1000;
-	}
-	
-	// special care for highlight marker
-	if( OSRM.G.markers.highlight.isShown() ) {
-		if( OSRM.G.map.project(mouse).distanceTo(OSRM.G.map.project( OSRM.G.markers.highlight.getPosition() ) ) < 20 )
-			min_dist = 1000;
-		else if( obj == OSRM.G.markers.highlight.marker._icon)
-			min_dist = 1000;
-	}
-	
-	if( min_dist < 400) {
-		OSRM.G.markers.dragger.setPosition( OSRM.G.map.layerPointToLatLng(minpoint) );
-		OSRM.G.markers.dragger.show();
-	} else
-		OSRM.G.markers.dragger.hide();
-}
-
-};

WebContent/base/leaflet/L.Bugfixes.js

@@ -1,80 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// Leaflet bugfixes
-// [assorted bugfixes to Leaflet functions we use]
-
-
-// return closest point on segment or distance to that point
-L.LineUtil._sqClosestPointOnSegment = function (p, p1, p2, sqDist) {
-	var x = p1.x,
-		y = p1.y,
-		dx = p2.x - x,
-		dy = p2.y - y,
-		dot = dx * dx + dy * dy,
-		t;
-
-	if (dot > 0) {
-		t = ((p.x - x) * dx + (p.y - y) * dy) / dot;
-
-		if (t > 1) {
-			x = p2.x;
-			y = p2.y;
-		} else if (t > 0) {
-			x += dx * t;
-			y += dy * t;
-		}
-	}
-
-	dx = p.x - x;
-	dy = p.y - y;
-		
-	// DS_CHANGE: modified return values
-	if(sqDist)
-		return dx*dx + dy*dy;
-	else {
-		var p = new L.Point(x,y);
-		p._sqDist = dx*dx + dy*dy;
-		return p;
-	}
-};
-
-
-// makes requestAnimFrame respect the immediate paramter -> prevents drag events after dragend events
-// (alternatively: add if(!this.dragging ) return to L.Draggable._updatePosition, but must be done in leaflet.js!)
-// [TODO: In Leaflet 0.4 use L.Util.cancelAnimFrame(this._animRequest) in L.Draggable._onUp() instead, also has to be done in leaflet.js!]
-L.Util.requestAnimFrame = (function () {
-	function timeoutDefer(callback) {
-		window.setTimeout(callback, 1000 / 60);
-	}
-
-	var requestFn = window.requestAnimationFrame ||
-		window.webkitRequestAnimationFrame ||
-		window.mozRequestAnimationFrame ||
-		window.oRequestAnimationFrame ||
-		window.msRequestAnimationFrame ||
-		timeoutDefer;
-
-	return function (callback, context, immediate, contextEl) {
-		callback = context ? L.Util.bind(callback, context) : callback;
-		if (immediate ) {		// DS_CHANGE: removed additional condition requestFn === timeoutDefer
-			callback();
-		} else {
-			requestFn(callback, contextEl);
-		}
-	};
-}());	

WebContent/base/leaflet/L.Control.QueryableLayers.js

@@ -1,85 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// queryable Layers control
-// [simply Control.Layers extended by query functions and some fixes for touch screens]
-L.Control.QueryableLayers = L.Control.Layers.extend({
-	
-// changes to leaflet behaviour
-_initLayout: function () {
-	this._container = L.DomUtil.create('div', 'leaflet-control-layers');
-	L.DomEvent.disableClickPropagation(this._container);							// change to Leaflet: always disable click propagation 
-
-	this._form = L.DomUtil.create('form', 'leaflet-control-layers-list');
-
-	if (this.options.collapsed) {
-		L.DomEvent.addListener(this._container, 'mouseover', this._expand, this);
-		L.DomEvent.addListener(this._container, 'mouseout', this._collapse, this);
-
-		var link = this._layersLink = L.DomUtil.create('a', 'leaflet-control-layers-toggle');
-		link.href = '#';
-		link.title = 'Layers';
-
-		if (L.Browser.touch) {
-			L.DomEvent.addListener(link, 'click', this._expand, this);
-			L.DomEvent.disableClickPropagation(link);								// change to Leaflet: disable click propagation
-		} else {
-			L.DomEvent.addListener(link, 'focus', this._expand, this);
-		}
-		this._map.on('movestart', this._collapse, this);
-		// TODO keyboard accessibility
-
-		this._container.appendChild(link);
-	} else {
-		this._expand();
-	}
-
-	this._baseLayersList = L.DomUtil.create('div', 'leaflet-control-layers-base', this._form);
-	this._separator = L.DomUtil.create('div', 'leaflet-control-layers-separator', this._form);
-	this._overlaysList = L.DomUtil.create('div', 'leaflet-control-layers-overlays', this._form);
-
-	this._container.appendChild(this._form);
-},
-
-// new query functionality
-getActiveLayerName: function () {
-	var i, input, obj,
-	inputs = this._form.getElementsByTagName('input'),
-	inputsLen = inputs.length;
-
-	for (i = 0; i < inputsLen; i++) {
-		input = inputs[i];
-		obj = this._layers[input.layerId];
-		if (input.checked && !obj.overlay) {
-			return obj.name;
-		}
-	}
-},
-getActiveLayer: function () {
-	var i, input, obj,
-	inputs = this._form.getElementsByTagName('input'),
-	inputsLen = inputs.length;
-
-	for (i = 0; i < inputsLen; i++) {
-		input = inputs[i];
-		obj = this._layers[input.layerId];
-		if (input.checked && !obj.overlay) {
-			return obj.layer;
-		}
-	}
-}
-});

WebContent/base/leaflet/L.DashedPolyline.js

@@ -1,60 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// Leaflet extension: Dashed Polyline
-// [adds dashed optionally dashed lines when using SVG or VML rendering]
-
-
-// dashed polyline class
-L.DashedPolyline = L.Polyline.extend({
-	initialize: function(latlngs, options) {
-		L.Polyline.prototype.initialize.call(this, latlngs, options);
-	},
-	
-	options: {
-		dashed: true
-	}
-});
-
-
-// svg rendering
-L.DashedPolyline = !L.Browser.svg ? L.DashedPolyline : L.DashedPolyline.extend({
-	_updateStyle: function () {
-		L.Polyline.prototype._updateStyle.call(this);
-		if (this.options.stroke) {
-			if (this.options.dashed == true)
-				this._path.setAttribute('stroke-dasharray', '8,6');
-			else
-				this._path.setAttribute('stroke-dasharray', '');
-		}
-	}
-});
-
-
-// vml rendering
-L.DashedPolyline = L.Browser.svg || !L.Browser.vml ? L.DashedPolyline : L.DashedPolyline.extend({
-	_updateStyle: function () {
-		L.Polyline.prototype._updateStyle.call(this);
-		if (this.options.stroke) {
-			if (this.options.dashed == true)
-				this._stroke.dashstyle = "dash";
-			else
-				this._stroke.dashstyle = "solid";
-		}
-	}
-	
-});

WebContent/base/leaflet/L.MouseMarker.js

@@ -1,72 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// Leaflet extension: MouseMarker
-// [marker class that propagates modifier and button presses in mouse click events and allows for changing icons]
-
-
-// extended marker class
-L.MouseMarker = L.Marker.extend({
-	initialize: function (latlng, options) {
-		L.Marker.prototype.initialize.apply(this, arguments);
-	},
-	
-	switchIcon: function( icon ) {
-		this.options.icon = icon;
-
-		if (this._map) {
-			this._changeIcon();
-			this._reset();
-		}
-	},
-	
-	setLabel: function( label ) {
-		if(this._icon) {
-			this._icon.lastChild.innerHTML=label;
-			this._icon.lastChild.style.display = "block";
-		}
-	},
-	
-	_changeIcon: function () {
-		var options = this.options;
-
-		if (this._icon) {
-			this._icon = options.icon.switchIcon( this._icon );
-			if (this.options.clickable)									// TODO: only needed until Leaflet 0.4
-				this._icon.className += ' leaflet-clickable';
-		}
-		
-		var panes = this._map._panes;
-		
-		if (this._shadow)
-			panes.shadowPane.removeChild(this._shadow);
-		this._shadow = options.icon.createShadow();
-		if (this._shadow)
-			panes.shadowPane.appendChild(this._shadow);
-	},	
-
-	_onMouseClick: function (e) {
-		L.DomEvent.stopPropagation(e);
-		if (this.dragging && this.dragging.moved()) { return; }
-		this.fire(e.type, {
-			altKey: e.altKey,
-			ctrlKey: e.ctrlKey,
-			shiftKey: e.shiftKey,
-			button: e.button
-		});
-	}
-});

WebContent/base/leaflet/L.SwitchableIcon.js

@@ -1,123 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// Leaflet extension: SwitchableIcon
-// [will be an extension of L.Icon in Leaflet 0.4, for now it is a copy with added functionality]
-
-
-// icon class with functions to simply switch the icon images
-L.SwitchableIcon = L.Class.extend({
-	options: {
-		/*
-		iconUrl: (String) (required)
-		iconSize: (Point) (can be set through CSS)
-		iconAnchor: (Point) (centered by default if size is specified, can be set in CSS with negative margins)
-		popupAnchor: (Point) (if not specified, popup opens in the anchor point)
-		shadowUrl: (Point) (no shadow by default)
-		shadowSize: (Point)
-		*/
-		className: ''
-	},
-
-	initialize: function (options) {
-		L.Util.setOptions(this, options);
-	},
-
-	createIcon: function () {
-		return this._createIcon('icon');
-	},
-
-	createShadow: function () {
-		return this.options.shadowUrl ? this._createIcon('shadow') : null;
-	},
-
-	_createIcon: function (name) {
-		var img = this._createImg(this.options[name + 'Url']);
-		this._setIconStyles(img, name);
-		return img;
-	},
-
-	_setIconStyles: function (img, name) {
-		var options = this.options,
-			size = options[name + 'Size'],
-			anchor = options.iconAnchor;
-
-		if (!anchor && size) {
-			anchor = size.divideBy(2, true);
-		}
-
-		if (name === 'shadow' && anchor && options.shadowOffset) {
-			anchor._add(options.shadowOffset);
-		}
-
-		img.className = 'leaflet-marker-' + name + ' ' + options.className;
-
-		if (anchor) {
-			img.style.marginLeft = (-anchor.x) + 'px';
-			img.style.marginTop  = (-anchor.y) + 'px';
-		}
-
-		if (size) {
-			img.style.width  = size.x + 'px';
-			img.style.height = size.y + 'px';
-		}
-	},
-
-	_createImg: function (src) {
-		var el;
-		if (!L.Browser.ie6) {
-			el = document.createElement('div');
-			
-			var img = document.createElement('img');
-			var num = document.createElement('div');
-			img.src = src;
-			num.className = 'via-counter';
-			num.innerHTML = "";
-			
-			el.appendChild(img);
-			el.appendChild(num);
-		} else {
-			el = document.createElement('div');
-			el.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")';
-		}
-		return el;
-	},
-
-	// new functions start here
-	switchIcon: function (el) {
-		return this._switchIcon('icon', el);
-	},
-
-	switchShadow: function (el) {
-		return this.options.shadowUrl ? this._switchIcon('shadow', el) : null;
-	},
-
-	_switchIcon: function (name, el) {
-		var img = this._switchImg(this.options[name + 'Url'], el);
-		this._setIconStyles(img, name);
-		return img;
-	},	
-	
-	_switchImg: function (src, el) {
-		if (!L.Browser.ie6) {
-			el.firstChild.src = src;
-		} else {
-			el.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")';
-		}
-		return el;
-	}	
-});

WebContent/base/leaflet/L.TileLayer.Bing.js

@@ -1,191 +0,0 @@
-/* 
- * Portions of this code and logic copied from OpenLayers and
- * redistributed under the original Clear BSD license terms:
- * 
- * http://trac.osgeo.org/openlayers/browser/license.txt
- *
- * Copyright 2005-2010 OpenLayers Contributors, released under 
- * the Clear BSD license. See authors.txt for a list of contributors.
- * All rights reserved.
- *
- * --
- *
- * Leaflet-specific modifications are released under the following
- * terms:
- *
- * This program is free software. It comes without any warranty, to
- * the extent permitted by applicable law. You can redistribute it
- * and/or modify it under the terms of the Do What The Fuck You Want
- * To Public License, Version 2, as published by Sam Hocevar. See
- * http://sam.zoy.org/wtfpl/COPYING for more details. 
- */
-
-L.TileLayer.Bing = L.TileLayer.extend({
-  
-  supportedTypes: ['Road', 'Aerial', 'AerialWithLabels'],
-  
-  attributionTemplate: '<span style="display:inline-block">' +
-       '<a target="_blank" href="http://www.bing.com/maps/">' +
-       //'<img src="{logo}" /></a><br><span>{copyrights}' +
-       '</a><span>{copyrights}' +
-       '<a style="white-space: nowrap" target="_blank" '+
-       'href="http://www.microsoft.com/maps/product/terms.html">' +
-       'Terms of Use</a></span></span>',
-       
-  supportedCultures: {"en":"en-US", "de":"de-DE", "fr":"fr-FR", "it":"it-IT", "es":"es-ES", "nl":"nl-BE"},
-  
-  initialize: function(/*String*/ apiKey, /*String*/ mapType, /*Object*/ options) {
-    
-    this._apiKey = apiKey;
-    this._mapType = mapType;
-    
-    this._loadMetadata();
-    
-    L.Util.setOptions(this, options);
-  },
-  
-  redraw: function() {
-    this._reset();
-    this._update();  
-  },
-  
-  _loadMetadata: function() {
-    this._callbackId = "_l_tilelayer_bing_" + (L.TileLayer.Bing._callbackId++);
-    var that = this;
-    window[this._callbackId] = function() {
-      L.TileLayer.Bing.processMetadata.apply(that, arguments);
-    };
-    
-    var params = {
-      key: this._apiKey,
-      jsonp: this._callbackId,
-      include: 'ImageryProviders'
-    },
-        url = "http://dev.virtualearth.net/REST/v1/Imagery/Metadata/" +
-              this._mapType + L.Util.getParamString(params),
-        script = document.createElement("script");
-        
-    script.type = "text/javascript";
-    script.src = url;
-    script.id = this._callbackId;
-    document.getElementsByTagName("head")[0].appendChild(script);
-  },
-  
-  _onMetadataLoaded: function() {},
-  
-  onAdd: function(map, insertAtTheBottom) {
-    if (!this.metadata) {
-      this._onMetadataLoaded = L.Util.bind(function() {
-        L.TileLayer.prototype.onAdd.call(this, map, insertAtTheBottom);
-        map.on('moveend', this._updateAttribution, this);
-        this._updateAttribution();
-      }, this);
-    } else {
-      L.TileLayer.prototype.onAdd.call(this, map, insertAtTheBottom);
-      map.on('moveend', this._updateAttribution, this);
-      this._updateAttribution();
-    }
-  },
-  
-  onRemove: function(map) {
-    if (this._map.attributionControl) {
-      this._map.attributionControl.removeAttribution(this.attribution);
-    }
-    this._map.off('moveend', this._updateAttribution, this);
-    L.TileLayer.prototype.onRemove.call(this, map);
-  },
-  
-  getTileUrl: function(xy, z) {
-    var subdomains = this.options.subdomains,
-			  quadDigits = [],
-			  i = z,
-			  digit,
-			  mask,
-			  quadKey;
-    // borrowed directly from OpenLayers
-    for (; i > 0; --i) {
-        digit = '0';
-        mask = 1 << (i - 1);
-        if ((xy.x & mask) != 0) {
-            digit++;
-        }
-        if ((xy.y & mask) != 0) {
-            digit++;
-            digit++;
-        }
-        quadDigits.push(digit);
-    }
-
-		return this._url
-				.replace('{culture}', this.supportedCultures[OSRM.Localization.current_language] || "en-US" )
-				.replace('{subdomain}', subdomains[(xy.x + xy.y) % subdomains.length])
-				.replace('{quadkey}', quadDigits.join(""));		
-  },
-  
-  _updateAttribution: function() {
-    if (this._map.attributionControl) {
-      var metadata = this.metadata;
-      var res = metadata.resourceSets[0].resources[0];
-      var bounds = this._map.getBounds();
-      var providers = res.imageryProviders, zoom = this._map.getZoom() + 1,
-          copyrights = "", provider, i, ii, j, jj, bbox, coverage;
-      for (i=0,ii=providers.length; i<ii; ++i) {
-          provider = providers[i];
-          for (j=0,jj=provider.coverageAreas.length; j<jj; ++j) {
-              coverage = provider.coverageAreas[j];
-              if (zoom <= coverage.zoomMax && zoom >= coverage.zoomMin && coverage.bbox.intersects(bounds)) {
-                  copyrights += provider.attribution + " ";
-                  j = jj;
-              }
-          }
-      }
-      this._map.attributionControl.removeAttribution(this.attribution);
-      this._map.attributionControl._attributions = {};
-      this._map.attributionControl._update();
-      this.attribution = this.attributionTemplate
-        .replace('{logo}', metadata.brandLogoUri)
-        .replace('{copyrights}', copyrights);
-      this._map.attributionControl.addAttribution(this.attribution);
-    }
-  }    
-});
-
-L.TileLayer.Bing._callbackId = 0;
-
-L.TileLayer.Bing.processMetadata = function(metadata) {
-  if (metadata.authenticationResultCode != 'ValidCredentials') {
-    throw "Invalid Bing Maps API Key"
-  }
-  
-  if (!metadata.resourceSets.length || !metadata.resourceSets[0].resources.length) {
-    throw "No resources returned, perhaps " + this._mapType + " is an invalid map type?";
-  }
-  
-  if (metadata.statusCode != 200) {
-    throw "Bing Maps API request failed with status code " + metadata.statusCode;
-  }
-  
-  this.metadata = metadata;
-  var res = metadata.resourceSets[0].resources[0],
-      providers = res.imageryProviders,
-      i = 0,
-      j,
-      provider,
-      bbox,
-      script = document.getElementById(this._callbackId);
-  
-  for (; i<providers.length; i++) {
-    provider = providers[i];
-    for (j=0; j<provider.coverageAreas.length; j++) {
-      bbox = provider.coverageAreas[j].bbox;
-      provider.coverageAreas[j].bbox = new L.LatLngBounds(new L.LatLng(bbox[0],bbox[1],true),new L.LatLng(bbox[2],bbox[3], true));
-    }
-  }
-  
-  this._url = res.imageUrl;
-  this.options.subdomains = [].concat(res.imageUrlSubdomains);
-  script.parentNode.removeChild(script);
-  window[this._callbackId] = undefined; // cannot delete from window in IE
-  delete this._callbackId;
-  this._onMetadataLoaded();
-}

WebContent/base/osrm/OSRM.MapView.js

@@ -1,130 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// map view/model
-// [extending Leaflet L.Map with setView/fitBounds methods that respect UI visibility, better layerControl] 
-OSRM.MapView = L.Map.extend({
-	_boundsInsideView: function(bounds) {
-		var viewBounds = this.getBounds(),
-		viewSw = this.project(viewBounds.getSouthWest()),
-		viewNe = this.project(viewBounds.getNorthEast()),
-		sw = this.project(bounds.getSouthWest()),
-		ne = this.project(bounds.getNorthEast());
-
-		if (viewNe.y > ne.y) { // north
-			return false;
-		}
-		if (viewNe.x < ne.x) { // east
-			return false;
-		}
-		if (viewSw.y < sw.y) { // south
-			return false;
-		}
-		if (viewSw.x > sw.x) { // west
-			return false;
-		}		
-		return true;
-	},
-	setViewBounds: function(bounds) {
-		var zoom = this.getBoundsZoom(bounds);			// maximum zoom level at which the bounds fit onto the map
-		
-		if( this._zoom > zoom ) {						// if current zoom level is too close change zoom level and recenter
-			this.setView(bounds.getCenter(), zoom);
-		} else if(!this._boundsInsideView(bounds)){	// if current zoom level is okay, but bounds are outside the viewport, pan
-			this.setView(bounds.getCenter(),  this._zoom);
-		}
-	},	
-	setViewUI: function(position, zoom, no_animation) {
-		if( OSRM.G.main_handle.boxVisible() ) {
-			var point = this.project( position, zoom);
-			point.x-=OSRM.G.main_handle.boxWidth()/2;
-			position = this.unproject(point,zoom);		
-		}
-		this.setView( position, zoom, no_animation);	
-	},
-	setViewBoundsUI: function(bounds) {
-		var southwest = bounds.getSouthWest();
-		var northeast = bounds.getNorthEast();
-		var zoom = this.getBoundsZoom(bounds);
-		var sw_point = this.project( southwest, zoom);
-		if( OSRM.G.main_handle.boxVisible() )
-			sw_point.x-=OSRM.G.main_handle.boxWidth()+20;
-		else
-			sw_point.x-=20;
-		sw_point.y+=20;
-		var ne_point = this.project( northeast, zoom);
-		ne_point.y-=20;
-		ne_point.x+=20;
-		bounds.extend( this.unproject(sw_point,zoom) );
-		bounds.extend( this.unproject(ne_point,zoom) );
-		this.setViewBounds( bounds );	
-	},	
-	fitBoundsUI: function(bounds) {
-		var southwest = bounds.getSouthWest();
-		var northeast = bounds.getNorthEast();
-		var zoom = this.getBoundsZoom(bounds);
-		var sw_point = this.project( southwest, zoom);
-		if( OSRM.G.main_handle.boxVisible() )
-			sw_point.x-=OSRM.G.main_handle.boxWidth()+20;
-		else
-			sw_point.x-=20;
-		sw_point.y+=20;
-		var ne_point = this.project( northeast, zoom);
-		ne_point.y-=20;
-		ne_point.x+=20;
-		bounds.extend( this.unproject(sw_point,zoom) );
-		bounds.extend( this.unproject(ne_point,zoom) );
-		this.fitBounds( bounds );	
-	},
-	getBoundsUI: function(unbounded) {
-		var bounds = this.getPixelBounds();
-		if( OSRM.G.main_handle.boxVisible() )
-			bounds.min.x+=OSRM.G.main_handle.boxWidth();
-		var sw = this.unproject(new L.Point(bounds.min.x, bounds.max.y), this._zoom, true),
-			ne = this.unproject(new L.Point(bounds.max.x, bounds.min.y), this._zoom, true);
-		return new L.LatLngBounds(sw, ne);		
-	},	
-	getCenterUI: function(unbounded) {
-		var viewHalf = this.getSize();
-		if( OSRM.G.main_handle.boxVisible() )
-			viewHalf.x += OSRM.G.main_handle.boxWidth();
-		var centerPoint = this._getTopLeftPoint().add(viewHalf.divideBy(2));
-		
-		return this.unproject(centerPoint, this._zoom, unbounded);
-	},
-	addLayerControl: function( layerControl ) {
-		if( this.layerControl )
-			return;
-		
-		this.layerControl = layerControl;
-		this.addControl(this.layerControl);
-	},
-	getActiveLayerId: function() {
-		var tile_server_id = 0;
-		
-		var tile_servers = OSRM.DEFAULTS.TILE_SERVERS;
-		var tile_server_name = this.layerControl.getActiveLayerName();
-		for(var i=0, size=tile_servers.length; i<size; i++) {
-			if( tile_servers[i].display_name == tile_server_name ) {
-				tile_server_id = i;
-				break;
-			}
-		}
-		
-		return tile_server_id;
-	}
-});

WebContent/base/osrm/OSRM.Marker.js

@@ -1,167 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM markers 
-// [base marker class, derived highlight marker and route marker classes]  
-
-
-// base marker class (wraps Leaflet markers)
-OSRM.Marker = function( label, style, position ) {
-	this.label = label ? label : "marker";
-	this.position = position ? position : new L.LatLng(0,0);
-
-	this.marker = new L.MouseMarker( this.position, style );
-	this.marker.parent = this;
-	
-	this.shown = false;
-	this.hint = null;
-};
-OSRM.extend( OSRM.Marker,{
-show: function() {
-	OSRM.G.map.addLayer(this.marker);
-	this.shown = true;
-},
-hide: function() {
-	OSRM.G.map.removeLayer(this.marker);
-	this.shown = false;
-},
-setPosition: function( position ) {
-	this.position = position;
-	this.marker.setLatLng( position );
-	this.hint = null;	
-},
-getPosition: function() {
-	return this.position;
-},
-getLat: function() {
-	return this.position.lat;
-},
-getLng: function() {
-	return this.position.lng;
-},
-isShown: function() {
-	return this.shown;
-},
-centerView: function(zoom) {
-	if( zoom == undefined )
-		zoom = OSRM.DEFAULTS.ZOOM_LEVEL;
-	OSRM.G.map.setViewUI( this.position, zoom );
-},
-toString: function() {
-	return "OSRM.Marker: \""+this.label+"\", "+this.position+")";
-}
-});
-
-
-// route marker class (draggable, invokes route drawing routines) 
-OSRM.RouteMarker = function ( label, style, position ) {
-	style.baseicon = style.icon;
-	OSRM.RouteMarker.prototype.base.constructor.apply( this, arguments );
-	this.label = label ? label : "route_marker";
-
- 	this.marker.on( 'click', this.onClick );
- 	this.marker.on( 'drag', this.onDrag );
- 	this.marker.on( 'dragstart', this.onDragStart );
- 	this.marker.on( 'dragend', this.onDragEnd );
-};
-OSRM.inheritFrom( OSRM.RouteMarker, OSRM.Marker );
-OSRM.extend( OSRM.RouteMarker, {
-onClick: function(e) {
-	for( var i=0; i<OSRM.G.markers.route.length; i++) {
-		if( OSRM.G.markers.route[i].marker === this ) {
-			OSRM.G.markers.removeMarker( i );
-			break;
-		}
-	}
-	
-	OSRM.Routing.getRoute();
-	OSRM.G.markers.highlight.hide();
-	OSRM.G.markers.dragger.hide();
-},
-onDrag: function(e) {
-	this.parent.setPosition( e.target.getLatLng() );
-	if(OSRM.G.markers.route.length>1)
-		OSRM.Routing.getRoute_Dragging();
-	OSRM.Geocoder.updateLocation( this.parent.label );
-},
-onDragStart: function(e) {
-	OSRM.GUI.deactivateTooltip( "dragging" );	
-	OSRM.G.dragging = true;
-	this.switchIcon(this.options.dragicon);
-	
-	// store id of dragged marker
-	for( var i=0; i<OSRM.G.markers.route.length; i++)
-		if( OSRM.G.markers.route[i].marker === this ) {
-			OSRM.G.dragid = i;
-			break;
-		}
-	
-	if( this.parent != OSRM.G.markers.highlight)
-		OSRM.G.markers.highlight.hide();
-	if( this.parent != OSRM.G.markers.dragger)
-		OSRM.G.markers.dragger.hide();
-	if (OSRM.G.route.isShown())
-		OSRM.G.route.showOldRoute();
-},
-onDragEnd: function(e) {
-	OSRM.G.dragging = false;
-	this.switchIcon(this.options.baseicon);
-	
-	this.parent.setPosition( e.target.getLatLng() );	
-	if (OSRM.G.route.isShown()) {
-		OSRM.Routing.getRoute();
-		OSRM.G.route.hideOldRoute();
-		OSRM.G.route.hideUnnamedRoute();
-	} else {
-		OSRM.Geocoder.updateAddress(this.parent.label);
-		OSRM.GUI.clearResults();
-	}
-},
-toString: function() {
-	return "OSRM.RouteMarker: \""+this.label+"\", "+this.position+")";
-}
-});
-
-
-//drag marker class (draggable, invokes route drawing routines) 
-OSRM.DragMarker = function ( label, style, position ) {
-	OSRM.DragMarker.prototype.base.constructor.apply( this, arguments );
-	this.label = label ? label : "drag_marker";
-};
-OSRM.inheritFrom( OSRM.DragMarker, OSRM.RouteMarker );
-OSRM.extend( OSRM.DragMarker, {
-onClick: function(e) {
-	if( this.parent != OSRM.G.markers.dragger)
-		this.parent.hide();
-},
-onDragStart: function(e) {
-	var new_via_index = OSRM.Via.findViaIndex( e.target.getLatLng() );
-	OSRM.G.markers.route.splice(new_via_index+1,0, this.parent );
-
-	OSRM.RouteMarker.prototype.onDragStart.call(this,e);
-},
-onDragEnd: function(e) {
-	OSRM.G.markers.route[OSRM.G.dragid] = new OSRM.RouteMarker(OSRM.C.VIA_LABEL, {draggable:true,icon:OSRM.G.icons['marker-via'],dragicon:OSRM.G.icons['marker-via-drag']}, e.target.getLatLng() );
-	OSRM.G.markers.route[OSRM.G.dragid].show();
-	
-	OSRM.RouteMarker.prototype.onDragEnd.call(this,e);
-	this.parent.hide();
-},
-toString: function() {
-	return "OSRM.DragMarker: \""+this.label+"\", "+this.position+")";
-}
-});

WebContent/base/osrm/OSRM.Route.js

@@ -1,98 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM routes
-// [drawing of all types of route geometry] 
-
-
-// simple route class (wraps Leaflet Polyline)
-OSRM.SimpleRoute = function (label, style) {
-	this.label = (label ? label : "route");
-	this.route = new L.DashedPolyline();
-	this.route.setLatLngs( [] );
-	if(style) this.route.setStyle( style );
-
-	this.shown = false;
-};
-OSRM.extend( OSRM.SimpleRoute,{
-show: function() {
-	OSRM.G.map.addLayer(this.route);
-	this.shown = true;
-},
-hide: function() {
-	OSRM.G.map.removeLayer(this.route);
-	this.shown = false;
-},
-isShown: function() {
-	return this.shown;
-},
-getPoints: function() {
-	return this.route._originalPoints;
-},
-getPositions: function() {
-	return this.route.getLatLngs();
-},
-setPositions: function(positions) {
-	this.route.setLatLngs( positions );
-},
-setStyle: function(style) {
-	this.route.setStyle(style);
-},
-centerView: function() {
-	var bounds = new L.LatLngBounds( this.getPositions() );
-	OSRM.g.map.fitBoundsUI( bounds );
-},
-toString: function() {
-	return "OSRM.Route("+ this.label + ", " + this.route.getLatLngs().length + " points)";
-}
-});
-
-
-// multiroute class (wraps Leaflet LayerGroup to hold several disjoint routes)
-OSRM.MultiRoute = function (label) {
-	this.label = (label ? label : "multiroute");
-	this.route = new L.LayerGroup();
-
-	this.shown = false;
-};
-OSRM.extend( OSRM.MultiRoute,{
-show: function() {
-	OSRM.G.map.addLayer(this.route);
-	this.shown = true;
-},
-hide: function() {
-	OSRM.G.map.removeLayer(this.route);
-	this.shown = false;
-},
-isShown: function() {
-	return this.shown;
-},
-addRoute: function(positions) {
-	var line = new L.DashedPolyline( positions );
-	line.on('click', function(e) { OSRM.G.route.fire('click',e); });
-	this.route.addLayer( line );
-},
-clearRoutes: function() {
-	this.route.clearLayers();
-},
-setStyle: function(style) {
-	this.route.invoke('setStyle', style);
-},
-toString: function() {
-	return "OSRM.MultiRoute("+ this.label + ")";
-}
-});

WebContent/gui/OSRM.GUI.js

@@ -1,44 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM GUI
-// [base GUI class, all other GUI modules extend this class]
-
-
-OSRM.GUI = {
-		
-// initialization functions of all GUI parts
-init_functions: [],
-
-// init GUI
-init: function() {
-	for(var i=0, size=OSRM.GUI.init_functions.length; i<size; i++) {
-		OSRM.GUI.init_functions[i]();
-	}
-},
-
-//extend GUI class and add init functions to the array
-extend: function( properties ) {
-	for( property in properties ) {
-		if( property == 'init' )
-			OSRM.GUI.init_functions.push( properties[property] );
-		else
-			OSRM.GUI[property] = properties[property];
-	}
-} 
-
-};

WebContent/gui/OSRM.GUIBoxGroup.js

@@ -1,53 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM MainGUI
-// [handles all GUI events that interact with appearance of main window]
-
-
-// OSRM GUIBoxGroup
-// [group UI boxes so that handles can be shown/hidden together]
-
-OSRM.GUIBoxGroup = function() {
-	this._handles = [];
-};
-
-OSRM.extend( OSRM.GUIBoxGroup, {
-add: function( handle ) {
-	this._handles.push( handle );
-	handle.$addToGroup(this);
-},
-select: function( handle ) {
-	for(var i=0; i< this._handles.length; i++) {
-		if( this._handles[i] != handle )
-			this._handles[i].$hideBox();
-		else
-			this._handles[i].$showBox();
-	}
-},
-
-$hide: function() {
-	for(var i=0; i< this._handles.length; i++) {
-		this._handles[i].$hide();
-	}
-},
-$show: function() {
-	for(var i=0; i< this._handles.length; i++) {
-		this._handles[i].$show();
-	}
-}
-});

WebContent/gui/OSRM.GUIBoxHandle.js

@@ -1,134 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM GUIBoxHandle
-// [performs showing and hiding of UI boxes]
-
-OSRM.GUIBoxHandle = function( box_name, side, css, transitionStartFct, transitionEndFct  ) {
-	// do not create handle if box does not contain a toggle button
-	var toggle = document.getElementById( box_name + '-toggle');
-	if( toggle == null ) {
-		console.log("[error] No toggle button for " + box_name);
-		return;
-	}
-	
-	// create handle DOM elements
-	var wrapper = document.createElement('div');
-	wrapper.id = box_name + '-handle-wrapper';
-	wrapper.className = 'box-wrapper box-handle-wrapper-'+side;
-	wrapper.style.cssText += css;
-	var content = document.createElement('div');
-	content.id = box_name + '-handle-content';
-	content.className = 'box-content box-handle-content-'+side;
-	var icon = document.createElement('div');
-	icon.id = box_name + '-handle-icon';
-	icon.className = 'iconic-button';
-	
-	content.appendChild(icon);
-	wrapper.appendChild(content);
-	document.body.appendChild(wrapper);
-	
-	// create attributes
-	this._box = document.getElementById( box_name + '-wrapper' );
-	this._class = this._box.className;
-	this._width = this._box.clientWidth;
-	this._side = side;
-	this._handle = wrapper;
-	this._box_group = null;
-	this._transitionEndFct = transitionEndFct;
-
-	// hide box and show handle by default
-	this._box.style[this._side]=-this._width+"px";
-	this._box_visible = false;
-	this._box.style.visibility="hidden";
-	this._handle.style.visibility="visible";
-
-	// add functionality
-	var full_fct = transitionStartFct ? OSRM.concat(this._toggle, transitionStartFct) : this._toggle;
-	var fct = OSRM.bind( this, full_fct );
-	toggle.onclick = fct;
-	icon.onclick = fct;
-	
-	var full_fct = transitionEndFct ? OSRM.concat(this._onTransitionEnd, transitionEndFct) : this._onTransitionEnd;
-	var fct = OSRM.bind( this, full_fct );	
-	if( OSRM.Browser.FF3==-1 && OSRM.Browser.IE6_9==-1 ) {
-		var box_wrapper = document.getElementById(box_name + '-wrapper');
-		box_wrapper.addEventListener("transitionend", fct, false);
-		box_wrapper.addEventListener("webkitTransitionEnd", fct, false);
-		box_wrapper.addEventListener("oTransitionEnd", fct, false);
-		box_wrapper.addEventListener("MSTransitionEnd", fct, false);
-	} else {
-		this._legacyTransitionEndFct = fct;			// legacy browser support
-	}
-};
-
-OSRM.extend( OSRM.GUIBoxHandle, {
-boxVisible: function() {
-	return this._box_visible;
-},
-boxWidth: function() {
-	return this._width;
-},
-
-$addToGroup: function(group) {
-	this._box_group = group;
-},
-$show: function() {
-	this._handle.style.visibility="visible";
-},
-$hide: function() {
-	this._handle.style.visibility="hidden";
-},
-$showBox: function() {
-	this._box_visible = true;
-	this._box.style.visibility="visible";
-	this._handle.style.visibility="hidden";
-	this._box.style[this._side]="5px";
-	this._transitionEndFct();
-},
-$hideBox: function() {
-	this._box_visible = false;
-	this._box.style.visibility="hidden";
-	this._handle.style.visibility="visible";
-	this._box.style[this._side]=-this._width+"px";
-},
-
-_toggle: function() {
-	this._box.className += " box-animated";
-	if( this._box_visible == false ) {
-		this._box_group.$hide();
-		this._box.style[this._side]="5px";
-		this._box.style.visibility="visible";			// already show box, so that animation is seen
-	} else {
-		this._box.style[this._side]=-this._width+"px";
-	}
-	// legacy browser support
-	if( OSRM.Browser.FF3!=-1 || OSRM.Browser.IE6_9!=-1 )
-		setTimeout(this._legacyTransitionEndFct, 0);
-},
-_onTransitionEnd: function() {
-	this._box.className = this._class;
-	if( this._box_visible == true ) {
-		this._box_group.$show();
-		this._box_visible = false;
-		this._box.style.visibility="hidden";
-	} else {
-		this._box_visible = true;
-		this._box.style.visibility="visible";
-	}	
-}
-});

WebContent/gui/OSRM.MainGUI.js

@@ -1,116 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM MainGUI
-// [handles all GUI events that interact with appearance of main window]
-
-
-OSRM.GUI.extend( {
-		
-// init GUI
-init: function() {
-	// init main box
-	var main_group = new OSRM.GUIBoxGroup();
-	OSRM.G.main_handle = new OSRM.GUIBoxHandle("main", "left", "left:-5px;top:5px;", OSRM.GUI.beforeMainTransition, OSRM.GUI.afterMainTransition);
-	main_group.add( OSRM.G.main_handle );
-	main_group.select( OSRM.G.main_handle );
-	
-	// init additional boxes
-	var option_group = new OSRM.GUIBoxGroup();
-	var config_handle = new OSRM.GUIBoxHandle("config", "right", "right:-5px;bottom:70px;");
-	var mapping_handle = new OSRM.GUIBoxHandle("mapping", "right", "right:-5px;bottom:25px;");
-	option_group.add( config_handle );
-	option_group.add( mapping_handle );
-	option_group.select( null );
-	
-	// init starting source/target
-	document.getElementById('gui-input-source').value = OSRM.DEFAULTS.ONLOAD_SOURCE;
-	document.getElementById('gui-input-target').value = OSRM.DEFAULTS.ONLOAD_TARGET;
-	
-	// init units selector
-	OSRM.GUI.selectorInit( "gui-units-toggle", [{display:"Kilometers",value:0},{display:"Miles",value:1}], 0, OSRM.GUI.onUnitsChanged );
-	
-	// query last update of data
-	OSRM.G.data_timestamp = "n/a";
-	OSRM.JSONP.call(OSRM.DEFAULTS.HOST_TIMESTAMP_URL+"?jsonp=%jsonp", OSRM.GUI.setDataTimestamp, OSRM.JSONP.empty, OSRM.DEFAULTS.JSONP_TIMEOUT, 'data_timestamp');
-},
-
-// set language dependent labels
-setLabels: function() {
-	document.getElementById("open-josm").innerHTML = OSRM.loc("OPEN_JOSM");
-	document.getElementById("open-osmbugs").innerHTML = OSRM.loc("OPEN_OSMBUGS");	
-	document.getElementById("gui-reset").innerHTML = OSRM.loc("GUI_RESET");
-	document.getElementById("gui-zoom").innerHTML = OSRM.loc("GUI_ZOOM");
-	document.getElementById("gui-reverse").innerHTML = OSRM.loc("GUI_REVERSE");
-	document.getElementById("gui-option-highlight-nonames-label").innerHTML = OSRM.loc("GUI_HIGHLIGHT_UNNAMED_ROADS");
-	document.getElementById("gui-option-show-previous-routes-label").innerHTML = OSRM.loc("GUI_SHOW_PREVIOUS_ROUTES");
-	document.getElementById("gui-search-source").innerHTML = OSRM.loc("GUI_SEARCH");
-	document.getElementById("gui-search-target").innerHTML = OSRM.loc("GUI_SEARCH");
-	document.getElementById("gui-search-source-label").innerHTML = OSRM.loc("GUI_START")+":";
-	document.getElementById("gui-search-target-label").innerHTML = OSRM.loc("GUI_END")+":";
-	document.getElementById("gui-input-source").title = OSRM.loc("GUI_START_TOOLTIP");
-	document.getElementById("gui-input-target").title = OSRM.loc("GUI_END_TOOLTIP");
-	document.getElementById("legal-notice").innerHTML = OSRM.loc("GUI_LEGAL_NOTICE");
-	document.getElementById("gui-mapping-label").innerHTML = OSRM.loc("GUI_MAPPING_TOOLS");
-	document.getElementById("gui-config-label").innerHTML = OSRM.loc("GUI_CONFIGURATION");
-	document.getElementById("gui-language-2-label").innerHTML = OSRM.loc("GUI_LANGUAGE")+":";
-	document.getElementById("gui-units-label").innerHTML = OSRM.loc("GUI_UNITS")+":";
-	document.getElementById('gui-data-timestamp').innerHTML = OSRM.loc("GUI_DATA_TIMESTAMP")+": " + OSRM.G.data_timestamp;
-	
-	document.getElementById("gui-units-toggle").getElementsByTagName("option")[0].innerHTML = OSRM.loc("GUI_KILOMETERS");
-	document.getElementById("gui-units-toggle").getElementsByTagName("option")[1].innerHTML = OSRM.loc("GUI_MILES");
-	OSRM.GUI.selectorOnChange( document.getElementById("gui-units-toggle") );
-},
-
-// clear output area
-clearResults: function() {
-	document.getElementById('information-box').innerHTML = "";
-	document.getElementById('information-box-header').innerHTML = "";	
-},
-
-// reposition and hide zoom controls before main box animation
-beforeMainTransition: function() {
-	var zoom_controls = OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom');
-	if( zoom_controls.length > 0)
-		zoom_controls[0].style.visibility="hidden";
-},
-
-// show zoom controls after main box animation
-afterMainTransition: function() {
-	var zoom_controls = OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom');
-	if( zoom_controls.length > 0) {
-		zoom_controls[0].style.left = ( OSRM.G.main_handle.boxVisible() == true ? (OSRM.G.main_handle.boxWidth()+10) : "30") + "px";
-		zoom_controls[0].style.visibility="visible";
-	}
-},
-
-// toggle distance units
-onUnitsChanged: function(value) {
-	OSRM.Utils.setToHumanDistanceFunction(value);
-	OSRM.Routing.getRoute({keepAlternative:true});
-},
-
-// set timestamp of data
-setDataTimestamp: function(response) {
-	if(!response)
-		return;
-	
-	OSRM.G.data_timestamp = response.timestamp.slice(0,25).replace(/<\/?[^>]+(>|$)/g ,"");	// discard tags
-	document.getElementById('gui-data-timestamp').innerHTML = OSRM.loc("GUI_DATA_TIMESTAMP")+": " + OSRM.G.data_timestamp;
-}
-
-});

WebContent/gui/OSRM.Notifications.js

@@ -1,162 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM Notifications
-// [handles notifications: timed tooltips and exclusive notifications]
-
-
-OSRM.GUI.extend( {
-	
-// tooltips
-tooltips: {
-	// triggered in OSRM.Localization.setLanguageWrapper
-	localization:
-	{	timeout:	180000,		// 30min
-		header: 	"Did you know? You can change the display language.",
-		body: 		"You can use the pulldown menu in the upper left corner to select your favorite language. " +
-					"<br/><br/>" +
-					"Don't despair if you cannot find your language of choice. " +
-					"If you want, you can help to provide additional translations! " +
-					"Visit <a href='https://github.com/DennisSchiefer/Project-OSRM-Web'>here</a> for more information."
-	},
-	// triggered in OSRM.Map.click
-	clicking:
-	{	timeout:	60000,		// 1min
-		header: 	"Did you know? You can click on the map to set route markers.",
-		body:		"You can click on the map with the left mouse button to set a source marker (green) or a target marker (red), " +
-					"if the source marker already exists. " +
-					"The address of the selected location will be displayed in the boxes to the left. " + 
-					"<br/><br/>" +
-					"You can delete a marker by clicking on it again with the left mouse button."
-	},
-	// triggered in OSRM.Routing.getRoute_Dragging	
-	dragging:
-	{	timeout:	120000,		// 2min
-		header: 	"Did you know? You can drag each route marker on the map.",
-		body:		"You can drag a marker by clicking on it with the left mouse button and holding the button pressed. " +
-					"Then you can move the marker around the map and the route will be updated instantaneously. " +
-					"<br/><br/>" +
-					"You can even create intermediate markers by dragging them off of the main route! "
-	}
-},
-
-
-// initialize notifications and tooltip timers
-init: function() {
-	// notifications
-	// [nothing to be done at the moment]
-	
-	// tooltip timers
-	var tooltips = OSRM.GUI.tooltips;
-	for( id in tooltips ) {
-		// start timer
-		tooltips[id]._timer = setTimeout(
-				function(_id){ return function(){OSRM.GUI._showTooltip(_id);}; }(id),
-				tooltips[id].timeout
-		);
-		
-		// mark tooltip as pending
-		tooltips[id]._pending = true;
-	}
-},
-
-
-// deactivate pending tooltip
-deactivateTooltip: function(id) {
-	var tooltips = OSRM.GUI.tooltips;
-	if(tooltips[id] == undefined)
-		return;	
-	
-	// mark tooltip as no longer pending
-	tooltips[id]._pending = false;
-},
-// show tooltip after timer expired
-_showTooltip: function(id) {
-	var tooltips = OSRM.GUI.tooltips;
-	if(tooltips[id] == undefined)
-		return;	
-	
-	// only show tooltip if it is still pending 
-	if( tooltips[id]._pending == false ) {
-		return;
-	}
-		
-	// if a notification is currently shown, restart timer
-	if( OSRM.GUI.isTooltipVisible() ) {
-		tooltips[id]._timer = setTimeout(
-				function(_id){ return function(){OSRM.GUI._showTooltip(_id);}; }(id),
-				tooltips[id].timeout
-		);		
-		return;
-	}
-	
-	// show notification
-	OSRM.GUI.tooltipNotify( tooltips[id].header, tooltips[id].body );
-	
-	// mark tooltip as no longer pending
-	tooltips[id]._pending = false;
-},
-
-
-// exclusive notification
-exclusiveNotify: function( header, text, closable ){
-	document.getElementById('exclusive-notification-blanket').style.display = "block";
-	document.getElementById('exclusive-notification-label').innerHTML = header;
-	document.getElementById('exclusive-notification-box').innerHTML = text;
-	if( closable )
-		document.getElementById('exclusive-notification-toggle').onclick = OSRM.GUI.exclusiveDenotify;
-	else
-		document.getElementById('exclusive-notification-toggle').style.display = "none";
-},
-exclusiveDenotify: function() {
-	document.getElementById('exclusive-notification-blanket').style.display = "none";
-},
-
-
-// tooltip notification
-tooltipNotify: function( header, text ){
-	document.getElementById('tooltip-notification-wrapper').style.display = "block";
-	document.getElementById('tooltip-notification-label').innerHTML = header;
-	document.getElementById('tooltip-notification-box').innerHTML = text;
-	document.getElementById('tooltip-notification-box').style.display = "block";		// simple trick to always start with a minimized tooltip
-	OSRM.GUI.tooltipResize();
-	
-	document.getElementById('tooltip-notification-toggle').onclick = OSRM.GUI.tooltipDenotify;
-	document.getElementById('tooltip-notification-resize').onclick = OSRM.GUI.tooltipResize;
-},
-tooltipResize: function() {
-	if( document.getElementById('tooltip-notification-box').style.display == "none" ) {	
-		document.getElementById('tooltip-notification-box').style.display = "block";
-		var height = document.getElementById('tooltip-notification-box').clientHeight;
-		document.getElementById('tooltip-notification-content').style.height = (height + 28) + "px";
-		document.getElementById('tooltip-notification-wrapper').style.height = (height + 48) + "px";
-		document.getElementById('tooltip-notification-resize').className = "iconic-button up-marker top-right-button";
-	} else {
-		document.getElementById('tooltip-notification-box').style.display = "none";
-		document.getElementById('tooltip-notification-content').style.height = "18px";
-		document.getElementById('tooltip-notification-wrapper').style.height = "38px";		
-		document.getElementById('tooltip-notification-resize').className = "iconic-button down-marker top-right-button";
-	}
-},
-tooltipDenotify: function() {
-	document.getElementById('tooltip-notification-wrapper').style.display = "none";
-},
-isTooltipVisible: function() {
-	return document.getElementById('tooltip-notification-wrapper').style.display == "block"; 
-}
-
-});

WebContent/gui/OSRM.RoutingGUI.js

@@ -1,174 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM RoutingGUI
-// [handles all GUI events that interact with routing in main window]
-
-
-OSRM.GUI.extend( {
-		
-// init
-init: function() {
-	// init variables
-	OSRM.Utils.setToHumanDistanceFunction(OSRM.DEFAULTS.DISTANCE_FORMAT);
-	
-	// init events
-	document.getElementById("gui-input-source").onchange = function() {OSRM.GUI.inputChanged(OSRM.C.SOURCE_LABEL);};
-	document.getElementById("gui-delete-source").onclick = function() {OSRM.GUI.deleteMarker(OSRM.C.SOURCE_LABEL);};
-	document.getElementById("gui-search-source").onclick = function() {OSRM.GUI.showMarker(OSRM.C.SOURCE_LABEL);};	
-	
-	document.getElementById("gui-input-target").onchange = function() {OSRM.GUI.inputChanged(OSRM.C.TARGET_LABEL);};
-	document.getElementById("gui-delete-target").onclick = function() {OSRM.GUI.deleteMarker(OSRM.C.TARGET_LABEL);};
-	document.getElementById("gui-search-target").onclick = function() {OSRM.GUI.showMarker(OSRM.C.TARGET_LABEL);};
-	
-	document.getElementById("gui-reset").onclick = OSRM.GUI.resetRouting;
-	document.getElementById("gui-zoom").onclick = OSRM.GUI.zoomOnRoute;
-	document.getElementById("gui-reverse").onclick = OSRM.GUI.reverseRouting;
-	document.getElementById("open-josm").onclick = OSRM.GUI.openJOSM;
-	document.getElementById("open-osmbugs").onclick = OSRM.GUI.openOSMBugs;
-	document.getElementById("option-highlight-nonames").onclick = OSRM.GUI.hightlightNonames;
-	document.getElementById("option-show-previous-routes").onclick = OSRM.GUI.showPreviousRoutes;
-},
-
-// toggle GUI features that need a route to work
-activateRouteFeatures: function() {
-	OSRM.Printing.activate();
-	document.getElementById("gui-zoom").className = "button";	
-},
-deactivateRouteFeatures: function() {
-	OSRM.Printing.deactivate();
-	document.getElementById("gui-zoom").className = "button-inactive";
-},
-
-// click: button "reset"
-resetRouting: function() {
-	document.getElementById('gui-input-source').value = "";
-	document.getElementById('gui-input-target').value = "";
-	
-	OSRM.G.route.reset();
-	OSRM.G.markers.reset();
-	
-	document.getElementById('information-box').innerHTML = "";
-	document.getElementById('information-box-header').innerHTML = "";
-	
-	OSRM.JSONP.reset();	
-},
-
-// click: button "reverse"
-reverseRouting: function() {
-	// invert input boxes
-	var tmp = document.getElementById("gui-input-source").value;
-	document.getElementById("gui-input-source").value = document.getElementById("gui-input-target").value;
-	document.getElementById("gui-input-target").value = tmp;
-	
-	// recompute route if needed
-	if( OSRM.G.route.isShown() ) {
-		OSRM.G.markers.route.reverse();
-		OSRM.Routing.getRoute_Reversed();				// temporary route reversal for query, actual reversal done after receiving response
-		OSRM.G.markers.route.reverse();
-		OSRM.G.markers.highlight.hide();
-		OSRM.RoutingDescription.showSimple( OSRM.G.response );
-	
-	// simply reverse markers		
-	} else {
-		OSRM.G.markers.reverseMarkers();		
-	}
-},
-
-// click: button "show"
-showMarker: function(marker_id) {
-	if( OSRM.JSONP.fences["geocoder_source"] || OSRM.JSONP.fences["geocoder_target"] )	// needed when focus was on input box and user clicked on button
-		return;
-	
-	if( marker_id == OSRM.C.SOURCE_LABEL && OSRM.G.markers.hasSource() )
-		OSRM.G.markers.route[0].centerView();
-	else if( marker_id == OSRM.C.TARGET_LABEL && OSRM.G.markers.hasTarget() )
-		OSRM.G.markers.route[OSRM.G.markers.route.length-1].centerView();
-},
-
-// changed: any inputbox (is called when enter is pressed [after] or focus is lost [before])
-inputChanged: function(marker_id) {
-	if( marker_id == OSRM.C.SOURCE_LABEL)	
-		OSRM.Geocoder.call(OSRM.C.SOURCE_LABEL, document.getElementById('gui-input-source').value);
-	else if( marker_id == OSRM.C.TARGET_LABEL)
-		OSRM.Geocoder.call(OSRM.C.TARGET_LABEL, document.getElementById('gui-input-target').value);
-},
-
-// click: button "open JOSM"
-openJOSM: function() {
-	var center = OSRM.G.map.getCenterUI();
-	var bounds = OSRM.G.map.getBoundsUI();
-	
-	var xdelta = Math.min(0.02, Math.abs(bounds.getSouthWest().lng - center.lng) );
-	var ydelta = Math.min(0.01, Math.abs(bounds.getSouthWest().lat - center.lat) );
-	
-	var p = [ 'left='  + (center.lng - xdelta).toFixed(6), 'bottom=' + (center.lat - ydelta).toFixed(6), 'right=' + (center.lng + xdelta).toFixed(6), 'top=' + (center.lat + ydelta).toFixed(6)];
-	var url = 'http://127.0.0.1:8111/load_and_zoom?' + p.join('&');
- 
-	var frame = document.getElementById('josm-frame');
-	if(!frame) {
-		frame = L.DomUtil.create('iframe', null, document.body);
-		frame.style.display = "none";
-		frame.id = 'josm-frame';
-	}
-	frame.src = url;
-},
-
-//click: button "open OSM Bugs"
-openOSMBugs: function() {
-	var position = OSRM.G.map.getCenterUI();
-	window.open( "http://osmbugs.org/?lat="+position.lat.toFixed(6)+"&lon="+position.lng.toFixed(6)+"&zoom="+OSRM.G.map.getZoom() );
-},
-
-//click: button "delete marker"
-deleteMarker: function(marker_id) {
-	var id = null;
-	if(marker_id == 'source' && OSRM.G.markers.hasSource() )
-		id = 0;
-	else if(marker_id == 'target' && OSRM.G.markers.hasTarget() )
-		id = OSRM.G.markers.route.length-1;
-	if( id == null)
-		return;
-	
-	OSRM.G.markers.removeMarker( id );
-	OSRM.Routing.getRoute();
-	OSRM.G.markers.highlight.hide();	
-},
-
-//click: checkbox "show previous routes"
-showPreviousRoutes: function(value) {
-	if( document.getElementById('option-show-previous-routes').checked == false)
-		OSRM.G.route.deactivateHistoryRoutes();
-	else
-		OSRM.G.route.activateHistoryRoutes();
-},
-
-//click: button "zoom on route"
-zoomOnRoute: function() {
-	if( OSRM.G.route.isShown() == false )
-		return;
-	
-	var bounds = new L.LatLngBounds( OSRM.G.route._current_route.getPositions() );
-	OSRM.G.map.fitBoundsUI(bounds);	
-},
-
-//click: toggle highlighting unnamed streets
-hightlightNonames: function() {
-	OSRM.Routing.getRoute_Redraw({keepAlternative:true});
-}
-
-});

WebContent/gui/OSRM.Selector.js

@@ -1,67 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM selector
-// [create special selector elements]
-
-
-OSRM.GUI.extend( {
-
-// initialize selector with all options and our look&feel
-selectorInit: function(id, options, selected, onchange_fct) {
-	// create dropdown menu
-	var select = document.getElementById(id);
-	select.className += " styled-select-helper base-font";
-	select.onchange = function() { OSRM.GUI.selectorOnChange(this); onchange_fct(this.value); };	
-		
-	// fill dropdown menu
-	for(var i=0, size=options.length; i<size; i++) {
-		var option=document.createElement("option");
-		option.innerHTML = options[i].display;
-		option.value = options[i].value;
-		select.appendChild(option);
-	}
-	select.value = options[selected].value;
-	
-	// create visible dropdown menu
-	var textnode = document.createTextNode( options[selected].display );
-	var myspan = document.createElement("span");
-	myspan.className = "styled-select base-font";
-	myspan.id = "styled-select-" + select.id;
-	myspan.appendChild(textnode);
-	select.parentNode.insertBefore(myspan, select);
-	myspan.style.width = (select.offsetWidth-2)+"px";
-	myspan.style.height = (select.offsetHeight)+"px";	// clientHeight gives the height of the opened dropbox!
-},
-
-// required behaviour of selector on change to switch shown name
-selectorOnChange: function(select) {
-	var option = select.getElementsByTagName("option");	
-	for(var i = 0; i < option.length; i++)
-	if(option[i].selected == true) {
-		document.getElementById("styled-select-" + select.id).childNodes[0].nodeValue = option[i].childNodes[0].nodeValue;
-		break;
-	}
-},
-
-// change selector value
-selectorChange: function(select, value) {
-	select.value = value;
-	OSRM.GUI.selectorOnChange(select);
-}
-
-});

WebContent/leaflet/leaflet.css

@@ -1,323 +0,0 @@
-/* required styles */
-
-.leaflet-map-pane,
-.leaflet-tile,
-.leaflet-marker-icon,
-.leaflet-marker-shadow,
-.leaflet-tile-pane,
-.leaflet-overlay-pane,
-.leaflet-shadow-pane,
-.leaflet-marker-pane,
-.leaflet-popup-pane,
-.leaflet-overlay-pane svg,
-.leaflet-zoom-box,
-.leaflet-image-layer { /* TODO optimize classes */
-	position: absolute;
-	}
-.leaflet-container {
-	overflow: hidden;
-	}
-.leaflet-tile-pane, .leaflet-container {
-	-webkit-transform: translate3d(0,0,0);
-	}
-.leaflet-tile,
-.leaflet-marker-icon,
-.leaflet-marker-shadow {
-	-moz-user-select: none;
-	-webkit-user-select: none;
-	user-select: none;
-	}
-.leaflet-marker-icon,
-.leaflet-marker-shadow {
-	display: block;
-	}
-.leaflet-clickable {
-	cursor: pointer;
-	}
-.leaflet-container img {
-	max-width: none !important;
-	}
-
-.leaflet-tile-pane { z-index: 2; }
-
-.leaflet-objects-pane { z-index: 3; }
-.leaflet-overlay-pane { z-index: 4; }
-.leaflet-shadow-pane { z-index: 5; }
-.leaflet-marker-pane { z-index: 6; }
-.leaflet-popup-pane { z-index: 7; }
-
-.leaflet-zoom-box {
-	width: 0;
-	height: 0;
-	}
-
-.leaflet-tile {
-	visibility: hidden;
-	}
-.leaflet-tile-loaded {
-	visibility: inherit;
-	}
-
-a.leaflet-active {
-	outline: 2px solid orange;
-	}
-
-
-/* Leaflet controls */
-
-.leaflet-control {
-	position: relative;
-	z-index: 7;
-	}
-.leaflet-top,
-.leaflet-bottom {
-	position: absolute;
-	}
-.leaflet-top {
-	top: 0;
-	}
-.leaflet-right {
-	right: 0;
-	}
-.leaflet-bottom {
-	bottom: 0;
-	}
-.leaflet-left {
-	left: 0;
-	}
-.leaflet-control {
-	float: left;
-	clear: both;
-	}
-.leaflet-right .leaflet-control {
-	float: right;
-	}
-.leaflet-top .leaflet-control {
-	margin-top: 10px;
-	}
-.leaflet-bottom .leaflet-control {
-	margin-bottom: 10px;
-	}
-.leaflet-left .leaflet-control {
-	margin-left: 10px;
-	}
-.leaflet-right .leaflet-control {
-	margin-right: 10px;
-	}
-
-.leaflet-control-zoom, .leaflet-control-layers {
-	-moz-border-radius: 7px;
-	-webkit-border-radius: 7px;
-	border-radius: 7px;
-	}
-.leaflet-control-zoom {
-	padding: 5px;
-	background: rgba(0, 0, 0, 0.25);
-	}
-.leaflet-control-zoom a {
-	background-color: rgba(255, 255, 255, 0.75);
-	}
-.leaflet-control-zoom a, .leaflet-control-layers a {
-	background-position: 50% 50%;
-	background-repeat: no-repeat;
-	display: block;
-	}
-.leaflet-control-zoom a {
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	border-radius: 4px;
-	width: 19px;
-	height: 19px;
-	}
-.leaflet-control-zoom a:hover {
-	background-color: #fff;
-	}
-.leaflet-big-buttons .leaflet-control-zoom a {
-	width: 27px;
-	height: 27px;
-	}
-.leaflet-control-zoom-in {
-	background-image: url(images/zoom-in.png);
-	margin-bottom: 5px;
-	}
-.leaflet-control-zoom-out {
-	background-image: url(images/zoom-out.png);
-	}
-
-.leaflet-control-layers {
-	-moz-box-shadow: 0 0 7px #999;
-	-webkit-box-shadow: 0 0 7px #999;
-	box-shadow: 0 0 7px #999;
-
-	background: #f8f8f9;
-	}
-.leaflet-control-layers a {
-	background-image: url(images/layers.png);
-	width: 36px;
-	height: 36px;
-	}
-.leaflet-big-buttons .leaflet-control-layers a {
-	width: 44px;
-	height: 44px;
-	}
-.leaflet-control-layers .leaflet-control-layers-list,
-.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
-	display: none;
-	}
-.leaflet-control-layers-expanded .leaflet-control-layers-list {
-	display: block;
-	position: relative;
-	}
-.leaflet-control-layers-expanded {
-	padding: 6px 10px 6px 6px;
-	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
-	color: #333;
-	background: #fff;
-	}
-.leaflet-control-layers input {
-	margin-top: 2px;
-	position: relative;
-	top: 1px;
-	}
-.leaflet-control-layers label {
-	display: block;
-	}
-.leaflet-control-layers-separator {
-	height: 0;
-	border-top: 1px solid #ddd;
-	margin: 5px -10px 5px -6px;
-	}
-
-.leaflet-container .leaflet-control-attribution {
-	margin: 0;
-	padding: 0 5px;
-
-	font: 11px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
-	color: #333;
-
-	background-color: rgba(255, 255, 255, 0.7);
-
-	-moz-box-shadow: 0 0 7px #ccc;
-	-webkit-box-shadow: 0 0 7px #ccc;
-	box-shadow: 0 0 7px #ccc;
-	}
-
-
-/* Fade animations */
-
-.leaflet-fade-anim .leaflet-tile {
-	opacity: 0;
-
-	-webkit-transition: opacity 0.2s linear;
-	-moz-transition: opacity 0.2s linear;
-	-o-transition: opacity 0.2s linear;
-	transition: opacity 0.2s linear;
-	}
-.leaflet-fade-anim .leaflet-tile-loaded {
-	opacity: 1;
-	}
-
-.leaflet-fade-anim .leaflet-popup {
-	opacity: 0;
-
-	-webkit-transition: opacity 0.2s linear;
-	-moz-transition: opacity 0.2s linear;
-	-o-transition: opacity 0.2s linear;
-	transition: opacity 0.2s linear;
-	}
-.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
-	opacity: 1;
-	}
-
-.leaflet-zoom-anim .leaflet-tile {
-	-webkit-transition: none;
-	-moz-transition: none;
-	-o-transition: none;
-	transition: none;
-	}
-
-.leaflet-zoom-anim .leaflet-objects-pane {
-	visibility: hidden;
-	}
-
-
-/* Popup layout */
-
-.leaflet-popup {
-	position: absolute;
-	text-align: center;
-	-webkit-transform: translate3d(0,0,0);
-	}
-.leaflet-popup-content-wrapper {
-	padding: 1px;
-	text-align: left;
-	}
-.leaflet-popup-content {
-	margin: 19px;
-	}
-.leaflet-popup-tip-container {
-	margin: 0 auto;
-	width: 40px;
-	height: 16px;
-	position: relative;
-	overflow: hidden;
-	}
-.leaflet-popup-tip {
-	width: 15px;
-	height: 15px;
-	padding: 1px;
-
-	margin: -8px auto 0;
-
-	-moz-transform: rotate(45deg);
-	-webkit-transform: rotate(45deg);
-	-ms-transform: rotate(45deg);
-	-o-transform: rotate(45deg);
-	transform: rotate(45deg);
-	}
-.leaflet-popup-close-button {
-	position: absolute;
-	top: 9px;
-	right: 9px;
-
-	width: 10px;
-	height: 10px;
-
-	overflow: hidden;
-	}
-.leaflet-popup-content p {
-	margin: 18px 0;
-	}
-
-
-/* Visual appearance */
-
-.leaflet-container {
-	background: #ddd;
-	}
-.leaflet-container a {
-	color: #0078A8;
-	}
-.leaflet-zoom-box {
-	border: 2px dotted #05f;
-	background: white;
-	opacity: 0.5;
-	}
-.leaflet-popup-content-wrapper, .leaflet-popup-tip {
-	background: white;
-
-	box-shadow: 0 1px 10px #888;
-	-moz-box-shadow: 0 1px 10px #888;
-	 -webkit-box-shadow: 0 1px 14px #999;
-	}
-.leaflet-popup-content-wrapper {
-	-moz-border-radius: 20px;
-	-webkit-border-radius: 20px;
-	border-radius: 20px;
-	}
-.leaflet-popup-content {
-	font: 12px/1.4 "Helvetica Neue", Arial, Helvetica, sans-serif;
-	}
-.leaflet-popup-close-button {
-	background: white url(images/popup-close.png);
-	}

WebContent/leaflet/leaflet.ie.css

@@ -1,48 +0,0 @@
-.leaflet-tile {
-	filter: inherit;
-	}
-
-.leaflet-vml-shape {
-	width: 1px;
-	height: 1px;
-	}
-.lvml {
-	behavior: url(#default#VML); 
-	display: inline-block; 
-	position: absolute;
-	}
-	
-.leaflet-control {
-	display: inline;
-	}
-
-.leaflet-popup-tip {
-	width: 21px;
-	_width: 27px;
-	margin: 0 auto;
-	_margin-top: -3px;
-	
-	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
-	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
-	}
-.leaflet-popup-tip-container {
-	margin-top: -1px;
-	}
-.leaflet-popup-content-wrapper, .leaflet-popup-tip {
-	border: 1px solid #bbb;
-	}
-
-.leaflet-control-zoom {
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#3F000000',EndColorStr='#3F000000');
-	}
-.leaflet-control-zoom a {
-	background-color: #eee;
-	}
-.leaflet-control-zoom a:hover {
-	background-color: #fff;
-	}
-.leaflet-control-layers-toggle {
-	}
-.leaflet-control-attribution, .leaflet-control-layers {
-	background: white;
-	}

WebContent/localization/OSRM.Locale.de.js

@@ -1,106 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM localization
-// [German language support]
-
-
-OSRM.Localization["de"] = {
-// own language
-"LANGUAGE": "Deutsch",
-//gui
-"GUI_START": "Start",
-"GUI_END": "Ziel",
-"GUI_RESET": "Reset",
-"GUI_ZOOM": "Zoom auf Route",
-"GUI_SEARCH": "Zeigen",
-"GUI_REVERSE": "Umdrehen",
-"GUI_START_TOOLTIP": "Startposition eingeben",
-"GUI_END_TOOLTIP": "Zielposition eingeben",
-"GUI_LEGAL_NOTICE": "GUI2 v"+OSRM.VERSION+" "+OSRM.DATE+" - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a>",
-//config
-"GUI_CONFIGURATION": "Einstellungen",
-"GUI_LANGUAGE": "Sprache",
-"GUI_UNITS": "Einheiten",
-"GUI_KILOMETERS": "Kilometer",
-"GUI_MILES": "Meilen",
-"GUI_DATA_TIMESTAMP": "data",
-// mapping
-"GUI_MAPPING_TOOLS": "Kartenwerkzeuge",
-"GUI_HIGHLIGHT_UNNAMED_ROADS": "Unbenannte Straßen hervorheben",
-"GUI_SHOW_PREVIOUS_ROUTES": "Frühere Routen zeigen",
-"OPEN_JOSM": "JOSM",
-"OPEN_OSMBUGS": "OSM Bugs",
-// geocoder
-"SEARCH_RESULTS": "Suchergebnisse",
-"FOUND_X_RESULTS": "%i Ergebnisse gefunden",
-"TIMED_OUT": "Zeitüberschreitung",
-"NO_RESULTS_FOUND": "Keine Ergebnisse gefunden",
-"NO_RESULTS_FOUND_SOURCE": "Keine Ergebnisse gefunden für Start",
-"NO_RESULTS_FOUND_TARGET": "Keine Ergebnisse gefunden für Ziel",
-// routing
-"ROUTE_DESCRIPTION": "Routenbeschreibung",
-"GET_LINK_TO_ROUTE": "Generiere Link",
-"GENERATE_LINK_TO_ROUTE": "Warte auf Antwort",
-"LINK_TO_ROUTE_TIMEOUT": "nicht möglich",
-"GPX_FILE": "GPX Datei",
-"DISTANCE": "Distanz",
-"DURATION": "Dauer",
-"YOUR_ROUTE_IS_BEING_COMPUTED": "Ihre Route wird berechnet",
-"NO_ROUTE_FOUND": "Keine Route hierher möglich",
-// printing
-"OVERVIEW_MAP": "Übersichtskarte",
-"NO_ROUTE_SELECTED": "Keine Route ausgewählt",
-// directions
-"N": "Norden",
-"E": "Ost",
-"S": "Süden",
-"W": "Westen",
-"NE": "Nordost",
-"SE": "Südost",
-"SW": "Südwest",
-"NW": "Nordwest",
-// driving directions
-// %s: road name
-// %d: direction
-// [*]: will only be printed when there actually is a road name
-"DIRECTION_0":"Unbekannte Anweisung[ auf <b>%s</b>]",
-"DIRECTION_1":"Geradeaus weiterfahren[ auf <b>%s</b>]",
-"DIRECTION_2":"Leicht rechts abbiegen[ auf <b>%s</b>]",
-"DIRECTION_3":"Rechts abbiegen[ auf <b>%s</b>]",
-"DIRECTION_4":"Scharf rechts abbiegen[ auf <b>%s</b>]",
-"DIRECTION_5":"Wenden[ auf <b>%s</b>]",
-"DIRECTION_6":"Scharf links abbiegen[ auf <b>%s</b>]",
-"DIRECTION_7":"Links abbiegen[ auf <b>%s</b>]",
-"DIRECTION_8":"Leicht links abbiegen[ auf <b>%s</b>]",
-"DIRECTION_10":"Fahren Sie Richtung <b>%d</b>[ auf <b>%s</b>]",
-"DIRECTION_11-1":"In den Kreisverkehr einfahren und bei erster Möglichkeit[ in Richtung <b>%s</b>] verlassen",
-"DIRECTION_11-2":"In den Kreisverkehr einfahren und bei zweiter Möglichkeit[ in Richtung <b>%s</b>] verlassen",
-"DIRECTION_11-3":"In den Kreisverkehr einfahren und bei dritter Möglichkeit[ in Richtung <b>%s</b>] verlassen",
-"DIRECTION_11-4":"In den Kreisverkehr einfahren und bei vierter Möglichkeit[ in Richtung <b>%s</b>] verlassen",
-"DIRECTION_11-5":"In den Kreisverkehr einfahren und bei fünfter Möglichkeit[ in Richtung <b>%s</b>] verlassen",
-"DIRECTION_11-6":"In den Kreisverkehr einfahren und bei sechster Möglichkeit[ in Richtung <b>%s</b>] verlassen",
-"DIRECTION_11-7":"In den Kreisverkehr einfahren und bei siebter Möglichkeit[ in Richtung <b>%s</b>] verlassen",
-"DIRECTION_11-8":"In den Kreisverkehr einfahren und bei achter Möglichkeit[ in Richtung <b>%s</b>] verlassen",
-"DIRECTION_11-9":"In den Kreisverkehr einfahren und bei neunter Möglichkeit[ in Richtung <b>%s</b>] verlassen",
-"DIRECTION_11-x":"In den Kreisverkehr einfahren und bei einer der vielen Möglichkeiten[ in Richtung <b>%s</b>] verlassen",
-"DIRECTION_15":"Sie haben Ihr Ziel erreicht"
-};
-
-// set GUI language on load
-if( OSRM.DEFAULTS.LANUGAGE_ONDEMAND_RELOADING==true )
-	OSRM.Localization.setLanguage("de");

WebContent/localization/OSRM.Locale.dk.js

@@ -1,106 +0,0 @@
-/*
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
-*/
-
-// OSRM localization
-// [Danish language support]
-
-
-OSRM.Localization["dk"] = {
-// own language
-"LANGUAGE": "Dansk",
-//gui
-"GUI_START": "Start",
-"GUI_END": "Destination",
-"GUI_RESET": "Nulstil",
-"GUI_ZOOM": "Zoom på Rute",
-"GUI_SEARCH": "Vis",
-"GUI_REVERSE": "Omvendt",
-"GUI_START_TOOLTIP": "Indtast start",
-"GUI_END_TOOLTIP": "Indtast destination",
-"GUI_LEGAL_NOTICE": "GUI2 v"+OSRM.VERSION+" "+OSRM.DATE+" - OSRM hosting af <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder af <a href='http://www.osm.org/'>OSM</a>",
-//config
-"GUI_CONFIGURATION": "Konfiguration",
-"GUI_LANGUAGE": "Sprog",
-"GUI_UNITS": "Enheder",
-"GUI_KILOMETERS": "Kilometer",
-"GUI_MILES": "Miles",
-"GUI_DATA_TIMESTAMP": "data",
-// mapping
-"GUI_MAPPING_TOOLS": "Kortlægnings værktøjer",
-"GUI_HIGHLIGHT_UNNAMED_ROADS": "Fremhæv unavngivne veje",
-"GUI_SHOW_PREVIOUS_ROUTES": "Vis tidligere ruter",
-"OPEN_JOSM": "JOSM",
-"OPEN_OSMBUGS": "OSM Bugs",
-// geocoder
-"SEARCH_RESULTS": "Søgeresultater",
-"FOUND_X_RESULTS": "fandt %i resultater",
-"TIMED_OUT": "Indtet svar",
-"NO_RESULTS_FOUND": "Ingen resultater",
-"NO_RESULTS_FOUND_SOURCE": "Ingen resultater for start",
-"NO_RESULTS_FOUND_TARGET": "Ingen resultater for destination",
-//routing
-"ROUTE_DESCRIPTION": "Rutebeskrivelse",
-"GET_LINK_TO_ROUTE": "Lav link",
-"GENERATE_LINK_TO_ROUTE": "venter på link",
-"LINK_TO_ROUTE_TIMEOUT": "ikke tilgængelig",
-"GPX_FILE": "GPX Fil",
-"DISTANCE": "Distance",
-"DURATION": "Varighed",
-"YOUR_ROUTE_IS_BEING_COMPUTED": "Din rute bliver beregnet",
-"NO_ROUTE_FOUND": "Ingen mulig rute fundet",
-//printing
-"OVERVIEW_MAP": "Oversigtskort",
-"NO_ROUTE_SELECTED": "Ikke valgte rute",
-// directions
-"N": "nord",
-"E": "øst",
-"S": "syd",
-"W": "vest",
-"NE": "nordøst",
-"SE": "sydøst",
-"SW": "sydvest",
-"NW": "nordvest",
-// driving directions
-// %s: road name
-// %d: direction
-// [*]: will only be printed when there actually is a road name
-"DIRECTION_0":"Unknown instruction[ on <b>%s</b>]",
-"DIRECTION_1":"Fortsæt [ ad <b>%s</b>]",
-"DIRECTION_2":"Drej svagt til højre [ ad <b>%s</b>]",
-"DIRECTION_3":"Drej til højre[ ad <b>%s</b>]",
-"DIRECTION_4":"Drej skarpt til højre[ ad <b>%s</b>]",
-"DIRECTION_5":"U-vending[ ad <b>%s</b>]",
-"DIRECTION_6":"Drej skarpt til venstre[ ad <b>%s</b>]",
-"DIRECTION_7":"Drej til venstre[ ad <b>%s</b>]",
-"DIRECTION_8":"Drej svagt til venstre[ ad <b>%s</b>]",
-"DIRECTION_10":"Kør mod <b>%d</b>[ ad <b>%s</b>]",
-"DIRECTION_11-1":"Kør ind i rundkørslen og tag første udkørsel[ ad <b>%s</b>]",
-"DIRECTION_11-2":"Kør ind i rundkørslen og tag anden udkørsel[ ad <b>%s</b>]",
-"DIRECTION_11-3":"Kør ind i rundkørslen og tag tredje udkørsel[ ad <b>%s</b>]",
-"DIRECTION_11-4":"Kør ind i rundkørslen og tag fjerde udkørsel[ ad <b>%s</b>]",
-"DIRECTION_11-5":"Kør ind i rundkørslen og tag femte udkørsel[ ad <b>%s</b>]",
-"DIRECTION_11-6":"Kør ind i rundkørslen og tag sjette udkørsel[ ad <b>%s</b>]",
-"DIRECTION_11-7":"Kør ind i rundkørslen og tag syvende udkørsel[ ad <b>%s</b>]",
-"DIRECTION_11-8":"Kør ind i rundkørslen og tag ottende udkørsel[ ad <b>%s</b>]",
-"DIRECTION_11-9":"Kør ind i rundkørslen og tag niende udkørsel[ ad <b>%s</b>]",
-"DIRECTION_11-x":"Kør ind i rundkørslen og tag en af de alt for mange udkørsler[ ad <b>%s</b>]",
-"DIRECTION_15":"Du er ankommet til din destination"
-};
-
-//set GUI language on load
-if( OSRM.DEFAULTS.LANUGAGE_ONDEMAND_RELOADING == true )
-	OSRM.Localization.setLanguage("dk");