Skip to content

Commit

Permalink
add waterway=boat_lift & refactor how to makes loops
Browse files Browse the repository at this point in the history
  • Loading branch information
amandasaurus committed Jan 7, 2024
1 parent fe4d8d8 commit d4ca1d7
Showing 1 changed file with 22 additions and 3 deletions.
25 changes: 22 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,12 @@ planet-waterway-missing-wiki.geojsons: planet-waterway.osm.pbf
osm-lump-ways -i $< -o tmp.$@ --min-length-m 100 --save-as-linestrings -f waterway -f name -f ∄wikipedia -f ∄wikidata -g name
mv tmp.$@ $@

planet-cycles.geojsons: planet-waterway.osm.pbf
planet-cycles.geojsons planet-upstreams.geojsons planet-ends.geojsons: planet-waterway.osm.pbf
rm -fv tmp.planet-cycles.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,spillway,safe_water,derelict_canal,offshore_field -f waterway∉canal,ditch,drain -f waterway∉put_in,link --openmetrics ./docs/data/waterwaymap.org_loops_metrics.prom --csv-stats-file ./docs/data/waterwaymap.org_loops_stats.csv
mv tmp.planet-cycles.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,spillway,safe_water,derelict_canal,offshore_field,boat_lift -f waterway∉canal,ditch,drain -f waterway∉put_in,link --openmetrics ./docs/data/waterwaymap.org_loops_metrics.prom --csv-stats-file ./docs/data/waterwaymap.org_loops_stats.csv
mv tmp.planet-cycles.geojsons planet-cycles.geojsons
mv tmp.planet-upstreams.geojsons planet-upstreams.geojsons
mv tmp.planet-ends.geojsons planet-ends.geojsons

planet-cycles.pmtiles: planet-cycles.geojsons
rm -fv tmp.$@
Expand All @@ -130,3 +132,20 @@ planet-cycles.pmtiles: planet-cycles.geojsons
--no-progress-indicator \
-o tmp.$@ $<
mv tmp.$@ $@

planet-upstreams.pmtiles: planet-upstreams.geojsons
rm -fv tmp.$@
timeout 8h tippecanoe \
-n "OSM Waterway Upstream" \
-N "Generated on $(shell date -I) from OSM data with $(shell osm-lump-ways --version) and argument" \
-A "© OpenStreetMap. Open Data under ODbL. https://osm.org/copyright" \
-zg \
--no-feature-limit \
--simplification=8 \
--cluster-densest-as-needed \
-y from_upstream_m \
-l upstreams \
--gamma 2 \
--no-progress-indicator \
-o tmp.$@ $<
mv tmp.$@ $@

0 comments on commit d4ca1d7

Please sign in to comment.