Skip to content

Commit

Permalink
Added dockerignore
Browse files Browse the repository at this point in the history
Updated README
Changes in Dockerfile
  • Loading branch information
TimMcCauley committed Feb 26, 2018
1 parent fb33ee7 commit 4d77953
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.git
osm/**/*
10 changes: 0 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,6 @@ RUN apt-get update
RUN apt-get install -y python python-pip python-virtualenv gunicorn git nano

# Install protobuf
#RUN apt-get install -y autoconf automake libtool curl make g++ unzip
#RUN git clone https://github.com/google/protobuf.git protobuf
#WORKDIR /protobuf
#RUN ./autogen.sh
#RUN ./configure
#RUN make
#RUN make check
#RUN make install
#RUN ldconfig

RUN apt-get install -y build-essential protobuf-compiler libprotobuf-dev

# Setup flask application
Expand Down
16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,26 @@ Access the application at the address [http://localhost:5000/](http://localhost:
> $ python manage.py run -h 0.0.0.0 -p 8080
> ```
### Testing: TODO
### Testing
```sh
$ export TESTING="True" && python manage.py test
```

### Technical specs for importing OSM

Please consider the following technical specifications for importing an osm file.

| Region | Memory |
| ------------- |:-------------:|
| Germany | 16 GB |
| Europe | 64 GB |
| Planet | 128 GB |

**Note:** we will be adding the functionality for adding a list of pbf files in the future.


### API Documentation

The documentation for this flask service is provided via [flasgger](https://github.com/rochacbruno/flasgger) and can be
Expand Down
4 changes: 0 additions & 4 deletions manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ def drop_db():
def import_data():
"""Imports osm pbf data to postgis."""

db.drop_all()

db.create_all()

logger.info("Starting to import data...")

# add option to add multiple osm pbf files
Expand Down

0 comments on commit 4d77953

Please sign in to comment.