diff --git a/cartiflette/mapshaper/mapshaper_split.py b/cartiflette/mapshaper/mapshaper_split.py index 1f848490..aa49950f 100644 --- a/cartiflette/mapshaper/mapshaper_split.py +++ b/cartiflette/mapshaper/mapshaper_split.py @@ -166,3 +166,5 @@ def mapshaperize_split_merge( cmd, shell=True ) + + return output_path diff --git a/cartiflette/pipeline/mapshaper_split_from_s3.py b/cartiflette/pipeline/mapshaper_split_from_s3.py index 7c66eb6b..56a7066c 100644 --- a/cartiflette/pipeline/mapshaper_split_from_s3.py +++ b/cartiflette/pipeline/mapshaper_split_from_s3.py @@ -42,7 +42,7 @@ def mapshaperize_split_from_s3( output_path = mapshaperize_split( local_dir=local_dir, filename_initial=borders, - extension_initial="shp", + extension_initial="shp", format_output=format_output, niveau_agreg=filter_by, provider=provider, @@ -120,11 +120,10 @@ def mapshaperize_merge_split_from_s3( fs=fs ) - local_directory output_path = mapshaperize_split_merge( local_dir=local_dir, - extension_initial="shp", + extension_initial="shp", format_output=format_output, niveau_agreg=filter_by, provider=provider, diff --git a/misc/install-mapshaper.sh b/misc/install-mapshaper.sh index 344ec24b..4579d5a9 100644 --- a/misc/install-mapshaper.sh +++ b/misc/install-mapshaper.sh @@ -3,6 +3,7 @@ sudo apt install npm nodejs -y sudo apt-get install libmagic-dev -y git clone https://github.com/mbloch/mapshaper.git --single-branch +git checkout ec6e7a40bc875ee6d113045e5ee86f47abf57bc7 cd mapshaper yes | npm install # install dependencies yes yes | npm run build # bundle source code files