Merge pull request #45 from geometalab/feature/better-structure

Better Structure

.travis.yml

@@ -13,7 +13,7 @@ before_script:
   - sleep 10
 script:
   - docker-compose run imposm3
-  - docker-compose run tilelive
+  - docker-compose run worker
   - docker-compose up -d tileserver
   - sleep 5
   - curl "http://localhost:8080/index.json"

database/mapbox-studio-classic/Dockerfile

@@ -1,11 +0,0 @@
-FROM node:0.10
-
-RUN mkdir -p /usr/src/app
-RUN git clone https://github.com/mapbox/mapbox-studio-classic.git /usr/src/app
-WORKDIR /usr/src/app
-RUN npm install
-
-VOLUME /data/projects
-ENV PORT=3000
-EXPOSE 3000
-CMD ["npm", "start"]

database/osm2pgsql/Dockerfile

@@ -1,52 +0,0 @@
-FROM debian:wheezy
-MAINTAINER Lukas Martinelli <me@lukasmartinelli.ch>
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update && apt-get install -y \
-    autoconf \
-    automake \
-    g++ \
-    git-core \
-    libboost-dev \
-    libboost-filesystem-dev \
-    libboost-system-dev \
-    libboost-thread-dev \
-    libbz2-dev \
-    libgeos++-dev \
-    libgeos-dev \
-    liblua5.2-dev \
-    libpq-dev \
-    libproj-dev \
-    libprotobuf-c0-dev \
-    libtool \
-    libxml2-dev \
-    lua5.2 \
-    make \
-    protobuf-c-compiler &&\
-    rm -rf /var/lib/apt/lists/*
-
-ENV HOME /root
-ENV OSM2PGSQL_VERSION 0.87.2
-
-RUN mkdir src &&\
-    cd src &&\
-    git clone --depth 1 --branch $OSM2PGSQL_VERSION https://github.com/openstreetmap/osm2pgsql.git &&\
-    cd osm2pgsql &&\
-    ./autogen.sh &&\
-    ./configure &&\
-    make &&\
-    make install &&\
-    cd /root &&\
-    rm -rf src
-
-COPY import.sh /usr/src/app/
-WORKDIR /usr/src/app
-
-VOLUME /data/import
-ENV IMPORT_DATA_DIR=/data/import
-
-VOLUME /data/cache
-ENV CACHE_DIR=/data/cache
-
-CMD ["./import.sh"]

database/osm2pgsql/README.md

@@ -1,8 +0,0 @@
-## Import using different tool
-
-```
-docker run --rm --name osm2pgsql \
-    -v /data/import:/data/import \
-    --link postgis:db \
-    osm2vectortiles/osm2pgsql
-```

database/osm2pgsql/import.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-set -o errexit
-set -o pipefail
-set -o nounset
-
-# connection setup
-OSM_HOST=$DB_PORT_5432_TCP_ADDR
-OSM_DB=${OSM_DB:-osm}
-OSM_USER=${OSM_USER:-osm}
-OSM_PASSWORD=${OSM_PASSWORD:-osm}
-
-# mounted data volume containing the pbfs
-IMPORT_DATA_DIR=${IMPORT_DATA_DIR:-/data/import}
-CACHE_DIR=${CACHE_DIR:-/data/cache}
-
-# use all available cores for import
-AVAILABLE_PROC=$(nproc)
-PROC_NUM=${PROC_NUM:-$AVAILABLE_PROC}
-
-# choose a big enough cache for the nodes
-NODES_CACHE=${NODES_CACHE:-2000}
-
-
-if [ "$(ls -A $IMPORT_DATA_DIR/*.pbf 2> /dev/null)" ]; then
-    for PBF_FILE in "$IMPORT_DATA_DIR"/*.pbf; do
-        PGPASSWORD=$OSM_PASSWORD osm2pgsql -d $OSM_DB -U $OSM_USER -H $OSM_HOST --create --slim --flat-nodes $CACHE_DIR/nodes.bin -C $NODES_CACHE --number-processes $PROC_NUM --hstore $PBF_FILE
-        echo "Successfully imported $PBF_FILE"
-        break
-    done
-else
-    echo "No PBF files for import found."
-    echo "Please mount the $IMPORT_DATA_DIR volume to a folder containing OSM PBF files."
-    exit 404
-fi

docker-compose.yml

@@ -17,9 +17,9 @@ postgis:
     OSM_USER: "osm"
     OSM_PASSWORD: "suisse"
 imposm3:
-  build: ./database/imposm3
+  build: ./import/imposm3
   volumes:
-   - ./import:/data/import
+   - ./volumes/import:/data/import
   volumes_from:
    - cache
   links:
@@ -29,10 +29,10 @@ imposm3:
     OSM_USER: "osm"
     OSM_PASSWORD: "suisse"
     PBF_DOWNLOAD_URL: "https://s3.amazonaws.com/metro-extracts.mapzen.com/zurich_switzerland.osm.pbf"
-importwater:
+water:
-  build: ./database/importwater
+  build: ./import/water
   volumes:
-  - ./import:/data/import
+  - ./volumes/water:/data/import
   links:
   - postgis:db
   environment:
@@ -40,11 +40,11 @@ importwater:
     OSM_USER: "osm"
     OSM_PASSWORD: "suisse"
     # WATER_SHP_DOWNLOAD_URL: "http://data.openstreetmapdata.com/water-polygons-split-3857.zip"
-tilelive:
+worker:
-  build: ./database/tilelive
+  build: ./export/worker
   volumes:
-   - ./osm-bright-2.tm2source:/data/tm2source
+   - ./open-streets.tm2source:/data/tm2source
-   - ./export:/data/export
+   - ./volumes/export:/data/export
   links:
    - postgis:db
   environment:
@@ -57,6 +57,6 @@ tilelive:
 tileserver:
   build: ./tileserver
   volumes:
-   - ./export:/data
+   - ./volumes/export:/data
   ports:
    - "8080:80"

import/imposm3/import.sh

@@ -20,7 +20,7 @@ readonly PG_CONNECT="postgis://$OSM_USER:$OSM_PASSWORD@$DB_HOST/$OSM_DB"
 
 function download_pbf() {
     local pbf_url=$1
-	wget --directory-prefix "$IMPORT_DATA_DIR" --no-clobber "$pbf_url"
+	wget -q  --directory-prefix "$IMPORT_DATA_DIR" --no-clobber "$pbf_url"
 }
 
 function import_pbf() {