Improve conversion

This commit matches the json files with the OSM slippy map, apparently we don't need a grid anymore
martgnz · Aug 6, 2019 · c1b2e43 · c1b2e43
1 parent ff7152d
commit c1b2e43
Show file tree

Hide file tree

Showing 17 changed files with 1,509 additions and 1,517 deletions.
diff --git a/README.md b/README.md
@@ -19,8 +19,6 @@ $ ./convert.sh
 
 You can tweak the script to delete properties from the original shapefile and adjust the simplification.
 
-Thanks to [@oscarfonts](https://github.com/oscarfonts) for the NTv2 ICC grid.
-
 ## Source
 
 Ajuntament de Barcelona / [CartoBCN](http://w20.bcn.cat/cartobcn/) ([CC-BY](http://w133.bcn.cat/geoportal/descargas/ca_ca_cond_us_carto.pdf)).

diff --git a/area-estadistica-basica/area-estadistica-basica.geojson b/area-estadistica-basica/area-estadistica-basica.geojson
diff --git a/area-estadistica-basica/area-estadistica-basica.json b/area-estadistica-basica/area-estadistica-basica.json
diff --git a/barris/barris.geojson b/barris/barris.geojson
diff --git a/barris/barris.json b/barris/barris.json
diff --git a/convert.sh b/convert.sh
@@ -3,13 +3,7 @@
 generate_files() {
   rm $1/*.geojson $1/*.json
 
-  ogr2ogr -f "GeoJSON" \
-    -s_srs "+init=epsg:23031 +nadgrids=./src/100800401.gsb +wktext" \
-    -t_srs EPSG:4326 \
-    -overwrite \
-    "$1"/"$1".geojson \
-    src/"$2".shp
-
+  ogr2ogr -f "GeoJSON" -t_srs crs:84 "$1"/"$1".geojson src/"$2".shp
   geo2topo -q 1e4 "$1"/"$1".geojson > "$1"/"$1".json
 } 
 

diff --git a/districtes/districtes.geojson b/districtes/districtes.geojson
diff --git a/districtes/districtes.json b/districtes/districtes.json
diff --git a/gran-barri/gran-barri.geojson b/gran-barri/gran-barri.geojson
diff --git a/gran-barri/gran-barri.json b/gran-barri/gran-barri.json
diff --git a/seccio-censal/seccio-censal.geojson b/seccio-censal/seccio-censal.geojson
diff --git a/seccio-censal/seccio-censal.json b/seccio-censal/seccio-censal.json
diff --git a/src/100800401.gsb b/src/100800401.gsb
diff --git a/terme-municipal/terme-municipal.geojson b/terme-municipal/terme-municipal.geojson
diff --git a/terme-municipal/terme-municipal.json b/terme-municipal/terme-municipal.json
diff --git a/zona-urban-audit/zona-urban-audit.geojson b/zona-urban-audit/zona-urban-audit.geojson
diff --git a/zona-urban-audit/zona-urban-audit.json b/zona-urban-audit/zona-urban-audit.json