diff --git a/run.sh b/run.sh index f957005..0ddf022 100755 --- a/run.sh +++ b/run.sh @@ -12,6 +12,22 @@ function setPostgresPassword() { sudo -u postgres psql -c "ALTER USER renderer PASSWORD '${PGPASSWORD:-renderer}'" } +function compileStyle() { + cd /data/style/ + git clone --single-branch --branch v0.6 https://github.com/cyclosm/cyclosm-cartocss-style.git --depth 1 + # mv symbols folder + mkdir /data/style/symbols/ + mv /data/style/cyclosm-cartocss-style/symbols/* /data/style/symbols/ + # change shp paths + sed -i "s,file: http://osmdata.openstreetmap.de/download,file: /data/shp,g" ./cyclosm-cartocss-style/project.mml + sed -i "s/.zip/.shp/g" ./cyclosm-cartocss-style/project.mml + # change dbname + sed -i 's/dbname: "osm"/dbname: "gis"/g' ./cyclosm-cartocss-style/project.mml + # carto build + carto cyclosm-cartocss-style/project.mml > mapnik.xml +} + + if [ "$#" -ne 1 ]; then echo "usage: " echo "commands:" @@ -35,15 +51,7 @@ fi if [ "$1" == "import" ]; then - cd /data/style/ - git clone --single-branch --branch v0.6 https://github.com/cyclosm/cyclosm-cartocss-style.git --depth 1 - mkdir /data/style/symbols/ - mv /data/style/cyclosm-cartocss-style/symbols/* /data/style/symbols/ - # change shp paths - sed -i "s,file: http://osmdata.openstreetmap.de/download,file: /data/shp,g" ./cyclosm-cartocss-style/project.mml - sed -i "s/.zip/.shp/g" ./cyclosm-cartocss-style/project.mml - # carto build - carto cyclosm-cartocss-style/project.mml > mapnik.xml + compileStyle # Ensure that database directory is in right state mkdir -p /data/database/postgres/ @@ -134,16 +142,7 @@ if [ "$1" == "run" ]; then # Clean /tmp rm -rf /tmp/* - cd /data/style/ - git clone --single-branch --branch v0.6 https://github.com/cyclosm/cyclosm-cartocss-style.git --depth 1 - mkdir /data/style/symbols/ - mv /data/style/cyclosm-cartocss-style/symbols/* /data/style/symbols/ - # change shp paths - sed -i "s,file: http://osmdata.openstreetmap.de/download,file: /data/shp,g" ./cyclosm-cartocss-style/project.mml - sed -i "s/.zip/.shp/g" ./cyclosm-cartocss-style/project.mml - # carto build - carto cyclosm-cartocss-style/project.mml > mapnik.xml - + compileStyle # migrate old files if [ -f /data/database/PG_VERSION ] && ! [ -d /data/database/postgres/ ]; then