route water over waterway=canal if there is also usage=spillway. this…

… is the more common tagging scheme

Makefile

@@ -111,7 +111,7 @@ planet-waterway-missing-wiki.geojsons: planet-waterway.osm.pbf
 
 planet-loops.geojsons planet-upstreams.geojsons planet-ends.geojsons: planet-waterway.osm.pbf
 	rm -fv tmp.planet-{loops,upstreams,ends}.geojsons
-	osm-lump-ways-down -i ./planet-waterway.osm.pbf -o tmp.planet-%s.geojsons -f waterway -f waterway∉dam,weir,lock_gate,sluice_gate,security_lock,fairway,dock,boatyard,fuel,riverbank,pond,check_dam,turning_point,water_point,safe_water,derelict_canal,offshore_field,boat_lift,depth_line,floating_barrier,floodgate -f waterway∉ditch,drain,tidal_channel -f waterway≠canal∨lock=yes -f waterway∉put_in,link -f waterway≠spillway∨area≠yes --openmetrics ./docs/data/waterwaymap.org_loops_metrics.prom --csv-stats-file ./docs/data/waterwaymap.org_loops_stats.csv
+	osm-lump-ways-down -i ./planet-waterway.osm.pbf -o tmp.planet-%s.geojsons -f waterway -f waterway∉dam,weir,lock_gate,sluice_gate,security_lock,fairway,dock,boatyard,fuel,riverbank,pond,check_dam,turning_point,water_point,safe_water,derelict_canal,offshore_field,boat_lift,depth_line,floating_barrier,floodgate -f waterway∉ditch,drain,tidal_channel -f waterway≠canal∨lock=yes -f waterway∉put_in,link -f waterway≠spillway∨area≠yes -f waterway≠canal∨usage=spillway --openmetrics ./docs/data/waterwaymap.org_loops_metrics.prom --csv-stats-file ./docs/data/waterwaymap.org_loops_stats.csv
 	mv tmp.planet-loops.geojsons planet-loops.geojsons
 	mv tmp.planet-upstreams.geojsons planet-upstreams.geojsons || true
 	mv tmp.planet-ends.geojsons planet-ends.geojsons || true