diff --git a/contours/Makefile.2008 b/contours/Makefile.2008 index 5658827..d0899e9 100644 --- a/contours/Makefile.2008 +++ b/contours/Makefile.2008 @@ -30,7 +30,7 @@ db/contour_%: contour_%.gpkg db/.ready contour_%.gpkg: all.tif gdal_contour -nln $(basename $@) -i $(subst _,.,$*) -a z $^ $@ -all-grid.tif: all.vrt all.csv +all-grid.tif: all.vrt all.xyz gdal_grid $< $@ -ot Float32 -outsize $(OUTSIZE) all.tif: all-grid.tif @@ -38,8 +38,8 @@ all.tif: all-grid.tif -ot Float32 -a_srs EPSG:3346 \ -co COMPRESS=DEFLATE -co PREDICTOR=2 -.INTERMEDIATE: all.csv -all.csv: $(XYZ) +.INTERMEDIATE: all.xyz +all.xyz: $(XYZ) $(SORT) -m $^ > $@ .INTERMEDIATE: $(XYZ) diff --git a/contours/all.vrt b/contours/all.vrt index c7caa78..39a8414 100644 --- a/contours/all.vrt +++ b/contours/all.vrt @@ -1,7 +1,7 @@ EPSG:3346 - all.csv + CSV:all.xyz wkbPoint