Merge branch 'n0rdlicht-master'

Author: n0rdlicht

.gitattributes

@@ -1 +1 @@
-downloads/*.zip filter=lfs diff=lfs merge=lfs -text
+downloads/swissBOUNDARIES3D.zip filter=lfs diff=lfs merge=lfs -text

Makefile

@@ -2,6 +2,7 @@ CKAN_Endpoint = "https://opendata.swiss/api/3/"
 # action/package_show?id=
 PKG_ID = swissboundaries3d_gemeindegrenzen
 FILE_NAME = swissBOUNDARIES3D
+GMD = gemeinden-collected.gpkg
 
 .PHONY: all
 
@@ -11,29 +12,35 @@ data/gemeinden.json: data/gemeinden.csv
 	mkdir -p $(dir $@)
 	cat $< | node_modules/.bin/csvtojson > $@
 
-data/gemeinden.csv: build/gemeinden-clean.gpkg
+data/gemeinden.csv: data/gemeinden.geojson
 	mkdir -p $(dir $@)
-	ogr2ogr -f CSV $@ $<
-	sed -i.bkp 's/ [(][A-Z][A-Z][)]//g' $@
+	ogr2ogr -lco STRING_QUOTING=IF_NEEDED -f CSV $@ $<
 
-build/gemeinden-clean.gpkg: build/gemeinden.gpkg
+data/gemeinden.geojson: build/gemeinden-clean.gpkg
 	mkdir -p $(dir $@)
-	ogr2ogr -f GPKG $@ $< -sql 'select distinct `gemeinde.BFS_NUMMER`,`gemeinde.NAME`,`kanton.KUERZEL`,`kanton.NAME` from gemeinde'
+	ogr2ogr -f GeoJSON -t_srs "EPSG:4326" $@ $<
+	sed -i '' 's/ [(][A-Z][A-Z][)]//g' $@
+
+build/gemeinden-clean.gpkg: build/gemeinden-collected.gpkg
+	mkdir -p $(dir $@)
+	ogr2ogr -f GPKG $@ $< -sql 'select distinct `gemeinde.BFS_NUMMER`,`gemeinde.NAME`,`kanton.KUERZEL`,`kanton.NAME`, geom from gemeinde WHERE `gemeinde.BFS_NUMMER` < 9000 OR `gemeinde.BFS_NUMMER` > 9999 ORDER BY `gemeinde.BFS_NUMMER` ASC'
 
 build/gemeinden.gpkg: src/kantone.csv build/kantone.csv
-	ogr2ogr -f GPKG -sql "select gemeinde.*, kanton.* from swissBOUNDARIES3D_1_3_TLM_HOHEITSGEBIET AS gemeinde left join '$<'.kantone as kanton on gemeinde.KANTONSNUM = kanton.KANTONSNUM WHERE gemeinde.ICC = 'CH'" $@ downloads/$(PKG_ID)/BOUNDARIES_2020/DATEN/swissBOUNDARIES3D/SHAPEFILE_LV95_LN02/swissBOUNDARIES3D_1_3_TLM_HOHEITSGEBIET.shp -nln "gemeinde"
+	ogr2ogr -f GPKG -sql "select gemeinde.*, kanton.* from swissBOUNDARIES3D_1_3_TLM_HOHEITSGEBIET AS gemeinde left join '$<'.kantone as kanton on gemeinde.KANTONSNUM = kanton.KANTONSNUM WHERE gemeinde.ICC = 'CH'" $@ downloads/$(PKG_ID)/swissBOUNDARIES3D_1_3_TLM_HOHEITSGEBIET.shp -nln "gemeinde"
 	# ogr2ogr -f GPKG $@ downloads/$(PKG_ID)/BOUNDARIES_2020/DATEN/swissBOUNDARIES3D/SHAPEFILE_LV95_LN02/swissBOUNDARIES3D_1_3_TLM_HOHEITSGEBIET.shp 
 
 build/kantone.csv: downloads/$(FILE_NAME).zip
 	mkdir -p $(dir $@)
 	mkdir -p $(dir $<)$(PKG_ID)/
 	unzip -n $< -d $(dir $<)$(PKG_ID)/
-	ogr2ogr -f CSV -dialect sqlite -sql "select distinct KANTONSNUM, NAME, HERKUNFT, REVISION_J, REVISION_M from swissBOUNDARIES3D_1_3_TLM_KANTONSGEBIET ORDER BY KANTONSNUM ASC" $(dir $@)/kantone.csv $(dir $<)$(PKG_ID)/BOUNDARIES_2020/DATEN/swissBOUNDARIES3D/SHAPEFILE_LV95_LN02/swissBOUNDARIES3D_1_3_TLM_KANTONSGEBIET.shp
+	ogr2ogr -f CSV -dialect sqlite -sql "select distinct KANTONSNUM, NAME, HERKUNFT, REVISION_J, REVISION_M from swissBOUNDARIES3D_1_3_TLM_KANTONSGEBIET ORDER BY KANTONSNUM ASC" $(dir $@)/kantone.csv $(dir $<)$(PKG_ID)/swissBOUNDARIES3D_1_3_TLM_KANTONSGEBIET.shp
 
-# downloads/%.zip:
-# 	mkdir -p $(dir $@)
-# 	curl http://data.geo.admin.ch/ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill/data.zip -L -o $@.download
-# 	mv $@.download $@
+downloads/%.zip:
+	mkdir -p $(dir $@)
+	cd downloads
+	curl https://data.geo.admin.ch/ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill/shp/2056/ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill.zip -L -o $@.download
+	# curl http://data.geo.admin.ch/ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill/data.zip -L -o $@.download
+	mv $@.download $@
 
 clean:
 	rm -rf build/

README.md

@@ -6,7 +6,7 @@
 
 > Background and data processing: [github.com/smartuse/toolbox-municipalities](https://github.com/smartuse/toolbox-municipalities)
 
-This repository compiles tools to generate a Frictionless Data compliant Datapackage of the current Swiss municipalities in CSV and JSON formats. 
+This repository compiles tools to generate a Frictionless Data compliant Datapackage of the current Swiss municipalities in CSV, JSON and GeoJSON formats.
 
 To add new datasets or make modifications, please visit our [GitHub repository](https://github.com/smartuse/toolbox-municipalities) and contact us via Issues or Pull Request.
 
@@ -32,8 +32,9 @@ Now, clone this reposiory and run `make`
 
 The downloads, build and the data folders should now be populated with processes files.
 
-* `data/gemeinden.csv` contains a list of municipalities
-* `data/gemeinden.json` is the same list as nested JSON
+* `data/gemeinden.geojson` is generated first
+* `data/gemeinden.csv` is derived from the `geojson`
+* `data/gemeinden.json` is then derived from the `csv` version
 
 ## Push to Datahub
 
@@ -51,7 +52,7 @@ Then you can update the list by
 
 ## Author
 
-Thorben Westerhuys, SmartUse GmbH
+Thorben Westerhuys, cividi GmbH
 
 ## Datapackage