From ce3b45ddaab7ddc7017fa75dc5de64cd6ca70f93 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Fri, 30 Oct 2026 09:44:43 +0100 Subject: cli: -V flag; restricted export ignores occlusion; web visibility knob - gipfel-cli export-hills gains -V (the visibility/prominence threshold, C default 0.07); default unchanged - export_hill_rows: restricted mode (-e, curated lists like the gipfelweb photo index) no longer drops FLAG_HIDDEN entries. The occlusion heuristic is for thinning the full peak database; a curated photo list should show every entry inside the field of view. Unrestricted export (golden-pinned) unchanged. - gipfelweb Makefile: V ?= 0.05 knob for the peak view, -V 0 for the photo index; per-image %.opts now appended after the standard flags (they were placed before the subcommand and silently ignored) --- examples/Makefile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'examples/Makefile') diff --git a/examples/Makefile b/examples/Makefile index e3befc6..624b464 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -13,11 +13,14 @@ # GIPFEL_CLI path to the gipfel-cli binary # DATA hill database used for the peak view # GIPFEL2HTML html generator script +# V visibility threshold for the peak view (lower shows +# more, distant peaks; C default was 0.07) here := $(dir $(lastword $(MAKEFILE_LIST))) GIPFEL_CLI ?= $(abspath $(here)../target/release/gipfel-cli) DATA ?= $(abspath $(here)../gipfel.dat) GIPFEL2HTML ?= $(here)gipfel2html +V ?= 0.05 images := $(wildcard *.jpg) slides := $(addprefix gipfelweb/slides/, $(images)) @@ -61,17 +64,23 @@ gipfelweb/thumbs/%.jpg: %.jpg gipfelweb/gipfel/%.pos: %.jpg $(GIPFEL_CLI) export-position $< > $@ +# photo cross-links: the position index holds only a handful of +# entries, so disable the prominence filter entirely (-V 0); it is +# meant for the 21k peak database, not for neighbouring photos +# +# per-image %.opts are appended after the standard flags, so they can +# override -d/-V gipfelweb/gipfel/%.imgs: gipfelweb/slides/%.jpg %.opts gipfelweb/gipfel/index.gipfel - $(GIPFEL_CLI) `cat $*.opts` export-hills $< -d $(DATA) -e gipfelweb/gipfel/index.gipfel > $@ + $(GIPFEL_CLI) export-hills $< -d $(DATA) -V 0 -e gipfelweb/gipfel/index.gipfel `cat $*.opts` > $@ gipfelweb/gipfel/%.imgs: gipfelweb/slides/%.jpg gipfelweb/gipfel/index.gipfel - $(GIPFEL_CLI) export-hills $< -d $(DATA) -e gipfelweb/gipfel/index.gipfel > $@ + $(GIPFEL_CLI) export-hills $< -d $(DATA) -V 0 -e gipfelweb/gipfel/index.gipfel > $@ gipfelweb/gipfel/%.hills: gipfelweb/slides/%.jpg %.opts - $(GIPFEL_CLI) `cat $*.opts` export-hills $< -d $(DATA) > $@ + $(GIPFEL_CLI) export-hills $< -d $(DATA) -V $(V) `cat $*.opts` > $@ gipfelweb/gipfel/%.hills: gipfelweb/slides/%.jpg - $(GIPFEL_CLI) export-hills $< -d $(DATA) > $@ + $(GIPFEL_CLI) export-hills $< -d $(DATA) -V $(V) > $@ gipfelweb/gipfel/index.gipfel: $(positions) cat $(positions) > gipfelweb/gipfel/index.gipfel -- cgit v1.2.3