drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-22 06:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change organicmaps path to comaps-init so relative paths don't suck so bad

Browse Source 
Signed-off-by: zyphlar <zyphlar@gmail.com>
This commit is contained in:
zyphlar
2025-10-27 16:55:52 -07:00
parent 0c8cbdc3de
commit e6d3e75ed4
5 changed files with 61 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.forgejo/workflows/map-generator.yml
View File

@@ -413,6 +413,7 @@ jobs:
run: | run: |
mkdir -p /root/OM mkdir -p /root/OM
ln -s /media/4tbexternal/comaps-init /root/OM/organicmaps ln -s /media/4tbexternal/comaps-init /root/OM/organicmaps
ln -s /media/4tbexternal/comaps-init /root/OM/comaps-init
ln -s /media/4tbexternal/osm-planet /home/planet ln -s /media/4tbexternal/osm-planet /home/planet
ln -s /media/4tbexternal/osm-maps /root/OM/maps_build ln -s /media/4tbexternal/osm-maps /root/OM/maps_build
- name: Run docker_maps_generator.sh - name: Run docker_maps_generator.sh

4
tools/python/maps_generator/var/etc/map_generator.ini.prod
View File

@@ -1,6 +1,6 @@
[Developer] [Developer]
# Path to the `organicmaps` source code repository: # Path to the `comaps` source code repository:
OMIM_PATH: ~/OM/organicmaps OMIM_PATH: /root/OM/comaps-init
# A path with the generator_tool binary: # A path with the generator_tool binary:
BUILD_PATH: /root/OM/omim-build-relwithdebinfo BUILD_PATH: /root/OM/omim-build-relwithdebinfo
#${Developer:OMIM_PATH}/../omim-build-release #${Developer:OMIM_PATH}/../omim-build-release

7
tools/unix/Dockerfile
View File

@@ -46,17 +46,18 @@ RUN pip3 install "protobuf<4"
RUN mkdir /root/OM RUN mkdir /root/OM
# When running, bind mount the repo here # When running, bind mount the repo here
RUN mkdir /root/OM/organicmaps RUN mkdir /root/OM/comaps-init
# And a volume to store the large output/temp files here # And a volume to store the large output/temp files here
RUN mkdir /root/OM/maps_build RUN mkdir /root/OM/maps_build
# And the output of the app build # And the output of the app build
RUN mkdir /root/OM/omim-build-release RUN mkdir /root/OM/omim-build-release
RUN mkdir /root/OM/omim-build-relwithdebinfo
# And a volume to store >10gb files for the planet here # And a volume to store >10gb files for the planet here
RUN mkdir /home/planet RUN mkdir /home/planet
WORKDIR /root/OM/organicmaps WORKDIR /root/OM/comaps-init
# For debugging # For debugging
#CMD /bin/bash #CMD /bin/bash
CMD /root/OM/organicmaps/tools/unix/docker_maps_generator.sh CMD /root/OM/comaps-init/tools/unix/docker_maps_generator.sh

103
tools/unix/docker_maps_generator.sh
View File

@@ -19,7 +19,7 @@ set -e
echo "<$(date +%T)> Setting git as safe dir..." echo "<$(date +%T)> Setting git as safe dir..."
git config --global --add safe.directory /root/OM/organicmaps git config --global --add safe.directory /root/OM/comaps-init
echo "<$(date +%T)> Starting..." echo "<$(date +%T)> Starting..."
@@ -27,8 +27,9 @@ echo "<$(date +%T)> Starting..."
# #
# Already created by Dockerfile or CI/CD: # Already created by Dockerfile or CI/CD:
# /root/OM # /root/OM
# /root/OM/organicmaps # /root/OM/comaps-init
# /root/OM/omim-build-release # /root/OM/omim-build-release
# /root/OM/omim-build-relwithdebinfo
# /root/OM/maps_build # /root/OM/maps_build
# /home/planet # /home/planet
# #
@@ -43,22 +44,22 @@ mkdir -p /home/planet/postcodes/us-postcodes/
mkdir -p /home/planet/SRTM-patched-europe/ mkdir -p /home/planet/SRTM-patched-europe/
mkdir -p /home/planet/subway mkdir -p /home/planet/subway
echo "Writing rclone config..." # echo "Writing rclone config..."
echo "[r2]" > ~/.config/rclone/rclone.conf # echo "[r2]" > ~/.config/rclone/rclone.conf
echo "type = s3" >> ~/.config/rclone/rclone.conf # echo "type = s3" >> ~/.config/rclone/rclone.conf
echo "provider = Cloudflare" >> ~/.config/rclone/rclone.conf # echo "provider = Cloudflare" >> ~/.config/rclone/rclone.conf
echo "access_key_id = $S3_KEY_ID" >> ~/.config/rclone/rclone.conf # echo "access_key_id = $S3_KEY_ID" >> ~/.config/rclone/rclone.conf
echo "secret_access_key = $S3_SECRET_KEY" >> ~/.config/rclone/rclone.conf # echo "secret_access_key = $S3_SECRET_KEY" >> ~/.config/rclone/rclone.conf
echo "region = auto" >> ~/.config/rclone/rclone.conf # echo "region = auto" >> ~/.config/rclone/rclone.conf
echo "endpoint = $S3_ENDPOINT" >> ~/.config/rclone/rclone.conf # echo "endpoint = $S3_ENDPOINT" >> ~/.config/rclone/rclone.conf
# S3_BUCKET is used below during uploading # # S3_BUCKET is used below during uploading
echo "<$(date +%T)> Running ./configure.sh ..." echo "<$(date +%T)> Running ./configure.sh ..."
cd ~/OM/organicmaps cd /root/OM/comaps-init
./configure.sh --skip-map-download --skip-generate-symbols ./configure.sh --skip-map-download --skip-generate-symbols
echo "<$(date +%T)> Compiling tools..." echo "<$(date +%T)> Compiling tools..."
cd ~/OM/organicmaps cd /root/OM/comaps-init
./tools/unix/build_omim.sh -R generator_tool ./tools/unix/build_omim.sh -R generator_tool
./tools/unix/build_omim.sh -R world_roads_builder_tool ./tools/unix/build_omim.sh -R world_roads_builder_tool
./tools/unix/build_omim.sh -R mwm_diff_tool ./tools/unix/build_omim.sh -R mwm_diff_tool
@@ -71,7 +72,7 @@ cp var/etc/map_generator.ini.prod var/etc/map_generator.ini
#TODO: may be duplicated by maps_generator at "osmctools are not found, building from the sources" #TODO: may be duplicated by maps_generator at "osmctools are not found, building from the sources"
#echo "<$(date +%T)> Prebuild some tools so we can make an o5m file or run update_planet..." #echo "<$(date +%T)> Prebuild some tools so we can make an o5m file or run update_planet..."
#cd ~/OM/organicmaps/tools/osmctools #cd /root/OM/comaps-init/tools/osmctools
#gcc osmupdate.c -l z -o ~/OM/osmctools/osmupdate #gcc osmupdate.c -l z -o ~/OM/osmctools/osmupdate
#gcc osmconvert.c -l z -o ~/OM/osmctools/osmconvert #gcc osmconvert.c -l z -o ~/OM/osmctools/osmconvert
@@ -99,11 +100,11 @@ if [ ! -f planet.o5m ]; then
else else
echo "<$(date +%T)> planet.o5m exists, not converting..." echo "<$(date +%T)> planet.o5m exists, not converting..."
fi fi
# (currently unused:) ~/OM/organicmaps/tools/unix/update_planet.sh planet.o5m # (currently unused:) /root/OM/comaps-init/tools/unix/update_planet.sh planet.o5m
echo "<$(date +%T)> Generating maps..." echo "<$(date +%T)> Generating maps..."
cd ~/OM/organicmaps/tools/python cd /root/OM/comaps-init/tools/python
/tmp/venv/bin/python -m maps_generator --skip="MwmDiffs" /tmp/venv/bin/python -m maps_generator --skip="MwmDiffs"
#/tmp/venv/bin/python -m maps_generator --skip="MwmDiffs" --continue #/tmp/venv/bin/python -m maps_generator --skip="MwmDiffs" --continue
@@ -112,44 +113,44 @@ cd ~/OM/organicmaps/tools/python
#/tmp/venv/bin/python -m maps_generator --countries="US_Oregon_Portland" --skip="MwmDiffs" #/tmp/venv/bin/python -m maps_generator --countries="US_Oregon_Portland" --skip="MwmDiffs"
#/tmp/venv/bin/python -m maps_generator --countries="Macedonia" --skip="MwmDiffs" #/tmp/venv/bin/python -m maps_generator --countries="Macedonia" --skip="MwmDiffs"
shopt -s nullglob # shopt -s nullglob
buildfolder=$(find ~/OM/maps_build/ -mindepth 1 -maxdepth 1 -iname 2* -type d | sort -n -r | head -1 | cut -d/ -f5) # buildfolder=$(find ~/OM/maps_build/ -mindepth 1 -maxdepth 1 -iname 2* -type d | sort -n -r | head -1 | cut -d/ -f5)
builddate=$(find ~/OM/maps_build/*/ -mindepth 1 -maxdepth 1 -iname 2* -type d | sort -n -r | head -1 | cut -d/ -f6) # builddate=$(find ~/OM/maps_build/*/ -mindepth 1 -maxdepth 1 -iname 2* -type d | sort -n -r | head -1 | cut -d/ -f6)
mwmfiles=( ~/OM/maps_build/$buildfolder/$builddate/*.mwm ) # mwmfiles=( ~/OM/maps_build/$buildfolder/$builddate/*.mwm )
if (( ${#mwmfiles[@]} )); then # if (( ${#mwmfiles[@]} )); then
echo "<$(date +%T)> Uploading maps to sftp..." # echo "<$(date +%T)> Uploading maps to sftp..."
# upload limited files via SFTP to Dreamhost (cdn-us-1.comaps.app) # # upload limited files via SFTP to Dreamhost (cdn-us-1.comaps.app)
# Needs StrictHostKeyChecking=no otherwise new containers/SFTP_HOSTs will require a manual ssh attempt # # Needs StrictHostKeyChecking=no otherwise new containers/SFTP_HOSTs will require a manual ssh attempt
sshpass -p $SFTP_PASSWORD sftp -o StrictHostKeyChecking=no $SFTP_USER@$SFTP_HOST:$SFTP_PATH <<EOF # sshpass -p $SFTP_PASSWORD sftp -o StrictHostKeyChecking=no $SFTP_USER@$SFTP_HOST:$SFTP_PATH <<EOF
lcd ~/OM/maps_build/$buildfolder/$builddate # lcd ~/OM/maps_build/$buildfolder/$builddate
mkdir maps/$builddate # mkdir maps/$builddate
cd maps/$builddate # cd maps/$builddate
put countries.txt # put countries.txt
put World.mwm # put World.mwm
put WorldCoasts.mwm # put WorldCoasts.mwm
cd .. # cd ..
rm latest # rm latest
ln -s $builddate latest # ln -s $builddate latest
cd .. # cd ..
lcd /home/planet/subway/ # lcd /home/planet/subway/
put subway.json # put subway.json
put subway.log # put subway.log
put subway.transit.json # put subway.transit.json
lcd /home/planet/subway/subway/validator # lcd /home/planet/subway/subway/validator
rm subway/js/* # rm subway/js/*
rmdir subway/js # rmdir subway/js
rm subway/* # rm subway/*
rmdir subway # rmdir subway
mkdir subway # mkdir subway
cd subway # cd subway
put * # put *
exit # exit
EOF # EOF
# upload all files via rclone to Cloudflare (R2) # upload all files via rclone to Cloudflare (R2)
echo "<$(date +%T)> Uploading maps to cloudflare..." # echo "<$(date +%T)> Uploading maps to cloudflare..."
rclone --progress copy ~/OM/maps_build/$buildfolder/$builddate r2:$S3_BUCKET/maps/$builddate/ # rclone --progress copy ~/OM/maps_build/$buildfolder/$builddate r2:$S3_BUCKET/maps/$builddate/
else else
echo "<$(date +%T)> No MWM files in ~/OM/maps_build/$buildfolder/$builddate/*.mwm, not uploading maps." echo "<$(date +%T)> No MWM files in ~/OM/maps_build/$buildfolder/$builddate/*.mwm, not uploading maps."

4
tools/unix/run-docker.sh
View File

@@ -24,7 +24,7 @@
#TODO: isolines, postcodes, subways, wiki #TODO: isolines, postcodes, subways, wiki
# In tools/unix/maps, copy settings.sh.dist to settings.sh and modify if needed # In tools/unix/maps, copy settings.sh.dist to settings.sh and modify if needed
# In tools/python/maps_generator, copy map_generator.ini.prod to map_generator.ini and modify if needed # In tools/python/maps_generator/var/etc, copy map_generator.ini.prod to map_generator.ini and modify if needed
#cd /media/4tbexternal/comaps-init/tools/unix #cd /media/4tbexternal/comaps-init/tools/unix
# Build with: docker build . -t maps_generator # Build with: docker build . -t maps_generator
@@ -58,7 +58,7 @@ docker run \
-e SFTP_HOST=changeme.dreamhost.com \ -e SFTP_HOST=changeme.dreamhost.com \
-e SFTP_PATH=cdn-us-1.comaps.app \ -e SFTP_PATH=cdn-us-1.comaps.app \
--ulimit nofile=262144:262144 \ --ulimit nofile=262144:262144 \
-v /media/4tbexternal/comaps-init:/root/OM/organicmaps \ -v /media/4tbexternal/comaps-init:/root/OM/comaps-init \
-v /media/4tbexternal/osm-planet:/home/planet \ -v /media/4tbexternal/osm-planet:/home/planet \
-v /media/4tbexternal/osm-maps:/root/OM/maps_build \ -v /media/4tbexternal/osm-maps:/root/OM/maps_build \
-it maps_generator \ -it maps_generator \