diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2021-03-22 08:27:29 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2021-03-22 08:27:29 +0100 |
| commit | 48e21bdcefccf105076b231d7106d3af715af9eb (patch) | |
| tree | c70b832a36b246c30415de48da9e53ab29560bd9 | |
| parent | b5d9bb08cdae74a7fbc375d29311344bb5f89cdd (diff) | |
| parent | 522c5a157e938c6d40f14d2a317e7cfb726d944b (diff) | |
| download | mullvadvpn-48e21bdcefccf105076b231d7106d3af715af9eb.tar.xz mullvadvpn-48e21bdcefccf105076b231d7106d3af715af9eb.zip | |
Merge branch 'update-supporting-scripts'
| -rw-r--r-- | gui/scripts/README.md | 13 | ||||
| -rwxr-xr-x[-rw-r--r--] | gui/scripts/extract-geo-data.py | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gui/scripts/README.md b/gui/scripts/README.md index c8577e088a..cd9b723045 100644 --- a/gui/scripts/README.md +++ b/gui/scripts/README.md @@ -3,13 +3,20 @@ This is a folder with the supporting scripts written in Python 3, node, bash. ## Dependency installation notes -1. Run the following command in terminal to install python dependencies: +1. Install GDAL/OGR dependencies, which are required by Fiona python package. + + You can install GDAL via Homebrew on macOS: + `brew install gdal` + + For other platforms, please follow the guide on https://gdal.org/download.html#binaries + +2. Run the following command in terminal to install python dependencies: `pip3 install -r requirements.txt` -2. Run `npm install -g topojson-server` to install `geo2topo` tool which is +3. Run `npm install -g topojson-server` to install `geo2topo` tool which is used by python scripts to convert GeoJSON to TopoJSON -3. Make sure you have gettext utilities installed. +4. Make sure you have gettext utilities installed. https://www.gnu.org/software/gettext/ diff --git a/gui/scripts/extract-geo-data.py b/gui/scripts/extract-geo-data.py index 1b18e792c9..f9e9def1a7 100644..100755 --- a/gui/scripts/extract-geo-data.py +++ b/gui/scripts/extract-geo-data.py @@ -13,9 +13,9 @@ from polib import POFile, POEntry import colorful as c from terminaltables import AsciiTable +import fiona # import order is important, see https://github.com/Toblerity/Shapely/issues/553 from shapely.geometry import shape, mapping -import fiona SCRIPT_DIR = path.dirname(path.realpath(__file__)) |