drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-29 09:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tiger and subway scripts

Browse Source 
Signed-off-by: zyphlar <zyphlar@gmail.com>
This commit is contained in:
zyphlar
2025-10-25 23:56:08 -07:00
parent 36a8425b06
commit fef0872ca4
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,7 +251,6 @@ jobs:
run: |
cd /media/4tbexternal/comaps-init/
cp tools/unix/maps/settings.sh.prod tools/unix/maps/settings.sh
echo "hi"
./tools/unix/maps/generate_subways.sh
update-tiger:
@@ -315,9 +314,12 @@ jobs:
- name: Update TIGER from Nominatim
shell: bash
run: |
# TODO: maybe remove old osm-planet/tiger first?
cd /media/4tbexternal/osm-planet/
mkdir -p tiger
wget2 https://nominatim.org/data/tiger-nominatim-preprocessed-latest.csv.tar.gz
tar -xOzf tiger-nominatim-preprocessed-latest.csv.tar.gz | /media/4tbexternal/omim-build-relwithdebinfo/address_parser_tool --output_path=./tiger
cd /media/4tbexternal/comaps-init
tar -xOzf /media/4tbexternal/osm-planet/tiger-nominatim-preprocessed-latest.csv.tar.gz | /media/4tbexternal/omim-build-relwithdebinfo/address_parser_tool --output_path=/media/4tbexternal/osm-planet/tiger
generate-maps:
if: inputs.jobs == 'maps' || inputs.jobs == 'all'

22
tools/unix/maps/generate_subways.sh
View File

@@ -30,26 +30,22 @@ export DUMP="$SUBWAYS_VALIDATOR_PATH"
export GEOJSON="$SUBWAYS_VALIDATOR_PATH"
export DUMP_CITY_LIST="$SUBWAYS_VALIDATOR_PATH/cities.txt"
# cd to subways repo so relative paths work in the script
echo "dir is $(pwd)"
export CITIES_INFO_FILE="$SUBWAYS_REPO_PATH/source_data/Rapid.csv"
ls -al "$SUBWAYS_REPO_PATH/source_data"
pushd "$SUBWAYS_REPO_PATH"
echo "dir is now $(pwd)"
ls -al
ls -al source_data
sed -i 's/# Updating the planet-metro file/pwd && ls -al/g' ./scripts/process_subways.sh
echo "disabled!"
#./scripts/process_subways.sh 2>&1 | tee "$SUBWAYS_LOG"
#2>&1 | tee "$SUBWAYS_LOG"
./scripts/process_subways.sh
popd
echo "3"
# Make render.html available for map visualization on the web
cp -r "$SUBWAYS_REPO_PATH"/render/* "$SUBWAYS_VALIDATOR_PATH/"
TRANSIT_TOOL_PATH="$REPO_PATH/tools/python/transit"
SUBWAYS_GRAPH_FILE="$SUBWAYS_PATH/subway.transit.json"
SUBWAYS_GRAPH_FILE="$SUBWAYS_PATH/subways.transit.json"
echo "4"
activate_venv_at_path "$TRANSIT_TOOL_PATH"
"$PYTHON" "$TRANSIT_TOOL_PATH/transit_graph_generator.py" "$MAPSME" "$SUBWAYS_GRAPH_FILE" 2>&1 | tee -a "$SUBWAYS_LOG"
"$PYTHON" "$TRANSIT_TOOL_PATH/transit_graph_generator.py" "$MAPSME" "$SUBWAYS_GRAPH_FILE"
# 2>&1 | tee -a "$SUBWAYS_LOG"
deactivate
echo "Generated subways transit graph file:"