some modern updates

contours/Makefile

@@ -26,7 +26,7 @@ db/contour_%: contour_%.gpkg db/.ready
 	touch $@
 
 contour_%.gpkg: all.tif
-	gdal_contour -a z -nln $(basename $@) -i $(subst _,.,$*) -a z $^ $@
+	gdal_contour -nln $(basename $@) -i $(subst _,.,$*) -a z $^ $@
 
 ifeq ($(VARIANT),2009)
 all.tif: all.vrt all.xyz
@@ -51,7 +51,7 @@ all.xyz: $(XYZ)
 
 .INTERMEDIATE: $(XYZ)
 %.xyz: %.zip
-	unzip -qq -c $< $@ | \
+	7z x -so $< $@ | \
 		./clip-$(VARIANT).awk $(addprefix -v ,$(BOUNDS)) | \
 		$(SORT) > $@
 

contours/clip-2009.awk

@@ -1,5 +1,5 @@
-#!/usr/bin/awk -f
-
+#!/usr/bin/env -S awk -f
+#
 # this file works with SEZP from circa 2009, where x coordinate (the 6-digit one)
 # is first, and the field separator is ' ' or more spaces.
 $1 > xmin && $1 < xmax && $2 > ymin && $2 < ymax {

contours/clip-2017.awk

@@ -1,4 +1,4 @@
-#!/usr/bin/awk -f
+#!/usr/bin/env -S awk -f
 #
 # this file works with SEZP circa ~2017 where y coordinate (the 7-digit one) is
 # first, and the field separator is ','

contours/config.mk

@@ -9,5 +9,9 @@
 #VARIANT = 2017
 
 #vienuolio
-BOUNDS = xmin=582874 ymin=6060212 xmax=583246 ymax=6060547
-VARIANT = 2017
+#BOUNDS = xmin=582874 ymin=6060212 xmax=583246 ymax=6060547
+#VARIANT = 2017
+
+#paparciai
+BOUNDS = xmin=545754 ymin=6086394 xmax=550000 ymax=6089022
+VARIANT = 2009

contours/managedb

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 _psql() {
     env \