Skip to content

Commit

Permalink
Merge branch 'master' into python3fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
irees committed Dec 6, 2018
2 parents f4ed1c3 + 2e2fd1b commit a8af3fb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ RUN apt-get update -y && apt-get install \
osmium-tool \
pyosmium \
python-gdal \
gdal-bin \
awscli \
software-properties-common \
-y
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ PlanetUtils is a "high level" library that makes use of [Osmosis](https://wiki.o
Make sure you have [Docker](https://www.docker.com/community-edition) installed. Then:

```sh
docker pull interline/planetutils:release-v0.4.3
docker pull interline/planetutils:release-v0.4.4
```

Any of the example commands below can be executed with `docker run`. It may be helpful to mount a local directory inside the container for persistence and to access output files.

- Example of using `docker run` with the `data` directory mounted as `/data`:

```sh
docker run --rm -v ${PWD}/data:/data -t interline/planetutils:release-v0.4.3 <command>
docker run --rm -v ${PWD}/data:/data -t interline/planetutils:release-v0.4.4 <command>
```

### Using Homebrew on Mac OS
Expand All @@ -87,7 +87,7 @@ If you want to install and use the Python package directly, you'll need to provi
- [OSM C tools](https://gitlab.com/osm-c-tools/osmctools/)
- [Osmium Tool](https://osmcode.org/osmium-tool/)
- [PyOsmium](https://osmcode.org/pyosmium/)
- [GDAL](https://www.gdal.org/)
- [GDAL](https://www.gdal.org/) (both binaries and Python scripts)

Then clone this repo, run the tests, and install the Python package:

Expand Down
1 change: 1 addition & 0 deletions planetutils/elevation_tile_download.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python
from __future__ import absolute_import, unicode_literals, print_function
import argparse
import sys

from . import log
from .bbox import load_bboxes_csv, bbox_string
Expand Down

0 comments on commit a8af3fb

Please sign in to comment.