Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Feature/integrate wayid2nodeid extractor (#32)

Browse Source 
* chore: compile wayid2nodeid_extractor

* chore: integrate wayid2nodeid_extractor

* chore: install dependency github.com/qedus/osmpbf
This commit is contained in:
Jay 2019-07-04 10:32:06 +08:00 committed by GitHub
parent a13bba6c1e
commit edc1a4f50c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-orchestration/osrm-backend/Dockerfile
View File

@ -25,8 +25,10 @@ RUN echo "Building branch ${BRANCH_NAME}" && \
git clone -b ${BRANCH_NAME} https://github.com/Telenav/osrm-backend.git && \ git clone -b ${BRANCH_NAME} https://github.com/Telenav/osrm-backend.git && \
cd ../../../ && \ cd ../../../ && \
if [ -d "src/github.com/Telenav/osrm-backend/traffic_updater/go/osrm_traffic_updater" ]; then \ if [ -d "src/github.com/Telenav/osrm-backend/traffic_updater/go/osrm_traffic_updater" ]; then \
go get github.com/qedus/osmpbf && \
go install github.com/Telenav/osrm-backend/traffic_updater/go/gen-go/proxy && \ go install github.com/Telenav/osrm-backend/traffic_updater/go/gen-go/proxy && \
go install github.com/Telenav/osrm-backend/traffic_updater/go/osrm_traffic_updater && \ go install github.com/Telenav/osrm-backend/traffic_updater/go/osrm_traffic_updater && \
go install github.com/Telenav/osrm-backend/traffic_updater/go/wayid2nodeid_extractor && \
ls -lh bin/ \ ls -lh bin/ \
;fi ;fi

8
docker-orchestration/osrm-backend/docker-entrypoint.sh
View File

@ -4,6 +4,7 @@ DATA_PATH=${DATA_PATH:="/osrm-data"}
OSRM_EXTRA_COMMAND="-l DEBUG" OSRM_EXTRA_COMMAND="-l DEBUG"
OSRM_ROUTED_STARTUP_COMMAND=" -a MLD --max-table-size 8000 " OSRM_ROUTED_STARTUP_COMMAND=" -a MLD --max-table-size 8000 "
MAPDATA_NAME_WITH_SUFFIX=map MAPDATA_NAME_WITH_SUFFIX=map
WAYID2NODEIDS_MAPPING_FILE=wayid2nodeids.csv
_sig() { _sig() {
kill -TERM $child 2>/dev/null kill -TERM $child 2>/dev/null
@ -16,7 +17,7 @@ if [ "$1" = 'routed_startup' ]; then
TRAFFIC_PROXY_IP=${2:-"10.189.102.81"} TRAFFIC_PROXY_IP=${2:-"10.189.102.81"}
cd ${DATA_PATH} cd ${DATA_PATH}
${BUILD_PATH}/osrm_traffic_updater -c ${TRAFFIC_PROXY_IP} -d=false -f ${TRAFFIC_FILE} ${BUILD_PATH}/osrm_traffic_updater -c ${TRAFFIC_PROXY_IP} -d=false -m ${WAYID2NODEIDS_MAPPING_FILE} -f ${TRAFFIC_FILE}
ls -lh ls -lh
${BUILD_PATH}/osrm-customize ${MAPDATA_NAME_WITH_SUFFIX}.osrm --segment-speed-file ${TRAFFIC_FILE} ${OSRM_EXTRA_COMMAND} ${BUILD_PATH}/osrm-customize ${MAPDATA_NAME_WITH_SUFFIX}.osrm --segment-speed-file ${TRAFFIC_FILE} ${OSRM_EXTRA_COMMAND}
${BUILD_PATH}/osrm-routed ${MAPDATA_NAME_WITH_SUFFIX}.osrm ${OSRM_ROUTED_STARTUP_COMMAND} & ${BUILD_PATH}/osrm-routed ${MAPDATA_NAME_WITH_SUFFIX}.osrm ${OSRM_ROUTED_STARTUP_COMMAND} &
@ -37,6 +38,7 @@ elif [ "$1" = 'compile_mapdata' ]; then
PBF_FILE_URL=${2} PBF_FILE_URL=${2}
KEEP_COMPILED_DATA=${3:-"false"} KEEP_COMPILED_DATA=${3:-"false"}
GENERATE_DATA_PACKAGE=${4:-"false"} GENERATE_DATA_PACKAGE=${4:-"false"}
IS_TELENAV_PBF=${5:-"false"}
# use PBF file name + IMAGE_TAG as data_version which can be returned in each JSON response # use PBF file name + IMAGE_TAG as data_version which can be returned in each JSON response
DATA_VERSION=`echo ${PBF_FILE_URL} | rev | cut -d / -f 1 | rev` DATA_VERSION=`echo ${PBF_FILE_URL} | rev | cut -d / -f 1 | rev`
@ -49,7 +51,9 @@ elif [ "$1" = 'compile_mapdata' ]; then
${BUILD_PATH}/osrm-extract $DATA_PATH/${MAPDATA_NAME_WITH_SUFFIX}.osm.pbf -p ${BUILD_PATH}/profiles/car.lua -d ${DATA_VERSION} ${OSRM_EXTRA_COMMAND} ${BUILD_PATH}/osrm-extract $DATA_PATH/${MAPDATA_NAME_WITH_SUFFIX}.osm.pbf -p ${BUILD_PATH}/profiles/car.lua -d ${DATA_VERSION} ${OSRM_EXTRA_COMMAND}
${BUILD_PATH}/osrm-partition $DATA_PATH/${MAPDATA_NAME_WITH_SUFFIX}.osrm ${OSRM_EXTRA_COMMAND} ${BUILD_PATH}/osrm-partition $DATA_PATH/${MAPDATA_NAME_WITH_SUFFIX}.osrm ${OSRM_EXTRA_COMMAND}
${BUILD_PATH}/osrm-customize $DATA_PATH/${MAPDATA_NAME_WITH_SUFFIX}.osrm ${OSRM_EXTRA_COMMAND} ${BUILD_PATH}/osrm-customize $DATA_PATH/${MAPDATA_NAME_WITH_SUFFIX}.osrm ${OSRM_EXTRA_COMMAND}
${BUILD_PATH}/wayid2nodeid_extractor -i $DATA_PATH/${MAPDATA_NAME_WITH_SUFFIX}.osm.pbf -o $DATA_PATH/${WAYID2NODEIDS_MAPPING_FILE} -b=${IS_TELENAV_PBF}
ls -lh $DATA_PATH/
# clean source pbf and temp .osrm # clean source pbf and temp .osrm
rm -f $DATA_PATH/${MAPDATA_NAME_WITH_SUFFIX}.osm.pbf rm -f $DATA_PATH/${MAPDATA_NAME_WITH_SUFFIX}.osm.pbf
rm -f $DATA_PATH/${MAPDATA_NAME_WITH_SUFFIX}.osrm rm -f $DATA_PATH/${MAPDATA_NAME_WITH_SUFFIX}.osrm