Merge branch 'refs/heads/2.0.0'

Conflicts: README.md shp/swiss-cantons-simplified/swiss-cantons-simplified.dbf shp/swiss-cantons/swiss-cantons.dbf shp/swiss-municipalities-simplified/swiss-municipalities-simplified.dbf shp/swiss-municipalities/swiss-municipalities.dbf topojson/swiss-cantons-simplified.json topojson/swiss-municipalities-simplified.json topojson/switzerland-simplified.json
interactivethings · Aug 22, 2013 · 8a1e95e · 8a1e95e
2 parents 08a635f + b74074a
commit 8a1e95e
Show file tree

Hide file tree

Showing 80 changed files with 116,141 additions and 469 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+.DS_Store
+node_modules
+/tmp
+/geo
+/shp
+/topo
diff --git a/Makefile b/Makefile
@@ -0,0 +1,286 @@
+TOPOJSON = node_modules/.bin/topojson
+GEOJSON = node_modules/.bin/geojson
+CANTONS = \
+	zh be lu ur sz ow nw gl zg \
+	fr so bs bl sh ar ai sg gr \
+	ag tg ti vd vs ne ge ju
+
+WIDTH = 960
+HEIGHT = 500
+MARGIN = 10
+
+CONTOUR_INTERVAL = 500
+
+all: topo geo
+
+topo: node_modules \
+	topo/ch-country.json \
+	topo/ch-cantons.json \
+	topo/ch-districts.json \
+	topo/ch-municipalities.json \
+	topo/ch-lakes.json \
+	$(addprefix topo/,$(addsuffix -municipalities.json,$(CANTONS))) \
+	topo/ch.json
+
+geo: node_modules \
+	geo/ch-country.json \
+	geo/ch-cantons.json \
+	geo/ch-districts.json \
+	geo/ch-municipalities.json \
+	geo/ch-lakes.json \
+	$(addprefix geo/,$(addsuffix -municipalities.json,$(CANTONS)))
+
+node_modules:
+	npm install
+
+clean:
+	rm -rf shp geo topo tmp
+
+.PHONY: clean topo geo
+
+##################################################
+# Shapefiles
+##################################################
+
+shp/ch/country.shp: src/swissBOUNDARIES3D/swissBOUNDARIES3D_1_1_TLM_LANDESGEBIET.shp
+	mkdir -p $(dir $@)
+	ogr2ogr $(if $(REPROJECT),-t_srs EPSG:4326) -where "ICC = 'CH'" $@ $<
+
+shp/ch/cantons.shp: src/swissBOUNDARIES3D/swissBOUNDARIES3D_1_1_TLM_KANTONSGEBIET.shp
+	mkdir -p $(dir $@)
+	ogr2ogr $(if $(REPROJECT),-t_srs EPSG:4326) -where "ICC = 'CH'" $@ $<
+
+shp/ch/districts.shp: src/swissBOUNDARIES3D/swissBOUNDARIES3D_1_1_TLM_BEZIRKSGEBIET.shp
+	mkdir -p $(dir $@)
+	ogr2ogr $(if $(REPROJECT),-t_srs EPSG:4326) -where "ICC = 'CH'" $@ $<
+
+shp/ch/municipalities.shp: src/swissBOUNDARIES3D/swissBOUNDARIES3D_1_1_TLM_HOHEITSGEBIET.shp
+	mkdir -p $(dir $@)
+	ogr2ogr $(if $(REPROJECT),-t_srs EPSG:4326) -where "ICC = 'CH'" $@ $<
+
+shp/zh/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 1" $@ $<
+
+shp/be/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 2" $@ $<
+
+shp/lu/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 3" $@ $<
+
+shp/ur/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 4" $@ $<
+
+shp/sz/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 5" $@ $<
+
+shp/ow/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 6" $@ $<
+
+shp/nw/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 7" $@ $<
+
+shp/gl/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 8" $@ $<
+
+shp/zg/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 9" $@ $<
+
+shp/fr/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 10" $@ $<
+
+shp/so/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 11" $@ $<
+
+shp/bs/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 12" $@ $<
+
+shp/bl/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 13" $@ $<
+
+shp/sh/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 14" $@ $<
+
+shp/ar/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 15" $@ $<
+
+shp/ai/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 16" $@ $<
+
+shp/sg/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 17" $@ $<
+
+shp/gr/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 18" $@ $<
+
+shp/ag/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 19" $@ $<
+
+shp/tg/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 20" $@ $<
+
+shp/ti/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 21" $@ $<
+
+shp/vd/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 22" $@ $<
+
+shp/vs/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 23" $@ $<
+
+shp/ne/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 24" $@ $<
+
+shp/ge/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 25" $@ $<
+
+shp/ju/municipalities.shp: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -where "KANTONSNUM = 26" $@ $<
+
+shp/ch/lakes.shp: src/V200/VEC200_Commune.shp
+	mkdir -p $(dir $@)
+	ogr2ogr $(if $(REPROJECT),-t_srs EPSG:4326) -where "SEENR < 9999 AND SEENR > 0" $@ $<
+
+shp/ch/contours.shp: tmp/contours_0.shp shp/ch/country.shp
+	mkdir -p $(dir $@)
+	ogr2ogr -s_srs EPSG:21781 $(if $(REPROJECT),-t_srs EPSG:4326,-t_srs EPSG:21781) -nlt POLYGON tmp/contours.shp $<
+	i=$(CONTOUR_INTERVAL); while [ $$i -lt 4446 ]; do \
+		ogr2ogr -s_srs EPSG:21781 $(if $(REPROJECT),-t_srs EPSG:4326,-t_srs EPSG:21781) -update -append -nln contours -nlt POLYGON tmp/contours.shp tmp/contours_$$i.shp; \
+		((i = i + $(CONTOUR_INTERVAL))); \
+	done
+	ogr2ogr -clipsrc shp/ch/country.shp $@ tmp/contours.shp
+	rm -f tmp/contours*
+
+tmp/contours_0.shp: src/DHM200/DHM200.asc
+	mkdir -p $(dir $@)
+	i=0; while [ $$i -lt 4446 ]; do \
+		if [ $$i = 0 ]; then \
+			gdal_calc.py -A $< --outfile=$(dir $@)contours_$$i.tif --calc="0"  --NoDataValue=-1; \
+		else \
+			gdal_calc.py -A $< --outfile=$(dir $@)contours_$$i.tif --calc="$$i*(A>$$i)" --NoDataValue=0; \
+		fi; \
+		gdal_polygonize.py -f "ESRI Shapefile" $(dir $@)contours_$$i.tif $(dir $@)contours_$$i.shp contours_$$i elev; \
+		((i = i + $(CONTOUR_INTERVAL))); \
+	done
+
+##################################################
+# TopoJSON
+##################################################
+
+topo/ch-country.json: shp/ch/country.shp
+	mkdir -p $(dir $@)
+	$(TOPOJSON) \
+	--simplify $(if $(REPROJECT),2e-9,1) \
+	$(if $(REPROJECT),,--width $(WIDTH) --height $(HEIGHT) --margin $(MARGIN)) \
+	--id-property ICC \
+	-p name=NAME \
+	-- country=$< | bin/topomergeids country > $@
+
+topo/ch-cantons.json: shp/ch/cantons.shp
+	mkdir -p $(dir $@)
+	$(TOPOJSON) \
+	--simplify $(if $(REPROJECT),2e-9,1) \
+	$(if $(REPROJECT),,--width $(WIDTH) --height $(HEIGHT) --margin $(MARGIN)) \
+	--e meta/cantons.csv \
+	--id-property +KANTONSNUM \
+	-p name=NAME,abbr=ABBR \
+	-- cantons=$< | bin/topomergeids cantons > $@
+
+topo/ch-districts.json: shp/ch/districts.shp
+	mkdir -p $(dir $@)
+	$(TOPOJSON) \
+	--simplify $(if $(REPROJECT),2e-9,1) \
+	$(if $(REPROJECT),,--width $(WIDTH) --height $(HEIGHT) --margin $(MARGIN)) \
+	--id-property +BEZIRKSNUM \
+	-p name=NAME \
+	-- districts=$< | bin/topomergeids districts > $@
+
+topo/ch-municipalities.json: shp/ch/municipalities.shp
+	mkdir -p $(dir $@)
+	$(TOPOJSON) \
+	--simplify $(if $(REPROJECT),2e-9,1) \
+	$(if $(REPROJECT),,--width $(WIDTH) --height $(HEIGHT) --margin $(MARGIN)) \
+	--id-property +BFS_NUMMER \
+	-p name=NAME \
+	-- municipalities=$< | bin/topomergeids municipalities > $@
+
+topo/%-municipalities.json: shp/%/municipalities.shp
+	mkdir -p $(dir $@)
+	$(TOPOJSON) \
+	--simplify $(if $(REPROJECT),2e-9,1) \
+	$(if $(REPROJECT),,--width $(WIDTH) --height $(HEIGHT) --margin $(MARGIN)) \
+	--id-property +BFS_NUMMER \
+	-p name=NAME \
+	-- municipalities=$< | bin/topomergeids municipalities > $@
+
+topo/ch-lakes.json: shp/ch/lakes.shp
+	mkdir -p $(dir $@)
+	$(TOPOJSON) \
+	--simplify $(if $(REPROJECT),2e-9,1) \
+	$(if $(REPROJECT),,--width $(WIDTH) --height $(HEIGHT) --margin $(MARGIN)) \
+	--id-property +SEENR \
+	-p name=SEENAME \
+	-- lakes=$< | bin/topomergeids lakes > $@
+
+topo/ch.json: topo/ch-country.json topo/ch-cantons.json topo/ch-districts.json topo/ch-municipalities.json topo/ch-lakes.json
+	mkdir -p $(dir $@)
+	$(TOPOJSON) \
+	-p \
+	-- $^ > $@
+
+topo/ch-contours.json: shp/ch/contours.shp
+	mkdir -p $(dir $@)
+	$(TOPOJSON) \
+	--simplify $(if $(REPROJECT),2e-9,1) \
+	$(if $(REPROJECT),,--width $(WIDTH) --height $(HEIGHT) --margin $(MARGIN)) \
+	--id-property +elev \
+	-- contours=$< | bin/topomergeids contours > $@
+
+##################################################
+# GeoJSON
+##################################################
+
+geo/ch-%.json: topo/ch-%.json
+	mkdir -p $(dir $@)
+	mkdir -p tmp/geo-ch
+	$(GEOJSON) \
+	--precision 3 \
+	-o tmp/geo-ch/ \
+	-- $<
+	mv tmp/geo-ch/$*.json $@
+	rm -rf tmp/geo-ch/
+
+geo/%-municipalities.json: topo/%-municipalities.json
+	mkdir -p $(dir $@)
+	mkdir -p tmp/geo-$*
+	$(GEOJSON) \
+	--precision 3 \
+	-o tmp/geo-$*/ \
+	-- $<
+	mv tmp/geo-$*/municipalities.json $@
+	rm -rf tmp/geo-$*/