From acd22ac3f2740d075806845805a5b26490ca4c3b Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 15:46:06 +0100 Subject: web: commit built static site under dist/wipfel/ The flpsed.org site is generated statically; keeping the deployable bundle in the tree lets the site pipeline pick it up directly. Regenerate with crates/wipfel/build-release.sh. --- dist/wipfel/gipfel.dat.gz | Bin 0 -> 346448 bytes dist/wipfel/index.html | 15 + dist/wipfel/style.css | 270 ++++++++++++ dist/wipfel/wipfel.js | 1010 ++++++++++++++++++++++++++++++++++++++++++++ dist/wipfel/wipfel_bg.wasm | Bin 0 -> 507419 bytes 5 files changed, 1295 insertions(+) create mode 100644 dist/wipfel/gipfel.dat.gz create mode 100644 dist/wipfel/index.html create mode 100644 dist/wipfel/style.css create mode 100644 dist/wipfel/wipfel.js create mode 100644 dist/wipfel/wipfel_bg.wasm (limited to 'dist') diff --git a/dist/wipfel/gipfel.dat.gz b/dist/wipfel/gipfel.dat.gz new file mode 100644 index 0000000..94742bb Binary files /dev/null and b/dist/wipfel/gipfel.dat.gz differ diff --git a/dist/wipfel/index.html b/dist/wipfel/index.html new file mode 100644 index 0000000..5297a72 --- /dev/null +++ b/dist/wipfel/index.html @@ -0,0 +1,15 @@ + + + + + + wipfel — web based gipfel photogrammetry + + + + + + diff --git a/dist/wipfel/style.css b/dist/wipfel/style.css new file mode 100644 index 0000000..d706a8d --- /dev/null +++ b/dist/wipfel/style.css @@ -0,0 +1,270 @@ +* { + box-sizing: border-box; +} +html, +body { + margin: 0; + height: 100%; + font-family: system-ui, sans-serif; +} +.app { + display: flex; + height: 100vh; + background: #101014; + color: #e8e8ea; +} +.sidebar { + width: 300px; + padding: 16px; + background: #1a1a20; + border-right: 1px solid #2c2c34; + display: flex; + flex-direction: column; + gap: 8px; + overflow-y: auto; + position: relative; +} +.sidebar.collapsed { + display: none; +} +.sidebar .collapse-btn { + position: absolute; + top: 10px; + right: 10px; + width: 28px; + height: 28px; + padding: 0; + background: #2c2c34; + font-size: 12px; + border-radius: 5px; +} +.sidebar .collapse-btn:hover { + background: #3b3b46; +} +.nav-toggle { + position: absolute; + top: 10px; + left: 10px; + z-index: 5; + width: 36px; + height: 36px; + padding: 0; + background: rgba(26, 26, 32, 0.85); + color: #e8e8ea; + border: 1px solid #2c2c34; + border-radius: 6px; + font-size: 16px; + cursor: pointer; +} +.nav-toggle:hover { + background: rgba(59, 111, 212, 0.9); +} +.sidebar h1 { + margin: 0; + font-size: 22px; +} +.tag { + margin: 0 0 12px; + color: #8a8a94; + font-size: 12px; + text-transform: uppercase; + letter-spacing: 1px; +} +.moreinfo { + color: #7fa5e8; + font-size: 12px; + text-decoration: none; + margin-top: -6px; +} +.moreinfo:hover { + text-decoration: underline; +} +.sidebar button { + padding: 8px 12px; + background: #3b6fd4; + color: #fff; + border: 0; + border-radius: 6px; + font-size: 14px; + cursor: pointer; +} +.sidebar button:hover { + background: #4a7ee4; +} +.status { + font-size: 13px; + color: #c8c8d0; + word-break: break-word; +} +.hint { + font-size: 12px; + color: #8a8a94; +} +.row { + display: flex; + gap: 6px; + align-items: center; + font-size: 13px; + cursor: pointer; +} +.fitinfo { + font-size: 12px; + color: #9fd09f; + font-variant-numeric: tabular-nums; +} +.hover { + font-size: 14px; + font-weight: 600; + color: #ffffff; +} +.dim { + opacity: 0.6; +} +.hidden-file { + display: none; +} +/* pin the optional track section to the bottom of the control pane */ +.track-section { + margin-top: auto; +} +.main { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; +} +.canvaswrap { + flex: 1; + position: relative; + min-height: 0; +} +canvas.viewport { + position: absolute; + inset: 0; + width: 100%; + height: 100%; + display: block; + touch-action: none; + cursor: grab; +} +canvas.compass { + display: block; + width: 100%; + touch-action: none; + cursor: ew-resize; +} +.section { + margin-top: 14px; + font-size: 11px; + text-transform: uppercase; + letter-spacing: 1px; + color: #8a8a94; + border-bottom: 1px solid #2c2c34; + padding-bottom: 3px; +} +.slider { + display: flex; + flex-direction: column; + gap: 2px; + margin-top: 8px; +} +.sliderhead { + display: flex; + justify-content: space-between; + font-size: 12px; + color: #c8c8d0; +} +.slider input[type="range"] { + width: 100%; +} +.numrow { + display: flex; + justify-content: space-between; + align-items: center; + gap: 8px; + font-size: 13px; + margin-top: 6px; +} +.numrow input { + width: 130px; + padding: 4px 6px; + background: #24242c; + color: #e8e8ea; + border: 1px solid #34343e; + border-radius: 4px; +} +.fpbackdrop { + position: absolute; + inset: 0; + z-index: 9; +} +.findpeak { + position: absolute; + z-index: 10; + width: 280px; + background: #1e1e26; + border: 1px solid #3a3a46; + border-radius: 6px; + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.5); + display: flex; + flex-direction: column; +} +.fpsearch { + padding: 8px; + border-bottom: 1px solid #2c2c34; +} +.fpsearch input { + width: 100%; + padding: 5px 8px; + background: #24242c; + border: 1px solid #3a3a46; + border-radius: 4px; + color: #e8e8ea; + font-size: 13px; +} +.fplist { + max-height: 320px; + overflow-y: auto; +} +.fpempty { + padding: 8px 10px; + font-size: 13px; + color: #8a8a94; + margin: 0; +} +.fpfoot { + padding: 6px 8px; + border-top: 1px solid #2c2c34; + text-align: right; +} +.fpcancel { + padding: 4px 12px; + background: #34343e; + color: #e8e8ea; + border: 0; + border-radius: 4px; + font-size: 12px; + cursor: pointer; +} +.fphead { + padding: 6px 10px; + font-size: 11px; + text-transform: uppercase; + letter-spacing: 1px; + color: #8a8a94; + border-bottom: 1px solid #2c2c34; +} +.fpitem { + display: block; + width: 100%; + text-align: left; + padding: 6px 10px; + background: none; + border: 0; + color: #e8e8ea; + font-size: 13px; + cursor: pointer; +} +.fpitem:hover { + background: #2f6fd4; +} diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js new file mode 100644 index 0000000..9119aea --- /dev/null +++ b/dist/wipfel/wipfel.js @@ -0,0 +1,1010 @@ +/* @ts-self-types="./wipfel.d.ts" */ +function __wbg_get_imports() { + const import0 = { + __proto__: null, + __wbg___wbindgen_debug_string_4687d8d8c2017d52: function(arg0, arg1) { + const ret = debugString(arg1); + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }, + __wbg___wbindgen_is_function_1f9d30630b8b1d3d: function(arg0) { + const ret = typeof(arg0) === 'function'; + return ret; + }, + __wbg___wbindgen_is_undefined_8865fb403f8fe9d8: function(arg0) { + const ret = arg0 === undefined; + return ret; + }, + __wbg___wbindgen_number_get_2e0e7dee9f701a71: function(arg0, arg1) { + const obj = arg1; + const ret = typeof(obj) === 'number' ? obj : undefined; + getDataViewMemory0().setFloat64(arg0 + 8 * 1, isLikeNone(ret) ? 0 : ret, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, !isLikeNone(ret), true); + }, + __wbg___wbindgen_throw_41e9ee4f547fc59a: function(arg0, arg1) { + throw new Error(getStringFromWasm0(arg0, arg1)); + }, + __wbg__wbg_cb_unref_dcc1a90847f04c41: function(arg0) { + arg0._wbg_cb_unref(); + }, + __wbg_addEventListener_4d0db17c671ea324: function() { return handleError(function (arg0, arg1, arg2, arg3) { + arg0.addEventListener(getStringFromWasm0(arg1, arg2), arg3); + }, arguments); }, + __wbg_addEventListener_8d3235978b9c69a8: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + arg0.addEventListener(getStringFromWasm0(arg1, arg2), arg3, arg4); + }, arguments); }, + __wbg_arc_03f7717b2e38682a: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5) { + arg0.arc(arg1, arg2, arg3, arg4, arg5); + }, arguments); }, + __wbg_arrayBuffer_0fe6e1300abcf908: function(arg0) { + const ret = arg0.arrayBuffer(); + return ret; + }, + __wbg_arrayBuffer_f07be74819944ea2: function() { return handleError(function (arg0) { + const ret = arg0.arrayBuffer(); + return ret; + }, arguments); }, + __wbg_beginPath_8598d895c13f1c86: function(arg0) { + arg0.beginPath(); + }, + __wbg_body_e549239eaff082e1: function(arg0) { + const ret = arg0.body; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_bubbles_90592d3579b278ea: function(arg0) { + const ret = arg0.bubbles; + return ret; + }, + __wbg_buffer_56ec2905a66f58b9: function(arg0) { + const ret = arg0.buffer; + return ret; + }, + __wbg_cache_key_21c521bc3dd66e9b: function(arg0) { + const ret = arg0.__yew_subtree_cache_key; + return isLikeNone(ret) ? Number.MAX_SAFE_INTEGER : (ret) >>> 0; + }, + __wbg_cancelBubble_317b9e84df6f26ee: function(arg0) { + const ret = arg0.cancelBubble; + return ret; + }, + __wbg_checked_dfbd69c1f78ce37d: function(arg0) { + const ret = arg0.checked; + return ret; + }, + __wbg_childNodes_9542af79c583ae90: function(arg0) { + const ret = arg0.childNodes; + return ret; + }, + __wbg_click_d990e70c576b7c54: function(arg0) { + arg0.click(); + }, + __wbg_clientHeight_33dd2a2c8630a1f1: function(arg0) { + const ret = arg0.clientHeight; + return ret; + }, + __wbg_clientWidth_08d5512595aacb73: function(arg0) { + const ret = arg0.clientWidth; + return ret; + }, + __wbg_clientX_5075231ed45e8ef5: function(arg0) { + const ret = arg0.clientX; + return ret; + }, + __wbg_clientY_846c39814ce02ab2: function(arg0) { + const ret = arg0.clientY; + return ret; + }, + __wbg_cloneNode_a3ed8db010540e0d: function() { return handleError(function (arg0) { + const ret = arg0.cloneNode(); + return ret; + }, arguments); }, + __wbg_closePath_355eb6da179dd9c2: function(arg0) { + arg0.closePath(); + }, + __wbg_composedPath_ebbc1f73360cd735: function(arg0) { + const ret = arg0.composedPath(); + return ret; + }, + __wbg_createElementNS_957ec8b66176901e: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + const ret = arg0.createElementNS(arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); + return ret; + }, arguments); }, + __wbg_createElement_74049073a11f9c31: function() { return handleError(function (arg0, arg1, arg2) { + const ret = arg0.createElement(getStringFromWasm0(arg1, arg2)); + return ret; + }, arguments); }, + __wbg_createImageBitmap_1a53b9fe15f242e6: function() { return handleError(function (arg0, arg1) { + const ret = arg0.createImageBitmap(arg1); + return ret; + }, arguments); }, + __wbg_createTextNode_561b59dda21e4ea7: function(arg0, arg1, arg2) { + const ret = arg0.createTextNode(getStringFromWasm0(arg1, arg2)); + return ret; + }, + __wbg_dataTransfer_afa27477f2f9e0e6: function(arg0) { + const ret = arg0.dataTransfer; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_deltaY_7abc8fc9878d0002: function(arg0) { + const ret = arg0.deltaY; + return ret; + }, + __wbg_devicePixelRatio_7d39e9af5448d3d4: function(arg0) { + const ret = arg0.devicePixelRatio; + return ret; + }, + __wbg_document_9854e03c05fc8834: function(arg0) { + const ret = arg0.document; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_drawImage_8dc81ba1e3ffae74: function() { return handleError(function (arg0, arg1, arg2, arg3) { + arg0.drawImage(arg1, arg2, arg3); + }, arguments); }, + __wbg_error_757e9472f8410341: function(arg0, arg1) { + let deferred0_0; + let deferred0_1; + try { + deferred0_0 = arg0; + deferred0_1 = arg1; + console.error(getStringFromWasm0(arg0, arg1)); + } finally { + wasm.__wbindgen_free(deferred0_0, deferred0_1, 1); + } + }, + __wbg_error_b1df75078f69c897: function(arg0, arg1) { + var v0 = getArrayJsValueFromWasm0(arg0, arg1); + wasm.__wbindgen_free(arg0, arg1 * 4, 4); + console.error(...(v0)); + }, + __wbg_fetch_4178962c570137ca: function(arg0, arg1, arg2) { + const ret = arg0.fetch(getStringFromWasm0(arg1, arg2)); + return ret; + }, + __wbg_files_cb1ce1b82f16c484: function(arg0) { + const ret = arg0.files; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_files_fe03006f0ba1a5f0: function(arg0) { + const ret = arg0.files; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_fillRect_0ef59adb9acb7d06: function(arg0, arg1, arg2, arg3, arg4) { + arg0.fillRect(arg1, arg2, arg3, arg4); + }, + __wbg_fillText_1bcec8b81ad73bd0: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + arg0.fillText(getStringFromWasm0(arg1, arg2), arg3, arg4); + }, arguments); }, + __wbg_fill_fc5e02a06cc26e92: function(arg0) { + arg0.fill(); + }, + __wbg_focus_f740d61348f422e7: function() { return handleError(function (arg0) { + arg0.focus(); + }, arguments); }, + __wbg_from_296ca31f8d0f1c52: function(arg0) { + const ret = Array.from(arg0); + return ret; + }, + __wbg_getBoundingClientRect_57152b1a20f3de34: function(arg0) { + const ret = arg0.getBoundingClientRect(); + return ret; + }, + __wbg_getContext_635e36719cad2623: function() { return handleError(function (arg0, arg1, arg2) { + const ret = arg0.getContext(getStringFromWasm0(arg1, arg2)); + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, arguments); }, + __wbg_get_6c896e0571ddae51: function(arg0, arg1) { + const ret = arg0[arg1 >>> 0]; + return ret; + }, + __wbg_height_9dca4d43c3e4b84b: function(arg0) { + const ret = arg0.height; + return ret; + }, + __wbg_height_fc97e1a0c2e7331f: function(arg0) { + const ret = arg0.height; + return ret; + }, + __wbg_host_c1e5897b2ece281c: function(arg0) { + const ret = arg0.host; + return ret; + }, + __wbg_innerWidth_1bc526614080537c: function() { return handleError(function (arg0) { + const ret = arg0.innerWidth; + return ret; + }, arguments); }, + __wbg_insertBefore_f1ba67809033f6b1: function() { return handleError(function (arg0, arg1, arg2) { + const ret = arg0.insertBefore(arg1, arg2); + return ret; + }, arguments); }, + __wbg_instanceof_CanvasRenderingContext2d_769208c72dcbf5e6: function(arg0) { + let result; + try { + result = arg0 instanceof CanvasRenderingContext2D; + } catch (_) { + result = false; + } + const ret = result; + return ret; + }, + __wbg_instanceof_Element_818e11074cdb63b5: function(arg0) { + let result; + try { + result = arg0 instanceof Element; + } catch (_) { + result = false; + } + const ret = result; + return ret; + }, + __wbg_instanceof_ImageBitmap_74bea45ee48d3d7a: function(arg0) { + let result; + try { + result = arg0 instanceof ImageBitmap; + } catch (_) { + result = false; + } + const ret = result; + return ret; + }, + __wbg_instanceof_Response_b8758567269c30b2: function(arg0) { + let result; + try { + result = arg0 instanceof Response; + } catch (_) { + result = false; + } + const ret = result; + return ret; + }, + __wbg_instanceof_ShadowRoot_0ef114d846d9fd90: function(arg0) { + let result; + try { + result = arg0 instanceof ShadowRoot; + } catch (_) { + result = false; + } + const ret = result; + return ret; + }, + __wbg_instanceof_Window_82d71df4eddf88bc: function(arg0) { + let result; + try { + result = arg0 instanceof Window; + } catch (_) { + result = false; + } + const ret = result; + return ret; + }, + __wbg_is_4b278c0bd3caba97: function(arg0, arg1) { + const ret = Object.is(arg0, arg1); + return ret; + }, + __wbg_item_2aa1ff983eca77b6: function(arg0, arg1) { + const ret = arg0.item(arg1 >>> 0); + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_lastChild_bca1746658aaee75: function(arg0) { + const ret = arg0.lastChild; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_left_e0a244490fe2f293: function(arg0) { + const ret = arg0.left; + return ret; + }, + __wbg_length_7f3c00c40364105e: function(arg0) { + const ret = arg0.length; + return ret; + }, + __wbg_length_d4bdea10311bd9cf: function(arg0) { + const ret = arg0.length; + return ret; + }, + __wbg_lineTo_63fac7d60279d95e: function(arg0, arg1, arg2) { + arg0.lineTo(arg1, arg2); + }, + __wbg_listener_id_51707c1ea7d7f75c: function(arg0) { + const ret = arg0.__yew_listener_id; + return isLikeNone(ret) ? Number.MAX_SAFE_INTEGER : (ret) >>> 0; + }, + __wbg_measureText_1035b288be51876c: function() { return handleError(function (arg0, arg1, arg2) { + const ret = arg0.measureText(getStringFromWasm0(arg1, arg2)); + return ret; + }, arguments); }, + __wbg_moveTo_037e3deefec91ae1: function(arg0, arg1, arg2) { + arg0.moveTo(arg1, arg2); + }, + __wbg_name_06fefa2542c6ce51: function(arg0, arg1) { + const ret = arg1.name; + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }, + __wbg_namespaceURI_67f6d39f1a689250: function(arg0, arg1) { + const ret = arg1.namespaceURI; + var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }, + __wbg_new_1a8d2827bd9e1a2e: function() { return handleError(function (arg0) { + const ret = new ResizeObserver(arg0); + return ret; + }, arguments); }, + __wbg_new_1dbf7428bba60a42: function(arg0) { + const ret = new Uint8Array(arg0); + return ret; + }, + __wbg_new_227d7c05414eb861: function() { + const ret = new Error(); + return ret; + }, + __wbg_new_5502aad30c185fc8: function(arg0, arg1) { + try { + var state0 = {a: arg0, b: arg1}; + var cb0 = (arg0, arg1) => { + const a = state0.a; + state0.a = 0; + try { + return wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Function_fn_wasm_bindgen_f1f668f83a5f514b___JsValue_____wasm_bindgen_f1f668f83a5f514b___sys__Undefined___js_sys_351dd7d36d5f7033___Function_fn_wasm_bindgen_f1f668f83a5f514b___JsValue_____wasm_bindgen_f1f668f83a5f514b___sys__Undefined_______true_(a, state0.b, arg0, arg1); + } finally { + state0.a = a; + } + }; + const ret = new Promise(cb0); + return ret; + } finally { + state0.a = 0; + } + }, + __wbg_new_617a8cdb8bb1130e: function() { + const ret = new Object(); + return ret; + }, + __wbg_new_9b0b9983fca2c716: function() { return handleError(function (arg0, arg1) { + const ret = new MouseEvent(getStringFromWasm0(arg0, arg1)); + return ret; + }, arguments); }, + __wbg_new_ee2291f50781bf1d: function() { + const ret = new Array(); + return ret; + }, + __wbg_new_from_slice_9a868026ffa4208a: function(arg0, arg1) { + const ret = new Uint8Array(getArrayU8FromWasm0(arg0, arg1)); + return ret; + }, + __wbg_new_with_u8_array_sequence_f380e3e783ae5617: function() { return handleError(function (arg0) { + const ret = new Blob(arg0); + return ret; + }, arguments); }, + __wbg_nextSibling_e5ecc9bf11c2365d: function(arg0) { + const ret = arg0.nextSibling; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_observe_fa02ec4710cff1db: function(arg0, arg1) { + arg0.observe(arg1); + }, + __wbg_ok_125878a7db256ecb: function(arg0) { + const ret = arg0.ok; + return ret; + }, + __wbg_parentElement_108b58de82cab63f: function(arg0) { + const ret = arg0.parentElement; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_parentNode_32afd0d7ad7dca98: function(arg0) { + const ret = arg0.parentNode; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_pointerId_1b91f6b6c8f92501: function(arg0) { + const ret = arg0.pointerId; + return ret; + }, + __wbg_preventDefault_af59afb0f0a02e20: function(arg0) { + arg0.preventDefault(); + }, + __wbg_prototypesetcall_bc27214492979395: function(arg0, arg1, arg2) { + Uint8Array.prototype.set.call(getArrayU8FromWasm0(arg0, arg1), arg2); + }, + __wbg_push_2baf45db356cf468: function(arg0, arg1) { + const ret = arg0.push(arg1); + return ret; + }, + __wbg_queueMicrotask_9833f9a49df95a49: function(arg0) { + const ret = arg0.queueMicrotask; + return ret; + }, + __wbg_queueMicrotask_a72f977e97f23c5f: function(arg0) { + queueMicrotask(arg0); + }, + __wbg_releasePointerCapture_46ff9901159af8ef: function() { return handleError(function (arg0, arg1) { + arg0.releasePointerCapture(arg1); + }, arguments); }, + __wbg_removeAttribute_2f2700a6f933a6be: function() { return handleError(function (arg0, arg1, arg2) { + arg0.removeAttribute(getStringFromWasm0(arg1, arg2)); + }, arguments); }, + __wbg_removeChild_3745fc2545da50fa: function() { return handleError(function (arg0, arg1) { + const ret = arg0.removeChild(arg1); + return ret; + }, arguments); }, + __wbg_resolve_0076e10020304ede: function(arg0) { + const ret = Promise.resolve(arg0); + return ret; + }, + __wbg_setAttribute_9e7d603908f63705: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + arg0.setAttribute(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); + }, arguments); }, + __wbg_setPointerCapture_a53e23b7bccef290: function() { return handleError(function (arg0, arg1) { + arg0.setPointerCapture(arg1); + }, arguments); }, + __wbg_setTimeout_db7bbc18a17e152a: function() { return handleError(function (arg0, arg1, arg2) { + const ret = arg0.setTimeout(arg1, arg2); + return ret; + }, arguments); }, + __wbg_setTransform_fa787a8f0adc1ade: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6) { + arg0.setTransform(arg1, arg2, arg3, arg4, arg5, arg6); + }, arguments); }, + __wbg_set_145a351398b48c65: function() { return handleError(function (arg0, arg1, arg2) { + const ret = Reflect.set(arg0, arg1, arg2); + return ret; + }, arguments); }, + __wbg_set_cache_key_274f2145fcb4390c: function(arg0, arg1) { + arg0.__yew_subtree_cache_key = arg1 >>> 0; + }, + __wbg_set_capture_5beff5b8a7562085: function(arg0, arg1) { + arg0.capture = arg1 !== 0; + }, + __wbg_set_checked_2ae6d148d8f3e080: function(arg0, arg1) { + arg0.checked = arg1 !== 0; + }, + __wbg_set_fillStyle_27f88552f4d2ab31: function(arg0, arg1) { + arg0.fillStyle = arg1; + }, + __wbg_set_font_1f60a05a2544a2ff: function(arg0, arg1, arg2) { + arg0.font = getStringFromWasm0(arg1, arg2); + }, + __wbg_set_height_c9789c1c77eaedff: function(arg0, arg1) { + arg0.height = arg1 >>> 0; + }, + __wbg_set_innerHTML_7af59a832a09a074: function(arg0, arg1, arg2) { + arg0.innerHTML = getStringFromWasm0(arg1, arg2); + }, + __wbg_set_lineCap_c9b7bdd3b7f5ce74: function(arg0, arg1, arg2) { + arg0.lineCap = getStringFromWasm0(arg1, arg2); + }, + __wbg_set_lineWidth_cc15473552c60c9c: function(arg0, arg1) { + arg0.lineWidth = arg1; + }, + __wbg_set_listener_id_3046a6d6a2394ad9: function(arg0, arg1) { + arg0.__yew_listener_id = arg1 >>> 0; + }, + __wbg_set_nodeValue_e265de7160527936: function(arg0, arg1, arg2) { + arg0.nodeValue = arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2); + }, + __wbg_set_passive_31e9f895d2ac0046: function(arg0, arg1) { + arg0.passive = arg1 !== 0; + }, + __wbg_set_strokeStyle_a36f39be93a6cebc: function(arg0, arg1) { + arg0.strokeStyle = arg1; + }, + __wbg_set_subtree_id_fc80ace73ff247a7: function(arg0, arg1) { + arg0.__yew_subtree_id = arg1 >>> 0; + }, + __wbg_set_textAlign_1bda1733d57574ed: function(arg0, arg1, arg2) { + arg0.textAlign = getStringFromWasm0(arg1, arg2); + }, + __wbg_set_value_f5c1ffc19bac3037: function(arg0, arg1, arg2) { + arg0.value = getStringFromWasm0(arg1, arg2); + }, + __wbg_set_value_fbd659f94bfb9181: function(arg0, arg1, arg2) { + arg0.value = getStringFromWasm0(arg1, arg2); + }, + __wbg_set_width_b0e1267db4b196b5: function(arg0, arg1) { + arg0.width = arg1 >>> 0; + }, + __wbg_slice_6da4cdc5d543fcd0: function(arg0, arg1) { + const ret = arg1.slice(); + const ptr1 = passArrayJsValueToWasm0(ret, wasm.__wbindgen_malloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }, + __wbg_stack_3b0d974bbf31e44f: function(arg0, arg1) { + const ret = arg1.stack; + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }, + __wbg_static_accessor_GLOBAL_266715b9d96ba635: function() { + const ret = typeof global === 'undefined' ? null : global; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_static_accessor_GLOBAL_THIS_10fb7dc1ae063179: function() { + const ret = typeof globalThis === 'undefined' ? null : globalThis; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_static_accessor_SELF_0b583911f537483a: function() { + const ret = typeof self === 'undefined' ? null : self; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_static_accessor_WINDOW_d7f903d1508cbdc4: function() { + const ret = typeof window === 'undefined' ? null : window; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_status_ce0a98d3c57125f3: function(arg0) { + const ret = arg0.status; + return ret; + }, + __wbg_stroke_385d731098398489: function(arg0) { + arg0.stroke(); + }, + __wbg_subtree_id_6a3200546ad613b1: function(arg0) { + const ret = arg0.__yew_subtree_id; + return isLikeNone(ret) ? Number.MAX_SAFE_INTEGER : (ret) >>> 0; + }, + __wbg_target_38ae9feb025b820c: function(arg0) { + const ret = arg0.target; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, + __wbg_then_c949d5a25a4e78f8: function(arg0, arg1, arg2) { + const ret = arg0.then(arg1, arg2); + return ret; + }, + __wbg_then_e71170d78fcf8954: function(arg0, arg1) { + const ret = arg0.then(arg1); + return ret; + }, + __wbg_top_ff4627294d2cdeb8: function(arg0) { + const ret = arg0.top; + return ret; + }, + __wbg_value_05305a761dfa3e0e: function(arg0, arg1) { + const ret = arg1.value; + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }, + __wbg_value_50394658c248d9c1: function(arg0, arg1) { + const ret = arg1.value; + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }, + __wbg_width_3d0dce3d9892e35e: function(arg0) { + const ret = arg0.width; + return ret; + }, + __wbg_width_8a9cc26363f10d5f: function(arg0) { + const ret = arg0.width; + return ret; + }, + __wbg_width_e95ad291d52fe17e: function(arg0) { + const ret = arg0.width; + return ret; + }, + __wbindgen_generic_0000000000000001: function(arg0, arg1) { + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 47, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`. + const ret = makeMutClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___wasm_bindgen_f1f668f83a5f514b___JsValue__core_37ee0ce0c4cd57d5___result__Result_____wasm_bindgen_f1f668f83a5f514b___JsError___true_); + return ret; + }, + __wbindgen_generic_0000000000000002: function(arg0, arg1) { + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); + return ret; + }, + __wbindgen_generic_0000000000000003: function(arg0, arg1) { + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Ref(NamedExternref("Event"))], shim_idx: 90, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures________invoke___web_sys_d6718dd818f67bd6___features__gen_Event__Event______true_); + return ret; + }, + __wbindgen_generic_0000000000000004: function(arg0, arg1) { + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 76, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); + return ret; + }, + __wbindgen_generic_0000000000000005: function(arg0, arg1) { + // Cast intrinsic for `Ref(String) -> Externref`. + const ret = getStringFromWasm0(arg0, arg1); + return ret; + }, + __wbindgen_init_externref_table: function() { + const table = wasm.__wbindgen_externrefs; + const offset = table.grow(4); + table.set(0, undefined); + table.set(offset + 0, undefined); + table.set(offset + 1, null); + table.set(offset + 2, true); + table.set(offset + 3, false); + }, + }; + return { + __proto__: null, + "./wipfel_bg.js": import0, + }; +} + +function wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_(arg0, arg1) { + wasm.wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_(arg0, arg1); +} + +function wasm_bindgen_f1f668f83a5f514b___convert__closures________invoke___web_sys_d6718dd818f67bd6___features__gen_Event__Event______true_(arg0, arg1, arg2) { + wasm.wasm_bindgen_f1f668f83a5f514b___convert__closures________invoke___web_sys_d6718dd818f67bd6___features__gen_Event__Event______true_(arg0, arg1, arg2); +} + +function wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___wasm_bindgen_f1f668f83a5f514b___JsValue__core_37ee0ce0c4cd57d5___result__Result_____wasm_bindgen_f1f668f83a5f514b___JsError___true_(arg0, arg1, arg2) { + const ret = wasm.wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___wasm_bindgen_f1f668f83a5f514b___JsValue__core_37ee0ce0c4cd57d5___result__Result_____wasm_bindgen_f1f668f83a5f514b___JsError___true_(arg0, arg1, arg2); + if (ret[1]) { + throw takeFromExternrefTable0(ret[0]); + } +} + +function wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Function_fn_wasm_bindgen_f1f668f83a5f514b___JsValue_____wasm_bindgen_f1f668f83a5f514b___sys__Undefined___js_sys_351dd7d36d5f7033___Function_fn_wasm_bindgen_f1f668f83a5f514b___JsValue_____wasm_bindgen_f1f668f83a5f514b___sys__Undefined_______true_(arg0, arg1, arg2, arg3) { + wasm.wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Function_fn_wasm_bindgen_f1f668f83a5f514b___JsValue_____wasm_bindgen_f1f668f83a5f514b___sys__Undefined___js_sys_351dd7d36d5f7033___Function_fn_wasm_bindgen_f1f668f83a5f514b___JsValue_____wasm_bindgen_f1f668f83a5f514b___sys__Undefined_______true_(arg0, arg1, arg2, arg3); +} + +function wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_(arg0, arg1, arg2, arg3) { + wasm.wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_(arg0, arg1, arg2, arg3); +} + +function addToExternrefTable0(obj) { + const idx = wasm.__externref_table_alloc(); + wasm.__wbindgen_externrefs.set(idx, obj); + return idx; +} + +const CLOSURE_DTORS = (typeof FinalizationRegistry === 'undefined') + ? { register: () => {}, unregister: () => {} } + : new FinalizationRegistry(state => wasm.__wbindgen_destroy_closure(state.a, state.b)); + +function debugString(val) { + // primitive types + const type = typeof val; + if (type == 'number' || type == 'boolean' || val == null) { + return `${val}`; + } + if (type == 'string') { + return `"${val}"`; + } + if (type == 'symbol') { + const description = val.description; + if (description == null) { + return 'Symbol'; + } else { + return `Symbol(${description})`; + } + } + if (type == 'function') { + const name = val.name; + if (typeof name == 'string' && name.length > 0) { + return `Function(${name})`; + } else { + return 'Function'; + } + } + // objects + if (Array.isArray(val)) { + const length = val.length; + let debug = '['; + if (length > 0) { + debug += debugString(val[0]); + } + for(let i = 1; i < length; i++) { + debug += ', ' + debugString(val[i]); + } + debug += ']'; + return debug; + } + // Test for built-in + const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val)); + let className; + if (builtInMatches && builtInMatches.length > 1) { + className = builtInMatches[1]; + } else { + // Failed to match the standard '[object ClassName]' + return toString.call(val); + } + if (className == 'Object') { + // we're a user defined class or Object + // JSON.stringify avoids problems with cycles, and is generally much + // easier than looping through ownProperties of `val`. + try { + return 'Object(' + JSON.stringify(val) + ')'; + } catch (_) { + return 'Object'; + } + } + // errors + if (val instanceof Error) { + return `${val.name}: ${val.message}\n${val.stack}`; + } + // TODO we could test for more things here, like `Set`s and `Map`s. + return className; +} + +function getArrayJsValueFromWasm0(ptr, len) { + ptr = ptr >>> 0; + const mem = getDataViewMemory0(); + const result = []; + for (let i = ptr; i < ptr + 4 * len; i += 4) { + result.push(wasm.__wbindgen_externrefs.get(mem.getUint32(i, true))); + } + wasm.__externref_drop_slice(ptr, len); + return result; +} + +function getArrayU8FromWasm0(ptr, len) { + ptr = ptr >>> 0; + return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len); +} + +let cachedDataViewMemory0 = null; +function getDataViewMemory0() { + if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) { + cachedDataViewMemory0 = new DataView(wasm.memory.buffer); + } + return cachedDataViewMemory0; +} + +function getStringFromWasm0(ptr, len) { + return decodeText(ptr >>> 0, len); +} + +let cachedUint8ArrayMemory0 = null; +function getUint8ArrayMemory0() { + if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) { + cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer); + } + return cachedUint8ArrayMemory0; +} + +function handleError(f, args) { + try { + return f.apply(this, args); + } catch (e) { + const idx = addToExternrefTable0(e); + wasm.__wbindgen_exn_store(idx); + } +} + +function isLikeNone(x) { + return x === undefined || x === null; +} + +function makeClosure(arg0, arg1, f) { + const state = { a: arg0, b: arg1, cnt: 1 }; + const real = (...args) => { + + // First up with a closure we increment the internal reference + // count. This ensures that the Rust closure environment won't + // be deallocated while we're invoking it. + state.cnt++; + try { + return f(state.a, state.b, ...args); + } finally { + real._wbg_cb_unref(); + } + }; + real._wbg_cb_unref = () => { + if (--state.cnt === 0) { + wasm.__wbindgen_destroy_closure(state.a, state.b); + state.a = 0; + CLOSURE_DTORS.unregister(state); + } + }; + CLOSURE_DTORS.register(real, state, state); + return real; +} + +function makeMutClosure(arg0, arg1, f) { + const state = { a: arg0, b: arg1, cnt: 1 }; + const real = (...args) => { + + // First up with a closure we increment the internal reference + // count. This ensures that the Rust closure environment won't + // be deallocated while we're invoking it. + state.cnt++; + const a = state.a; + state.a = 0; + try { + return f(a, state.b, ...args); + } finally { + state.a = a; + real._wbg_cb_unref(); + } + }; + real._wbg_cb_unref = () => { + if (--state.cnt === 0) { + wasm.__wbindgen_destroy_closure(state.a, state.b); + state.a = 0; + CLOSURE_DTORS.unregister(state); + } + }; + CLOSURE_DTORS.register(real, state, state); + return real; +} + +function passArrayJsValueToWasm0(array, malloc) { + const ptr = malloc(array.length * 4, 4) >>> 0; + for (let i = 0; i < array.length; i++) { + const add = addToExternrefTable0(array[i]); + getDataViewMemory0().setUint32(ptr + 4 * i, add, true); + } + WASM_VECTOR_LEN = array.length; + return ptr; +} + +function passStringToWasm0(arg, malloc, realloc) { + if (realloc === undefined) { + const buf = cachedTextEncoder.encode(arg); + const ptr = malloc(buf.length, 1) >>> 0; + getUint8ArrayMemory0().subarray(ptr, ptr + buf.length).set(buf); + WASM_VECTOR_LEN = buf.length; + return ptr; + } + + let len = arg.length; + let ptr = malloc(len, 1) >>> 0; + + const mem = getUint8ArrayMemory0(); + + let offset = 0; + + for (; offset < len; offset++) { + const code = arg.charCodeAt(offset); + if (code > 0x7F) break; + mem[ptr + offset] = code; + } + if (offset !== len) { + if (offset !== 0) { + arg = arg.slice(offset); + } + ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0; + const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len); + const ret = cachedTextEncoder.encodeInto(arg, view); + + offset += ret.written; + ptr = realloc(ptr, len, offset, 1) >>> 0; + } + + WASM_VECTOR_LEN = offset; + return ptr; +} + +function takeFromExternrefTable0(idx) { + const value = wasm.__wbindgen_externrefs.get(idx); + wasm.__externref_table_dealloc(idx); + return value; +} + +let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); +cachedTextDecoder.decode(); +const MAX_SAFARI_DECODE_BYTES = 2146435072; +let numBytesDecoded = 0; +function decodeText(ptr, len) { + numBytesDecoded += len; + if (numBytesDecoded >= MAX_SAFARI_DECODE_BYTES) { + cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); + cachedTextDecoder.decode(); + numBytesDecoded = len; + } + return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len)); +} + +const cachedTextEncoder = new TextEncoder(); + +if (!('encodeInto' in cachedTextEncoder)) { + cachedTextEncoder.encodeInto = function (arg, view) { + const buf = cachedTextEncoder.encode(arg); + view.set(buf); + return { + read: arg.length, + written: buf.length + }; + }; +} + +let WASM_VECTOR_LEN = 0; + +let wasmModule, wasmInstance, wasm; +function __wbg_finalize_init(instance, module) { + wasmInstance = instance; + wasm = instance.exports; + wasmModule = module; + cachedDataViewMemory0 = null; + cachedUint8ArrayMemory0 = null; + wasm.__wbindgen_start(); + return wasm; +} + +async function __wbg_load(module, imports) { + if (typeof Response === 'function' && module instanceof Response) { + if (!module.ok) { + throw new Error(`failed to fetch Wasm: ${module.status} ${module.statusText} fetching '${module.url}'`); + } + + if (typeof WebAssembly.instantiateStreaming === 'function') { + try { + return await WebAssembly.instantiateStreaming(module, imports); + } catch (e) { + const validResponse = expectedResponseType(module.type); + + if (validResponse && module.headers.get('Content-Type') !== 'application/wasm') { + console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e); + + } else { throw e; } + } + } + + const bytes = await module.arrayBuffer(); + return await WebAssembly.instantiate(bytes, imports); + } else { + const instance = await WebAssembly.instantiate(module, imports); + + if (instance instanceof WebAssembly.Instance) { + return { instance, module }; + } else { + return instance; + } + } + + function expectedResponseType(type) { + switch (type) { + case 'basic': case 'cors': case 'default': return true; + } + return false; + } +} + +function initSync(module) { + if (wasm !== undefined) return wasm; + + + if (module !== undefined) { + if (Object.getPrototypeOf(module) === Object.prototype) { + ({module} = module) + } else { + console.warn('using deprecated parameters for `initSync()`; pass a single object instead') + } + } + + const imports = __wbg_get_imports(); + if (!(module instanceof WebAssembly.Module)) { + module = new WebAssembly.Module(module); + } + const instance = new WebAssembly.Instance(module, imports); + return __wbg_finalize_init(instance, module); +} + +async function __wbg_init(module_or_path) { + if (wasm !== undefined) return wasm; + + + if (module_or_path !== undefined) { + if (Object.getPrototypeOf(module_or_path) === Object.prototype) { + ({module_or_path} = module_or_path) + } else { + console.warn('using deprecated parameters for the initialization function; pass a single object instead') + } + } + + if (module_or_path === undefined) { + module_or_path = new URL('wipfel_bg.wasm', import.meta.url); + } + const imports = __wbg_get_imports(); + + if (typeof module_or_path === 'string' || (typeof Request === 'function' && module_or_path instanceof Request) || (typeof URL === 'function' && module_or_path instanceof URL)) { + module_or_path = fetch(module_or_path); + } + + const { instance, module } = await __wbg_load(await module_or_path, imports); + + return __wbg_finalize_init(instance, module); +} + +export { initSync, __wbg_init as default }; diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm new file mode 100644 index 0000000..a3cc980 Binary files /dev/null and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From dbc12469028bb7d927fcd8bc1be3bcbc1bf63365 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 16:11:41 +0100 Subject: web: rebuild dist with resize-distortion fix --- dist/wipfel/wipfel.js | 4 ++-- dist/wipfel/wipfel_bg.wasm | Bin 507419 -> 507713 bytes 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'dist') diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index 9119aea..c813102 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -594,7 +594,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 75, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, @@ -604,7 +604,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 76, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 77, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); return ret; }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index a3cc980..32ce3bc 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From aec36a8d6087266a2c9c7569314e2306f2dcf298 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 16:32:12 +0100 Subject: web: mobile fixes — pinch zoom, dynamic viewport height, wider accept MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - two-finger pinch on the viewport canvas: pointer table tracks all active pointers; pinch emits zoom anchored at the finger midpoint plus pan by the midpoint delta; a second finger cancels an in-flight pan/marker drag, the remaining finger resumes panning, and pinch gestures never fire a click - 100dvh (with 100vh fallback) for the app shell: on mobile browsers 100vh includes the area behind the dynamic URL bar, which pushed the compass strip below the visible fold - file input accepts image/* so Android pickers offer all photos and transcode exotic formats (HEIC) to decodable ones --- crates/wipfel/src/app.rs | 2 +- crates/wipfel/src/canvas_view.rs | 88 +++++++++++++++++++++++++++++++++++---- crates/wipfel/www/style.css | 4 ++ dist/wipfel/style.css | 4 ++ dist/wipfel/wipfel.js | 4 +- dist/wipfel/wipfel_bg.wasm | Bin 507713 -> 508958 bytes 6 files changed, 92 insertions(+), 10 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index d2a66cb..cc9f558 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -870,7 +870,7 @@ pub fn app() -> Html { diff --git a/crates/wipfel/src/canvas_view.rs b/crates/wipfel/src/canvas_view.rs index 9ec2267..b962f17 100644 --- a/crates/wipfel/src/canvas_view.rs +++ b/crates/wipfel/src/canvas_view.rs @@ -96,6 +96,10 @@ struct DragState { last: (f64, f64), start: (f64, f64), moved: bool, + /// all active pointers (id, client position); >1 while pinching + pts: Vec<(i32, (f64, f64))>, + /// pinch geometry: (distance, center x, center y), canvas-relative + pinch: Option<(f64, f64, f64)>, } #[function_component(CanvasView)] @@ -105,6 +109,8 @@ pub fn canvas_view(props: &Props) -> Html { last: (0.0, 0.0), start: (0.0, 0.0), moved: false, + pts: Vec::new(), + pinch: None, }); // redraw on every view/bitmap/marker change and on resize ticks @@ -397,21 +403,71 @@ pub fn canvas_view(props: &Props) -> Html { } let pos = (e.client_x() as f64, e.client_y() as f64); let mut d = drag.borrow_mut(); - d.mode = Some(mode); - d.last = pos; - d.start = pos; - d.moved = false; + d.pts.push((e.pointer_id(), pos)); + if d.pts.len() >= 2 { + // second finger: switch to pinch, cancel any pan/marker + // drag so the view does not jump + d.mode = None; + d.pinch = None; + d.moved = true; + } else { + d.mode = Some(mode); + d.last = pos; + d.start = pos; + d.moved = false; + } }) }; let on_pointermove = { let drag = drag.clone(); let pan_cb = props.callbacks.pan.clone(); + let zoom_cb = props.callbacks.zoom.clone(); let marker_drag = props.callbacks.marker_drag.clone(); let hover = props.callbacks.hover.clone(); let to_img = to_img.clone(); + let canvas_ref = props.canvas_ref.clone(); let scale = props.view.scale; Callback::from(move |e: PointerEvent| { + // update the pointer table and handle two-finger pinch + let pinch_ev = { + let mut d = drag.borrow_mut(); + if let Some(p) = d.pts.iter_mut().find(|(id, _)| *id == e.pointer_id()) { + p.1 = (e.client_x() as f64, e.client_y() as f64); + } + if d.pts.len() >= 2 { + let (x1, y1) = d.pts[0].1; + let (x2, y2) = d.pts[1].1; + let rect = canvas_ref + .cast::() + .map(|c| c.get_bounding_client_rect()); + let (rl, rt) = match rect { + Some(r) => (r.left(), r.top()), + None => (0.0, 0.0), + }; + let dist = ((x2 - x1).powi(2) + (y2 - y1).powi(2)).sqrt(); + let cx = (x1 + x2) / 2.0 - rl; + let cy = (y1 + y2) / 2.0 - rt; + let ev = match d.pinch { + Some((od, ocx, ocy)) if od > 1.0 && dist > 1.0 => { + Some((dist / od, cx, cy, cx - ocx, cy - ocy)) + } + _ => None, + }; + d.pinch = Some((dist, cx, cy)); + d.moved = true; + Some(ev) + } else { + None + } + }; + if let Some(ev) = pinch_ev { + if let Some((factor, cx, cy, dx, dy)) = ev { + zoom_cb.emit((cx, cy, factor)); + pan_cb.emit((dx, dy)); + } + return; + } let mut d = drag.borrow_mut(); let mode = match &d.mode { Some(m) => m.clone(), @@ -451,11 +507,26 @@ pub fn canvas_view(props: &Props) -> Html { let drag_end = props.callbacks.drag_end.clone(); let to_img = to_img.clone(); Callback::from(move |e: PointerEvent| { - let mode = drag.borrow_mut().mode.take(); + let (mode, moved) = { + let mut d = drag.borrow_mut(); + d.pts.retain(|(id, _)| *id != e.pointer_id()); + if d.pts.len() < 2 { + d.pinch = None; + } + let mode = d.mode.take(); + let moved = d.moved; + if d.pts.len() == 1 { + // one finger left after pinch: resume panning from + // there, never treat it as a click + d.mode = Some(DragMode::Pan); + d.last = d.pts[0].1; + d.moved = true; + } + (mode, moved) + }; if let Some(c) = canvas_ref.cast::() { let _ = c.release_pointer_capture(e.pointer_id()); } - let moved = drag.borrow().moved; match mode { Some(DragMode::Pan) if !moved => { let (ix, iy) = to_img(e.client_x() as f64, e.client_y() as f64); @@ -470,7 +541,10 @@ pub fn canvas_view(props: &Props) -> Html { let on_pointercancel = { let drag = drag.clone(); Callback::from(move |_: PointerEvent| { - drag.borrow_mut().mode = None; + let mut d = drag.borrow_mut(); + d.mode = None; + d.pts.clear(); + d.pinch = None; }) }; diff --git a/crates/wipfel/www/style.css b/crates/wipfel/www/style.css index d706a8d..a0ffc4d 100644 --- a/crates/wipfel/www/style.css +++ b/crates/wipfel/www/style.css @@ -10,6 +10,10 @@ body { .app { display: flex; height: 100vh; + /* dynamic viewport height: on mobile browsers 100vh includes the + area behind the collapsing URL bar, pushing the compass below the + fold; dvh tracks the actually visible area */ + height: 100dvh; background: #101014; color: #e8e8ea; } diff --git a/dist/wipfel/style.css b/dist/wipfel/style.css index d706a8d..a0ffc4d 100644 --- a/dist/wipfel/style.css +++ b/dist/wipfel/style.css @@ -10,6 +10,10 @@ body { .app { display: flex; height: 100vh; + /* dynamic viewport height: on mobile browsers 100vh includes the + area behind the collapsing URL bar, pushing the compass below the + fold; dvh tracks the actually visible area */ + height: 100dvh; background: #101014; color: #e8e8ea; } diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index c813102..9119aea 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -594,7 +594,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 75, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, @@ -604,7 +604,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 77, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 76, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); return ret; }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index 32ce3bc..c89fbba 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From 8066a226f3ac6df3b5e591384a127ba8d81f2700 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 16:37:43 +0100 Subject: web: keep browser from stealing the pinch gesture Firefox on Android may consume two-finger pinch for page zooming despite touch-action: none on the canvas. Disable page zooming via the viewport meta (maximum-scale=1, user-scalable=no) so the gesture reaches the app as pointer events; the app provides its own zoom. Also join touch pointers seen only via pointermove into the pointer table, so a swallowed second pointerdown cannot break pinch. --- crates/wipfel/index.html | 2 +- crates/wipfel/src/canvas_view.rs | 12 ++++++++++-- crates/wipfel/www/index.html | 2 +- dist/wipfel/index.html | 2 +- dist/wipfel/wipfel.js | 11 +++++++++++ dist/wipfel/wipfel_bg.wasm | Bin 508958 -> 509301 bytes 6 files changed, 24 insertions(+), 5 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/index.html b/crates/wipfel/index.html index d00adbe..2da0c81 100644 --- a/crates/wipfel/index.html +++ b/crates/wipfel/index.html @@ -2,7 +2,7 @@ - + wipfel — web based gipfel photogrammetry diff --git a/crates/wipfel/src/canvas_view.rs b/crates/wipfel/src/canvas_view.rs index b962f17..ac1d6ab 100644 --- a/crates/wipfel/src/canvas_view.rs +++ b/crates/wipfel/src/canvas_view.rs @@ -432,8 +432,16 @@ pub fn canvas_view(props: &Props) -> Html { // update the pointer table and handle two-finger pinch let pinch_ev = { let mut d = drag.borrow_mut(); - if let Some(p) = d.pts.iter_mut().find(|(id, _)| *id == e.pointer_id()) { - p.1 = (e.client_x() as f64, e.client_y() as f64); + let pos = (e.client_x() as f64, e.client_y() as f64); + match d.pts.iter_mut().find(|(id, _)| *id == e.pointer_id()) { + Some(p) => p.1 = pos, + // a touch pointermove for a pointer we never saw go + // down (lost pointerdown, e.g. swallowed by the + // browser) — join it so pinch still works + None if e.pointer_type() == "touch" && e.buttons() != 0 => { + d.pts.push((e.pointer_id(), pos)); + } + None => {} } if d.pts.len() >= 2 { let (x1, y1) = d.pts[0].1; diff --git a/crates/wipfel/www/index.html b/crates/wipfel/www/index.html index 5297a72..98f81e8 100644 --- a/crates/wipfel/www/index.html +++ b/crates/wipfel/www/index.html @@ -2,7 +2,7 @@ - + wipfel — web based gipfel photogrammetry diff --git a/dist/wipfel/index.html b/dist/wipfel/index.html index 5297a72..98f81e8 100644 --- a/dist/wipfel/index.html +++ b/dist/wipfel/index.html @@ -2,7 +2,7 @@ - + wipfel — web based gipfel photogrammetry diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index 9119aea..d312617 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -61,6 +61,10 @@ function __wbg_get_imports() { const ret = arg0.buffer; return ret; }, + __wbg_buttons_de1e6c7f6de70736: function(arg0) { + const ret = arg0.buttons; + return ret; + }, __wbg_cache_key_21c521bc3dd66e9b: function(arg0) { const ret = arg0.__yew_subtree_cache_key; return isLikeNone(ret) ? Number.MAX_SAFE_INTEGER : (ret) >>> 0; @@ -403,6 +407,13 @@ function __wbg_get_imports() { const ret = arg0.pointerId; return ret; }, + __wbg_pointerType_2e8b8270da489520: function(arg0, arg1) { + const ret = arg1.pointerType; + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }, __wbg_preventDefault_af59afb0f0a02e20: function(arg0) { arg0.preventDefault(); }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index c89fbba..cc56f90 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From 344b13444fe8ee9825ed33f8676d6091c70a77cb Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 16:46:35 +0100 Subject: web: pinch diagnostics in status line + resilient pointer table MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Second data point needed for the mobile pinch issue: the status line now shows pointer activity (pointerdown id/pts, pointercancel id/pts, pinch distance) so it is visible on the phone whether the second pointer arrives at all or whether the browser cancels pointers when pinching. Also: only capture the primary pointer (capturing every finger confuses some mobile browsers), and pointercancel now removes just that pointer instead of clearing the table — a browser that 'cancels' finger one as finger two lands no longer makes pinch impossible to form. --- crates/wipfel/src/app.rs | 4 +++ crates/wipfel/src/canvas_view.rs | 73 ++++++++++++++++++++++++++------------- dist/wipfel/wipfel.js | 4 +-- dist/wipfel/wipfel_bg.wasm | Bin 509301 -> 510826 bytes 4 files changed, 55 insertions(+), 26 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index cc9f558..c4a42df 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -769,6 +769,10 @@ pub fn app() -> Html { let hover = hover.clone(); Callback::from(move |_: ()| hover.set(None)) }, + debug: { + let status = status.clone(); + Callback::from(move |s: String| status.set(s)) + }, }; // Lens FOV visibility limit, port of the desktop bump(): the angle at diff --git a/crates/wipfel/src/canvas_view.rs b/crates/wipfel/src/canvas_view.rs index ac1d6ab..5806843 100644 --- a/crates/wipfel/src/canvas_view.rs +++ b/crates/wipfel/src/canvas_view.rs @@ -63,6 +63,8 @@ pub struct ViewCallbacks { pub hover: Callback<(f64, f64)>, /// pointer left the canvas pub hover_end: Callback<()>, + /// diagnostic text for the status line (pinch debugging on mobile) + pub debug: Callback, } #[derive(Properties, PartialEq)] @@ -375,11 +377,9 @@ pub fn canvas_view(props: &Props) -> Html { let markers = props.markers.clone(); let view = props.view.clone(); let bitmap = props.bitmap.clone(); + let debug = props.callbacks.debug.clone(); Callback::from(move |e: PointerEvent| { e.prevent_default(); - if let Some(c) = canvas_ref.cast::() { - let _ = c.set_pointer_capture(e.pointer_id()); - } let rect = canvas_ref .cast::() .map(|c| c.get_bounding_client_rect()); @@ -402,20 +402,33 @@ pub fn canvas_view(props: &Props) -> Html { } } let pos = (e.client_x() as f64, e.client_y() as f64); - let mut d = drag.borrow_mut(); - d.pts.push((e.pointer_id(), pos)); - if d.pts.len() >= 2 { - // second finger: switch to pinch, cancel any pan/marker - // drag so the view does not jump - d.mode = None; - d.pinch = None; - d.moved = true; - } else { - d.mode = Some(mode); - d.last = pos; - d.start = pos; - d.moved = false; + let n = { + let mut d = drag.borrow_mut(); + d.pts.retain(|(id, _)| *id != e.pointer_id()); + d.pts.push((e.pointer_id(), pos)); + let n = d.pts.len(); + if n >= 2 { + // second finger: switch to pinch, cancel any pan/marker + // drag so the view does not jump + d.mode = None; + d.pinch = None; + d.moved = true; + } else { + d.mode = Some(mode); + d.last = pos; + d.start = pos; + d.moved = false; + } + n + }; + // capture only the primary pointer; capturing every finger + // confuses some mobile browsers + if n == 1 { + if let Some(c) = canvas_ref.cast::() { + let _ = c.set_pointer_capture(e.pointer_id()); + } } + debug.emit(format!("pointerdown id={} pts={n}", e.pointer_id())); }) }; @@ -427,6 +440,7 @@ pub fn canvas_view(props: &Props) -> Html { let hover = props.callbacks.hover.clone(); let to_img = to_img.clone(); let canvas_ref = props.canvas_ref.clone(); + let debug = props.callbacks.debug.clone(); let scale = props.view.scale; Callback::from(move |e: PointerEvent| { // update the pointer table and handle two-finger pinch @@ -464,13 +478,15 @@ pub fn canvas_view(props: &Props) -> Html { }; d.pinch = Some((dist, cx, cy)); d.moved = true; - Some(ev) + let dbg = format!("pinch pts=2 d={dist:.0}"); + (ev, dbg) } else { - None + (None, String::new()) } }; - if let Some(ev) = pinch_ev { - if let Some((factor, cx, cy, dx, dy)) = ev { + if !pinch_ev.1.is_empty() { + debug.emit(pinch_ev.1); + if let Some((factor, cx, cy, dx, dy)) = pinch_ev.0 { zoom_cb.emit((cx, cy, factor)); pan_cb.emit((dx, dy)); } @@ -548,11 +564,20 @@ pub fn canvas_view(props: &Props) -> Html { let on_pointercancel = { let drag = drag.clone(); - Callback::from(move |_: PointerEvent| { + let debug = props.callbacks.debug.clone(); + Callback::from(move |e: PointerEvent| { let mut d = drag.borrow_mut(); - d.mode = None; - d.pts.clear(); - d.pinch = None; + // do NOT clear the whole table: when a mobile browser + // "cancels" the first finger as the second arrives, a + // blanket clear would make a pinch impossible to form + d.pts.retain(|(id, _)| *id != e.pointer_id()); + if d.pts.len() < 2 { + d.pinch = None; + } + if d.pts.is_empty() { + d.mode = None; + } + debug.emit(format!("pointercancel id={} pts={}", e.pointer_id(), d.pts.len())); }) }; diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index d312617..e1eedc0 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -605,7 +605,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 75, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, @@ -615,7 +615,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 76, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 77, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); return ret; }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index cc56f90..6c751d3 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From d126648749b103376c233c1df24346a941c70eb4 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 16:57:34 +0100 Subject: web: dev script must copy index.html too (viewport meta never deployed) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit serve-here.sh only refreshed style.css and the wasm bundle, so the viewport meta change that frees the pinch gesture for the app never reached the served page. Copy the loader page as well, and surface the status line as a small overlay over the canvas when the control panel is collapsed (mobile) — this is also where the pinch pointer diagnostics become visible on phones. --- crates/wipfel/serve-here.sh | 2 +- crates/wipfel/src/app.rs | 1 + crates/wipfel/www/style.css | 15 +++++++++++++++ dist/wipfel/style.css | 15 +++++++++++++++ dist/wipfel/wipfel_bg.wasm | Bin 510826 -> 511017 bytes 5 files changed, 32 insertions(+), 1 deletion(-) (limited to 'dist') diff --git a/crates/wipfel/serve-here.sh b/crates/wipfel/serve-here.sh index 9667965..2accdb9 100755 --- a/crates/wipfel/serve-here.sh +++ b/crates/wipfel/serve-here.sh @@ -7,6 +7,6 @@ cargo build -p wipfel --target wasm32-unknown-unknown --release DIST=/tmp/wipfel-dist mkdir -p "$DIST" wasm-bindgen --target web --out-dir "$DIST" target/wasm32-unknown-unknown/release/wipfel.wasm -cp crates/wipfel/www/style.css "$DIST/" +cp crates/wipfel/www/index.html crates/wipfel/www/style.css "$DIST/" gzip -9 -n -c gipfel.dat > "$DIST/gipfel.dat.gz" echo "dist refreshed: $(ls -la "$DIST" | awk '{s+=$5} END {print s" bytes"}')" diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index c4a42df..f3acd3a 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -951,6 +951,7 @@ pub fn app() -> Html { if !*nav_open { +
{ (*status).clone() }
} Date: Tue, 27 Oct 2026 17:07:56 +0100 Subject: web: always show canvas status overlay + build stamp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The overlay was suppressed whenever the panel was open — but Firefox on Android defaults to desktop-site mode, which reports a 980px viewport and thus keeps the panel open on phones. The overlay now always shows (it doubles as the pinch-diagnostic readout), and the initial status carries a build stamp so a stale cached page is recognizable at a glance. --- crates/wipfel/src/app.rs | 4 ++-- dist/wipfel/wipfel_bg.wasm | Bin 511017 -> 511049 bytes 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index f3acd3a..09bf467 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -149,7 +149,7 @@ fn find_peak_panel(p: &FpProps) -> Html { pub fn app() -> Html { let bitmap = use_state(|| None::); let view = use_state(ViewState::default); - let status = use_state(|| "No image loaded.".to_string()); + let status = use_state(|| "No image loaded · build 27c".to_string()); let db_status = use_state(|| "Loading hill database…".to_string()); let fit_info = use_state(String::new); let tick = use_state(|| 0u32); @@ -951,8 +951,8 @@ pub fn app() -> Html { if !*nav_open { -
{ (*status).clone() }
} +
{ (*status).clone() }
Date: Tue, 27 Oct 2026 18:17:47 +0100 Subject: web: allow any file type in the image picker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MediaProvider only redacts GPS EXIF in files it indexes as images. A copy renamed to a non-image extension (or under a .nomedia folder) reaches the browser untouched — an all-files picker makes that route usable on GrapheneOS/AOSP where browsers cannot hold ACCESS_MEDIA_LOCATION. --- crates/wipfel/src/app.rs | 2 +- dist/wipfel/style.css | 4 + dist/wipfel/wipfel.js | 4 +- dist/wipfel/wipfel_bg.wasm | Bin 511049 -> 511878 bytes .../.gradle/8.11.1/checksums/checksums.lock | Bin 0 -> 17 bytes .../.gradle/8.11.1/checksums/md5-checksums.bin | Bin 0 -> 29647 bytes .../.gradle/8.11.1/checksums/sha1-checksums.bin | Bin 0 -> 44093 bytes .../8.11.1/executionHistory/executionHistory.bin | Bin 0 -> 19560 bytes .../8.11.1/executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .../.gradle/8.11.1/fileChanges/last-build.bin | Bin 0 -> 1 bytes .../.gradle/8.11.1/fileHashes/fileHashes.bin | Bin 0 -> 18697 bytes .../.gradle/8.11.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes wipfel-droid/.gradle/8.11.1/gc.properties | 0 .../buildOutputCleanup/buildOutputCleanup.lock | Bin 0 -> 17 bytes .../.gradle/buildOutputCleanup/cache.properties | 2 + .../.gradle/buildOutputCleanup/outputFiles.bin | Bin 0 -> 18695 bytes wipfel-droid/.gradle/file-system.probe | Bin 0 -> 8 bytes wipfel-droid/.gradle/vcs-1/gc.properties | 0 wipfel-droid/app/build.gradle.kts | 31 +++ wipfel-droid/app/src/main/AndroidManifest.xml | 25 ++ .../main/kotlin/org/flpsed/wipfel/AssetServer.kt | 102 +++++++++ .../main/kotlin/org/flpsed/wipfel/MainActivity.kt | 110 +++++++++ .../src/main/res/xml/network_security_config.xml | 11 + wipfel-droid/build.gradle.kts | 4 + wipfel-droid/gradle.properties | 3 + wipfel-droid/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + wipfel-droid/gradlew | 252 +++++++++++++++++++++ wipfel-droid/gradlew.bat | 94 ++++++++ wipfel-droid/settings.gradle.kts | 16 ++ 30 files changed, 664 insertions(+), 3 deletions(-) create mode 100644 wipfel-droid/.gradle/8.11.1/checksums/checksums.lock create mode 100644 wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin create mode 100644 wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin create mode 100644 wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin create mode 100644 wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock create mode 100644 wipfel-droid/.gradle/8.11.1/fileChanges/last-build.bin create mode 100644 wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin create mode 100644 wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock create mode 100644 wipfel-droid/.gradle/8.11.1/gc.properties create mode 100644 wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 wipfel-droid/.gradle/buildOutputCleanup/cache.properties create mode 100644 wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin create mode 100644 wipfel-droid/.gradle/file-system.probe create mode 100644 wipfel-droid/.gradle/vcs-1/gc.properties create mode 100644 wipfel-droid/app/build.gradle.kts create mode 100644 wipfel-droid/app/src/main/AndroidManifest.xml create mode 100644 wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/AssetServer.kt create mode 100644 wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt create mode 100644 wipfel-droid/app/src/main/res/xml/network_security_config.xml create mode 100644 wipfel-droid/build.gradle.kts create mode 100644 wipfel-droid/gradle.properties create mode 100644 wipfel-droid/gradle/wrapper/gradle-wrapper.jar create mode 100644 wipfel-droid/gradle/wrapper/gradle-wrapper.properties create mode 100755 wipfel-droid/gradlew create mode 100644 wipfel-droid/gradlew.bat create mode 100644 wipfel-droid/settings.gradle.kts (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 1843021..8ae78c4 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -903,7 +903,7 @@ pub fn app() -> Html { diff --git a/dist/wipfel/style.css b/dist/wipfel/style.css index baceb49..646444d 100644 --- a/dist/wipfel/style.css +++ b/dist/wipfel/style.css @@ -68,6 +68,10 @@ body { bottom: 6px; left: 8px; right: 8px; + /* do NOT let long status text widen the flex container (that + stretched the canvas and re-anchored the fit on every update) */ + width: min-content; + max-width: calc(100% - 16px); font-size: 11px; color: #e8e8ea; background: rgba(16, 16, 20, 0.7); diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index e1eedc0..d312617 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -605,7 +605,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 75, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, @@ -615,7 +615,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 77, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 76, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); return ret; }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index a3af69d..470fd43 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ diff --git a/wipfel-droid/.gradle/8.11.1/checksums/checksums.lock b/wipfel-droid/.gradle/8.11.1/checksums/checksums.lock new file mode 100644 index 0000000..532a57c Binary files /dev/null and b/wipfel-droid/.gradle/8.11.1/checksums/checksums.lock differ diff --git a/wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin b/wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin new file mode 100644 index 0000000..53a3b95 Binary files /dev/null and b/wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin differ diff --git a/wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin b/wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin new file mode 100644 index 0000000..43f2251 Binary files /dev/null and b/wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin differ diff --git a/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin new file mode 100644 index 0000000..7a97448 Binary files /dev/null and b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin differ diff --git a/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock new file mode 100644 index 0000000..62e3db2 Binary files /dev/null and b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock differ diff --git a/wipfel-droid/.gradle/8.11.1/fileChanges/last-build.bin b/wipfel-droid/.gradle/8.11.1/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/wipfel-droid/.gradle/8.11.1/fileChanges/last-build.bin differ diff --git a/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin new file mode 100644 index 0000000..ab9d95d Binary files /dev/null and b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin differ diff --git a/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000..15a08b4 Binary files /dev/null and b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock differ diff --git a/wipfel-droid/.gradle/8.11.1/gc.properties b/wipfel-droid/.gradle/8.11.1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..023be44 Binary files /dev/null and b/wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/wipfel-droid/.gradle/buildOutputCleanup/cache.properties b/wipfel-droid/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..022da4e --- /dev/null +++ b/wipfel-droid/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Tue Oct 27 18:16:00 CET 2026 +gradle.version=8.11.1 diff --git a/wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin b/wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..ffc4b41 Binary files /dev/null and b/wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/wipfel-droid/.gradle/file-system.probe b/wipfel-droid/.gradle/file-system.probe new file mode 100644 index 0000000..147f004 Binary files /dev/null and b/wipfel-droid/.gradle/file-system.probe differ diff --git a/wipfel-droid/.gradle/vcs-1/gc.properties b/wipfel-droid/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/wipfel-droid/app/build.gradle.kts b/wipfel-droid/app/build.gradle.kts new file mode 100644 index 0000000..aa70a0d --- /dev/null +++ b/wipfel-droid/app/build.gradle.kts @@ -0,0 +1,31 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") +} + +android { + namespace = "org.flpsed.wipfel" + compileSdk = 35 + + defaultConfig { + applicationId = "org.flpsed.wipfel" + minSdk = 29 + targetSdk = 35 + versionCode = 1 + versionName = "0.1.0" + } + + buildTypes { + release { + isMinifyEnabled = false + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + } +} diff --git a/wipfel-droid/app/src/main/AndroidManifest.xml b/wipfel-droid/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..34c56d8 --- /dev/null +++ b/wipfel-droid/app/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/AssetServer.kt b/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/AssetServer.kt new file mode 100644 index 0000000..8f11f50 --- /dev/null +++ b/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/AssetServer.kt @@ -0,0 +1,102 @@ +package org.flpsed.wipfel + +import java.io.ByteArrayOutputStream +import java.io.IOException +import java.io.InputStream +import java.io.OutputStream +import java.net.ServerSocket +import java.net.Socket +import kotlin.concurrent.thread + +/** + * Minimal loopback HTTP server that serves the bundled assets. + * + * The WebView refuses fetch() on file:// origins, and WASM streaming + * instantiation needs a real HTTP origin, so we serve the site from + * 127.0.0.1 on an ephemeral port. Loopback only; nothing is exposed. + */ +class AssetServer(private val assetManager: android.content.res.AssetManager) : AutoCloseable { + private val server = ServerSocket(0, 4, java.net.InetAddress.getByName("127.0.0.1")) + val port: Int get() = server.localPort + + @Volatile + private var running = true + + init { + thread(isDaemon = true, name = "wipfel-http") { + while (running) { + try { + val socket = server.accept() + thread(isDaemon = true) { handle(socket) } + } catch (_: IOException) { + running = false + } + } + } + } + + private fun handle(socket: Socket) { + socket.use { s -> + try { + val input = s.getInputStream() + val requestLine = input.readLine() ?: return + val path = requestLine.split(" ").getOrNull(1) ?: "/" + // read (and ignore) the remaining headers so the client is happy + while (true) { + val line = input.readLine() ?: break + if (line.isEmpty()) break + } + val asset = if (path == "/" || path == "/index.html") "www/index.html" + else "www/" + path.trimStart('/') + val data = try { + assetManager.open(asset).use { it.readBytes() } + } catch (_: IOException) { + respond(s, 404, "text/plain", "not found".toByteArray()) + return + } + respond(s, 200, mime(asset), data) + } catch (_: IOException) { + } + } + } + + private fun respond(s: Socket, code: Int, ctype: String, body: ByteArray) { + val out: OutputStream = s.getOutputStream() + val header = buildString { + append("HTTP/1.1 $code OK\r\n") + append("Content-Type: $ctype\r\n") + append("Content-Length: ${body.size}\r\n") + append("Cache-Control: no-cache\r\n") + append("Access-Control-Allow-Origin: *\r\n") + append("Connection: close\r\n") + append("\r\n") + } + out.write(header.toByteArray()) + out.write(body) + out.flush() + } + + private fun mime(path: String): String = when { + path.endsWith(".wasm") -> "application/wasm" + path.endsWith(".js") -> "application/javascript" + path.endsWith(".css") -> "text/css" + path.endsWith(".html") -> "text/html" + path.endsWith(".gz") -> "application/gzip" + else -> "application/octet-stream" + } + + private fun InputStream.readLine(): String? { + val buf = ByteArrayOutputStream(64) + while (true) { + val b = read() + if (b == -1) return if (buf.size() == 0) null else buf.toString("ISO-8859-1") + if (b == '\n'.code) return buf.toString("ISO-8859-1").trimEnd('\r') + buf.write(b) + } + } + + override fun close() { + running = false + try { server.close() } catch (_: IOException) {} + } +} diff --git a/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt b/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt new file mode 100644 index 0000000..8a62a4a --- /dev/null +++ b/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt @@ -0,0 +1,110 @@ +package org.flpsed.wipfel + +import android.Manifest +import android.app.Activity +import android.content.Intent +import android.content.pm.PackageManager +import android.net.Uri +import android.os.Bundle +import android.webkit.ValueCallback +import android.webkit.WebChromeClient +import android.webkit.WebView +import android.webkit.WebViewClient + +class MainActivity : Activity() { + + private lateinit var web: WebView + private var server: AssetServer? = null + private var filePathCallback: ValueCallback>? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + web = WebView(this) + setContentView(web) + with(web.settings) { + javaScriptEnabled = true + domStorageEnabled = true // localStorage: profiles & settings + useWideViewPort = true // honour the viewport meta tag + loadWithOverviewMode = true + mediaPlaybackRequiresUserGesture = false + } + web.webViewClient = WebViewClient() + web.webChromeClient = object : WebChromeClient() { + override fun onShowFileChooser( + view: WebView, + callback: ValueCallback>, + params: FileChooserParams + ): Boolean { + filePathCallback?.onReceiveValue(null) + filePathCallback = callback + // params.createIntent() carries the accept="image/*" filter + startActivityForResult(params.createIntent(), REQ_FILE) + return true + } + } + + val srv = AssetServer(assets) + server = srv + web.loadUrl("http://127.0.0.1:${srv.port}/index.html") + + requestMediaPermissions() + } + + /** + * The reason this wrapper exists: with ACCESS_MEDIA_LOCATION granted the + * OS hands us the ORIGINAL files (GPS EXIF intact) instead of the + * location-redacted copies browsers are forced to see. + */ + private fun requestMediaPermissions() { + val needed = listOf( + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.ACCESS_MEDIA_LOCATION + ).filter { checkSelfPermission(it) != PackageManager.PERMISSION_GRANTED } + if (needed.isNotEmpty()) { + requestPermissions(needed.toTypedArray(), REQ_PERMS) + } + } + + override fun onRequestPermissionsResult( + requestCode: Int, permissions: Array, grantResults: IntArray + ) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults) + // no special handling: without the grant the app still works, + // the OS just redacts GPS EXIF exactly like in a browser + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (requestCode == REQ_FILE) { + val cb = filePathCallback + filePathCallback = null + val uris: Array? = if (resultCode == RESULT_OK && data != null) { + val clip = data.clipData + when { + clip != null -> Array(clip.itemCount) { clip.getItem(it).uri } + data.data != null -> arrayOf(data.data!!) + else -> null + } + } else null + cb?.onReceiveValue(uris) + } else { + super.onActivityResult(requestCode, resultCode, data) + } + } + + @Deprecated("Deprecated in Java") + override fun onBackPressed() { + if (web.canGoBack()) web.goBack() else @Suppress("DEPRECATION") super.onBackPressed() + } + + override fun onDestroy() { + server?.close() + web.destroy() + super.onDestroy() + } + + companion object { + private const val REQ_PERMS = 1 + private const val REQ_FILE = 2 + } +} diff --git a/wipfel-droid/app/src/main/res/xml/network_security_config.xml b/wipfel-droid/app/src/main/res/xml/network_security_config.xml new file mode 100644 index 0000000..2434fb8 --- /dev/null +++ b/wipfel-droid/app/src/main/res/xml/network_security_config.xml @@ -0,0 +1,11 @@ + + + + + 127.0.0.1 + localhost + + + diff --git a/wipfel-droid/build.gradle.kts b/wipfel-droid/build.gradle.kts new file mode 100644 index 0000000..c7ad754 --- /dev/null +++ b/wipfel-droid/build.gradle.kts @@ -0,0 +1,4 @@ +plugins { + id("com.android.application") version "8.7.3" apply false + id("org.jetbrains.kotlin.android") version "2.0.21" apply false +} diff --git a/wipfel-droid/gradle.properties b/wipfel-droid/gradle.properties new file mode 100644 index 0000000..589cec0 --- /dev/null +++ b/wipfel-droid/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx3g +android.useAndroidX=true +kotlin.code.style=official diff --git a/wipfel-droid/gradle/wrapper/gradle-wrapper.jar b/wipfel-droid/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/wipfel-droid/gradle/wrapper/gradle-wrapper.jar differ diff --git a/wipfel-droid/gradle/wrapper/gradle-wrapper.properties b/wipfel-droid/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e2847c8 --- /dev/null +++ b/wipfel-droid/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/wipfel-droid/gradlew b/wipfel-droid/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/wipfel-droid/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/wipfel-droid/gradlew.bat b/wipfel-droid/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/wipfel-droid/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/wipfel-droid/settings.gradle.kts b/wipfel-droid/settings.gradle.kts new file mode 100644 index 0000000..e4fe472 --- /dev/null +++ b/wipfel-droid/settings.gradle.kts @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + google() + mavenCentral() + } +} + +dependencyResolutionManagement { + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "wipfel-droid" +include(":app") -- cgit v1.2.3 From a41c1ff25746874fa5a1eed5e62352a28d7515f9 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 18:28:26 +0100 Subject: wipfel-droid: Android wrapper APK (WebView + ACCESS_MEDIA_LOCATION) Thin wrapper so wipfel can read original photo bytes: browsers cannot declare ACCESS_MEDIA_LOCATION, so the OS always redacts GPS EXIF from images they read. Our own app declares and requests it (plus READ_MEDIA_IMAGES) and gets the intact files. - WebView served from a loopback AssetServer (fetch/WASM need a real HTTP origin; file:// is blocked) - file picker wired through WebChromeClient (accepts any file type) - zero androidx dependencies, plain Activity, minSdk 29 - build.sh: wasm release site -> assets -> assembleDebug (~3MB APK) - loader: fall back to plain gipfel.dat (aapt gunzips .gz assets) --- crates/wipfel/src/app.rs | 8 +++++-- dist/wipfel/wipfel.js | 4 ++-- dist/wipfel/wipfel_bg.wasm | Bin 511878 -> 511473 bytes wipfel-droid/.gitignore | 5 +++++ .../.gradle/8.11.1/checksums/checksums.lock | Bin 17 -> 17 bytes .../.gradle/8.11.1/checksums/md5-checksums.bin | Bin 29647 -> 30197 bytes .../.gradle/8.11.1/checksums/sha1-checksums.bin | Bin 44093 -> 45281 bytes .../8.11.1/executionHistory/executionHistory.bin | Bin 19560 -> 92302 bytes .../8.11.1/executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/8.11.1/fileHashes/fileHashes.bin | Bin 18697 -> 26347 bytes .../.gradle/8.11.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/buildOutputCleanup.lock | Bin 17 -> 17 bytes .../.gradle/buildOutputCleanup/outputFiles.bin | Bin 18695 -> 22259 bytes wipfel-droid/.gradle/file-system.probe | Bin 8 -> 8 bytes .../main/kotlin/org/flpsed/wipfel/MainActivity.kt | 2 +- wipfel-droid/build.sh | 24 +++++++++++++++++++++ wipfel-droid/gradle.properties | 1 + 17 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 wipfel-droid/.gitignore create mode 100755 wipfel-droid/build.sh (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 8ae78c4..78961fc 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -220,8 +220,12 @@ pub fn app() -> Html { use_effect_with((), move |_| { spawn_local(async move { let result = async { - let gz = bridge::fetch_bytes("gipfel.dat.gz").await?; - let raw = gunzip(&gz)?; + // aapt gunzips .gz assets, so an APK ships the plain + // gipfel.dat while the web dist ships gipfel.dat.gz + let raw = match bridge::fetch_bytes("gipfel.dat.gz").await { + Ok(gz) => gunzip(&gz)?, + Err(_) => bridge::fetch_bytes("gipfel.dat").await?, + }; pan.borrow_mut() .load_data_from_bytes(&raw) .map_err(|e| format!("load: {e}")) diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index d312617..e1eedc0 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -605,7 +605,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 75, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, @@ -615,7 +615,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 76, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 77, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); return ret; }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index 470fd43..3b906d2 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ diff --git a/wipfel-droid/.gitignore b/wipfel-droid/.gitignore new file mode 100644 index 0000000..1fed1dc --- /dev/null +++ b/wipfel-droid/.gitignore @@ -0,0 +1,5 @@ +.gradle/ +build/ +app/build/ +local.properties +app/src/main/assets/www/ diff --git a/wipfel-droid/.gradle/8.11.1/checksums/checksums.lock b/wipfel-droid/.gradle/8.11.1/checksums/checksums.lock index 532a57c..2504abf 100644 Binary files a/wipfel-droid/.gradle/8.11.1/checksums/checksums.lock and b/wipfel-droid/.gradle/8.11.1/checksums/checksums.lock differ diff --git a/wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin b/wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin index 53a3b95..2728bcf 100644 Binary files a/wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin and b/wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin differ diff --git a/wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin b/wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin index 43f2251..6848c74 100644 Binary files a/wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin and b/wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin differ diff --git a/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin index 7a97448..578da20 100644 Binary files a/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin and b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin differ diff --git a/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock index 62e3db2..23a576d 100644 Binary files a/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock and b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock differ diff --git a/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin index ab9d95d..d39e551 100644 Binary files a/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin and b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin differ diff --git a/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock index 15a08b4..8963f7a 100644 Binary files a/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock and b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock differ diff --git a/wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 023be44..d2bce45 100644 Binary files a/wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin b/wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin index ffc4b41..6687b95 100644 Binary files a/wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin and b/wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/wipfel-droid/.gradle/file-system.probe b/wipfel-droid/.gradle/file-system.probe index 147f004..7fa8b5e 100644 Binary files a/wipfel-droid/.gradle/file-system.probe and b/wipfel-droid/.gradle/file-system.probe differ diff --git a/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt b/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt index 8a62a4a..ae2485d 100644 --- a/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt +++ b/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt @@ -81,7 +81,7 @@ class MainActivity : Activity() { val uris: Array? = if (resultCode == RESULT_OK && data != null) { val clip = data.clipData when { - clip != null -> Array(clip.itemCount) { clip.getItem(it).uri } + clip != null -> Array(clip.itemCount) { clip.getItemAt(it).uri } data.data != null -> arrayOf(data.data!!) else -> null } diff --git a/wipfel-droid/build.sh b/wipfel-droid/build.sh new file mode 100755 index 0000000..c724374 --- /dev/null +++ b/wipfel-droid/build.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# Build the wipfel Android wrapper: wasm site -> assets -> debug APK. +# Requires: wasm32 target + wasm-bindgen (cargo), Android SDK, JDK 17+. +set -euo pipefail +here="$(cd "$(dirname "$0")" && pwd)" +repo="$(cd "$here/.." && pwd)" + +export ANDROID_HOME="${ANDROID_HOME:-$HOME/android-sdk}" +export PATH="$PATH:$HOME/.cargo/bin" + +echo "==> building wipfel release site" +( cd "$repo/crates/wipfel" && ./build-release.sh >/dev/null ) + +echo "==> staging assets" +mkdir -p "$here/app/src/main/assets/www" +rm -f "$here/app/src/main/assets/www/"* +cp "$repo/dist/wipfel/"* "$here/app/src/main/assets/www/" + +echo "==> gradle assembleDebug" +( cd "$here" && ./gradlew assembleDebug --no-daemon -q ) + +apk="$here/app/build/outputs/apk/debug/app-debug.apk" +echo "==> done: $apk ($(stat -c%s "$apk") bytes)" +echo " install: adb install -r $apk" diff --git a/wipfel-droid/gradle.properties b/wipfel-droid/gradle.properties index 589cec0..92851f5 100644 --- a/wipfel-droid/gradle.properties +++ b/wipfel-droid/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx3g android.useAndroidX=true kotlin.code.style=official +org.gradle.java.home=/home/agent/jdk21 -- cgit v1.2.3 From 2df51e89039b9b160aafb52b700e874411eb0555 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 19:13:03 +0100 Subject: wipfel: PWA — manifest, service worker, Web Share Target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - manifest.webmanifest: standalone, dark theme, mountain icons (regular + maskable) - sw.js: network-first with cache fallback -> full offline after first visit (wasm + hill DB included); versioned cache, stale caches pruned - share_target: images shared to the installed app are POSTed to __share; the SW stashes the bytes at __shared and redirects with ?shared=1; the app picks them up on startup and cleans the URL - index.html: manifest link, theme-color, icons, SW registration - build/serve scripts ship the new files; dist refreshed Note: sharing does not bypass AOSP GPS redaction when the share source passes a MediaStore URI (the browser is still the reader) — the .nomedia/rename trick remains the way to get GPS EXIF into a browser. --- crates/wipfel/build-release.sh | 3 + crates/wipfel/serve-here.sh | 3 + crates/wipfel/src/app.rs | 32 +++++++ crates/wipfel/www/icons/icon-192.png | Bin 0 -> 1425 bytes crates/wipfel/www/icons/icon-512.png | Bin 0 -> 4371 bytes crates/wipfel/www/icons/icon-maskable-512.png | Bin 0 -> 4005 bytes crates/wipfel/www/index.html | 11 +++ crates/wipfel/www/manifest.webmanifest | 25 ++++++ crates/wipfel/www/sw.js | 115 ++++++++++++++++++++++++++ dist/wipfel/icons/icon-192.png | Bin 0 -> 1425 bytes dist/wipfel/icons/icon-512.png | Bin 0 -> 4371 bytes dist/wipfel/icons/icon-maskable-512.png | Bin 0 -> 4005 bytes dist/wipfel/index.html | 11 +++ dist/wipfel/manifest.webmanifest | 25 ++++++ dist/wipfel/sw.js | 115 ++++++++++++++++++++++++++ dist/wipfel/wipfel.js | 22 ++++- dist/wipfel/wipfel_bg.wasm | Bin 511473 -> 515519 bytes 17 files changed, 360 insertions(+), 2 deletions(-) create mode 100644 crates/wipfel/www/icons/icon-192.png create mode 100644 crates/wipfel/www/icons/icon-512.png create mode 100644 crates/wipfel/www/icons/icon-maskable-512.png create mode 100644 crates/wipfel/www/manifest.webmanifest create mode 100644 crates/wipfel/www/sw.js create mode 100644 dist/wipfel/icons/icon-192.png create mode 100644 dist/wipfel/icons/icon-512.png create mode 100644 dist/wipfel/icons/icon-maskable-512.png create mode 100644 dist/wipfel/manifest.webmanifest create mode 100644 dist/wipfel/sw.js (limited to 'dist') diff --git a/crates/wipfel/build-release.sh b/crates/wipfel/build-release.sh index 1ee09b7..bf41513 100755 --- a/crates/wipfel/build-release.sh +++ b/crates/wipfel/build-release.sh @@ -16,6 +16,9 @@ wasm-bindgen --remove-name-section --target web --out-dir "$DIST" target/wasm32- # the loader page (not the trunk entry point, which is dev-only) rm -f "$DIST"/wipfel.d.ts "$DIST"/wipfel_bg.wasm.d.ts cp crates/wipfel/www/index.html crates/wipfel/www/style.css "$DIST/" +cp crates/wipfel/www/sw.js crates/wipfel/www/manifest.webmanifest "$DIST/" +mkdir -p "$DIST/icons" +cp crates/wipfel/www/icons/*.png "$DIST/icons/" gzip -9 -n -c gipfel.dat > "$DIST/gipfel.dat.gz" echo "site assembled in $DIST ($(du -sh "$DIST" | cut -f1)):" ls "$DIST" diff --git a/crates/wipfel/serve-here.sh b/crates/wipfel/serve-here.sh index 2accdb9..9951829 100755 --- a/crates/wipfel/serve-here.sh +++ b/crates/wipfel/serve-here.sh @@ -8,5 +8,8 @@ DIST=/tmp/wipfel-dist mkdir -p "$DIST" wasm-bindgen --target web --out-dir "$DIST" target/wasm32-unknown-unknown/release/wipfel.wasm cp crates/wipfel/www/index.html crates/wipfel/www/style.css "$DIST/" +cp crates/wipfel/www/sw.js crates/wipfel/www/manifest.webmanifest "$DIST/" +mkdir -p "$DIST/icons" +cp crates/wipfel/www/icons/*.png "$DIST/icons/" gzip -9 -n -c gipfel.dat > "$DIST/gipfel.dat.gz" echo "dist refreshed: $(ls -la "$DIST" | awk '{s+=$5} END {print s" bytes"}')" diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 78961fc..441f17c 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -11,6 +11,7 @@ use gipfel_core::metadata::{apply_image_metadata, ImageMetaData}; use gipfel_core::panorama::Panorama; use wasm_bindgen::closure::Closure; use wasm_bindgen::JsCast; +use wasm_bindgen::JsValue; use wasm_bindgen_futures::spawn_local; use web_sys::{DragEvent, Event, HtmlCanvasElement, HtmlInputElement, InputEvent, MouseEvent}; use yew::prelude::*; @@ -450,6 +451,37 @@ pub fn app() -> Html { }) }; + // Web Share Target handoff: the service worker stashes the shared + // file at `__shared` and redirects here with ?shared=1 + { + let load_bytes = load_bytes.clone(); + let status = status.clone(); + use_effect_with((), move |_| { + let shared = web_sys::window() + .map(|w| { + w.location() + .search() + .map(|s| s.contains("shared=1")) + .unwrap_or(false) + }) + .unwrap_or(false); + if shared { + spawn_local(async move { + match bridge::fetch_bytes("__shared").await { + Ok(bytes) => load_bytes.emit((bytes, "shared image".into())), + Err(e) => status.set(format!("shared image missing: {e}")), + } + }); + if let Some(w) = web_sys::window() { + let _ = w + .history() + .and_then(|h| h.replace_state_with_url(&JsValue::NULL, "", Some("./"))); + } + } + || () + }); + } + let on_drop = { let read_file = read_file.clone(); let status = status.clone(); diff --git a/crates/wipfel/www/icons/icon-192.png b/crates/wipfel/www/icons/icon-192.png new file mode 100644 index 0000000..07262f1 Binary files /dev/null and b/crates/wipfel/www/icons/icon-192.png differ diff --git a/crates/wipfel/www/icons/icon-512.png b/crates/wipfel/www/icons/icon-512.png new file mode 100644 index 0000000..e1f8dd0 Binary files /dev/null and b/crates/wipfel/www/icons/icon-512.png differ diff --git a/crates/wipfel/www/icons/icon-maskable-512.png b/crates/wipfel/www/icons/icon-maskable-512.png new file mode 100644 index 0000000..6dd4595 Binary files /dev/null and b/crates/wipfel/www/icons/icon-maskable-512.png differ diff --git a/crates/wipfel/www/index.html b/crates/wipfel/www/index.html index 98f81e8..69dd433 100644 --- a/crates/wipfel/www/index.html +++ b/crates/wipfel/www/index.html @@ -3,7 +3,11 @@ + wipfel — web based gipfel photogrammetry + + + @@ -11,5 +15,12 @@ import init from './wipfel.js'; init(); + diff --git a/crates/wipfel/www/manifest.webmanifest b/crates/wipfel/www/manifest.webmanifest new file mode 100644 index 0000000..29996fb --- /dev/null +++ b/crates/wipfel/www/manifest.webmanifest @@ -0,0 +1,25 @@ +{ + "name": "wipfel — web based gipfel photogrammetry", + "short_name": "wipfel", + "description": "Measure mountains from photographs. All processing stays on your device.", + "start_url": "./", + "scope": "./", + "display": "standalone", + "background_color": "#141418", + "theme_color": "#141418", + "icons": [ + { "src": "icons/icon-192.png", "sizes": "192x192", "type": "image/png" }, + { "src": "icons/icon-512.png", "sizes": "512x512", "type": "image/png" }, + { "src": "icons/icon-maskable-512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" } + ], + "share_target": { + "action": "__share", + "method": "POST", + "enctype": "multipart/form-data", + "params": { + "files": [ + { "name": "files", "accept": ["image/jpeg", "image/png", "image/webp"] } + ] + } + } +} diff --git a/crates/wipfel/www/sw.js b/crates/wipfel/www/sw.js new file mode 100644 index 0000000..2a5cfdc --- /dev/null +++ b/crates/wipfel/www/sw.js @@ -0,0 +1,115 @@ +/* wipfel service worker: full offline + Web Share Target. + * + * Strategy: network-first with cache fallback, so an online app is + * always fresh and the app still starts offline after the first visit. + * + * Share target: the browser POSTs multipart/form-data to __share; we + * stash the file in a cache under __shared and redirect to the app + * with ?shared=1, which the app picks up on startup. + */ +const VERSION = "wipfel-v1"; +const SHARE_CACHE = "wipfel-share"; +const base = self.registration.scope; +const url = (p) => new URL(p, base).href; +const sharePath = new URL("__share", base).pathname; +const sharedPath = new URL("__shared", base).pathname; + +const SHELL = [ + "", + "index.html", + "wipfel.js", + "wipfel_bg.wasm", + "style.css", + "gipfel.dat.gz", + "manifest.webmanifest", + "icons/icon-192.png", + "icons/icon-512.png", + "icons/icon-maskable-512.png", +].map(url); + +self.addEventListener("install", (e) => { + e.waitUntil( + caches + .open(VERSION) + .then((c) => c.addAll(SHELL)) + .then(() => self.skipWaiting()) + ); +}); + +self.addEventListener("activate", (e) => { + e.waitUntil( + caches + .keys() + .then((keys) => + Promise.all( + keys.filter((k) => k !== VERSION && k !== SHARE_CACHE).map((k) => caches.delete(k)) + ) + ) + .then(() => self.clients.claim()) + ); +}); + +self.addEventListener("fetch", (e) => { + const req = e.request; + const u = new URL(req.url); + if (u.origin !== self.location.origin) return; + + // Web Share Target handoff + if (req.method === "POST" && u.pathname === sharePath) { + e.respondWith( + (async () => { + const form = await req.formData(); + const file = form.getAll("files")[0] || form.get("files"); + if (file && file.size) { + const buf = await file.arrayBuffer(); + const cache = await caches.open(SHARE_CACHE); + await cache.put( + sharedPath, + new Response(buf, { + headers: { + "Content-Type": file.type || "image/jpeg", + "X-File-Name": encodeURIComponent(file.name || "shared.jpg"), + }, + }) + ); + } + return Response.redirect(url("?shared=1"), 303); + })() + ); + return; + } + + // the stashed shared image + if (req.method === "GET" && u.pathname === sharedPath) { + e.respondWith( + caches.open(SHARE_CACHE).then((c) => + c.match(sharedPath).then( + (r) => r || new Response("no shared image", { status: 410 }) + ) + ) + ); + return; + } + + // app assets: network first, cache fallback + e.respondWith( + (async () => { + try { + const res = await fetch(req); + if (res.ok) { + const cache = await caches.open(VERSION); + cache.put(req, res.clone()); + } + return res; + } catch (err) { + const cached = await caches.match(req, { ignoreSearch: true }); + if (cached) return cached; + if (req.mode === "navigate") { + const idx = await caches.match(url("index.html")); + if (idx) return idx; + } + throw err; + } + })() + ); +}); diff --git a/dist/wipfel/icons/icon-192.png b/dist/wipfel/icons/icon-192.png new file mode 100644 index 0000000..07262f1 Binary files /dev/null and b/dist/wipfel/icons/icon-192.png differ diff --git a/dist/wipfel/icons/icon-512.png b/dist/wipfel/icons/icon-512.png new file mode 100644 index 0000000..e1f8dd0 Binary files /dev/null and b/dist/wipfel/icons/icon-512.png differ diff --git a/dist/wipfel/icons/icon-maskable-512.png b/dist/wipfel/icons/icon-maskable-512.png new file mode 100644 index 0000000..6dd4595 Binary files /dev/null and b/dist/wipfel/icons/icon-maskable-512.png differ diff --git a/dist/wipfel/index.html b/dist/wipfel/index.html index 98f81e8..69dd433 100644 --- a/dist/wipfel/index.html +++ b/dist/wipfel/index.html @@ -3,7 +3,11 @@ + wipfel — web based gipfel photogrammetry + + + @@ -11,5 +15,12 @@ import init from './wipfel.js'; init(); + diff --git a/dist/wipfel/manifest.webmanifest b/dist/wipfel/manifest.webmanifest new file mode 100644 index 0000000..29996fb --- /dev/null +++ b/dist/wipfel/manifest.webmanifest @@ -0,0 +1,25 @@ +{ + "name": "wipfel — web based gipfel photogrammetry", + "short_name": "wipfel", + "description": "Measure mountains from photographs. All processing stays on your device.", + "start_url": "./", + "scope": "./", + "display": "standalone", + "background_color": "#141418", + "theme_color": "#141418", + "icons": [ + { "src": "icons/icon-192.png", "sizes": "192x192", "type": "image/png" }, + { "src": "icons/icon-512.png", "sizes": "512x512", "type": "image/png" }, + { "src": "icons/icon-maskable-512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" } + ], + "share_target": { + "action": "__share", + "method": "POST", + "enctype": "multipart/form-data", + "params": { + "files": [ + { "name": "files", "accept": ["image/jpeg", "image/png", "image/webp"] } + ] + } + } +} diff --git a/dist/wipfel/sw.js b/dist/wipfel/sw.js new file mode 100644 index 0000000..2a5cfdc --- /dev/null +++ b/dist/wipfel/sw.js @@ -0,0 +1,115 @@ +/* wipfel service worker: full offline + Web Share Target. + * + * Strategy: network-first with cache fallback, so an online app is + * always fresh and the app still starts offline after the first visit. + * + * Share target: the browser POSTs multipart/form-data to __share; we + * stash the file in a cache under __shared and redirect to the app + * with ?shared=1, which the app picks up on startup. + */ +const VERSION = "wipfel-v1"; +const SHARE_CACHE = "wipfel-share"; +const base = self.registration.scope; +const url = (p) => new URL(p, base).href; +const sharePath = new URL("__share", base).pathname; +const sharedPath = new URL("__shared", base).pathname; + +const SHELL = [ + "", + "index.html", + "wipfel.js", + "wipfel_bg.wasm", + "style.css", + "gipfel.dat.gz", + "manifest.webmanifest", + "icons/icon-192.png", + "icons/icon-512.png", + "icons/icon-maskable-512.png", +].map(url); + +self.addEventListener("install", (e) => { + e.waitUntil( + caches + .open(VERSION) + .then((c) => c.addAll(SHELL)) + .then(() => self.skipWaiting()) + ); +}); + +self.addEventListener("activate", (e) => { + e.waitUntil( + caches + .keys() + .then((keys) => + Promise.all( + keys.filter((k) => k !== VERSION && k !== SHARE_CACHE).map((k) => caches.delete(k)) + ) + ) + .then(() => self.clients.claim()) + ); +}); + +self.addEventListener("fetch", (e) => { + const req = e.request; + const u = new URL(req.url); + if (u.origin !== self.location.origin) return; + + // Web Share Target handoff + if (req.method === "POST" && u.pathname === sharePath) { + e.respondWith( + (async () => { + const form = await req.formData(); + const file = form.getAll("files")[0] || form.get("files"); + if (file && file.size) { + const buf = await file.arrayBuffer(); + const cache = await caches.open(SHARE_CACHE); + await cache.put( + sharedPath, + new Response(buf, { + headers: { + "Content-Type": file.type || "image/jpeg", + "X-File-Name": encodeURIComponent(file.name || "shared.jpg"), + }, + }) + ); + } + return Response.redirect(url("?shared=1"), 303); + })() + ); + return; + } + + // the stashed shared image + if (req.method === "GET" && u.pathname === sharedPath) { + e.respondWith( + caches.open(SHARE_CACHE).then((c) => + c.match(sharedPath).then( + (r) => r || new Response("no shared image", { status: 410 }) + ) + ) + ); + return; + } + + // app assets: network first, cache fallback + e.respondWith( + (async () => { + try { + const res = await fetch(req); + if (res.ok) { + const cache = await caches.open(VERSION); + cache.put(req, res.clone()); + } + return res; + } catch (err) { + const cached = await caches.match(req, { ignoreSearch: true }); + if (cached) return cached; + if (req.mode === "navigate") { + const idx = await caches.match(url("index.html")); + if (idx) return idx; + } + throw err; + } + })() + ); +}); diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index e1eedc0..9e90bc5 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -210,6 +210,10 @@ function __wbg_get_imports() { const ret = arg0.height; return ret; }, + __wbg_history_4128e7793fa4758c: function() { return handleError(function (arg0) { + const ret = arg0.history; + return ret; + }, arguments); }, __wbg_host_c1e5897b2ece281c: function(arg0) { const ret = arg0.host; return ret; @@ -313,6 +317,10 @@ function __wbg_get_imports() { const ret = arg0.__yew_listener_id; return isLikeNone(ret) ? Number.MAX_SAFE_INTEGER : (ret) >>> 0; }, + __wbg_location_9c46e8ada95d3174: function(arg0) { + const ret = arg0.location; + return ret; + }, __wbg_measureText_1035b288be51876c: function() { return handleError(function (arg0, arg1, arg2) { const ret = arg0.measureText(getStringFromWasm0(arg1, arg2)); return ret; @@ -441,10 +449,20 @@ function __wbg_get_imports() { const ret = arg0.removeChild(arg1); return ret; }, arguments); }, + __wbg_replaceState_8814bbf1e44e1990: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5) { + arg0.replaceState(arg1, getStringFromWasm0(arg2, arg3), arg4 === 0 ? undefined : getStringFromWasm0(arg4, arg5)); + }, arguments); }, __wbg_resolve_0076e10020304ede: function(arg0) { const ret = Promise.resolve(arg0); return ret; }, + __wbg_search_31c06ba77ebf51f4: function() { return handleError(function (arg0, arg1) { + const ret = arg1.search; + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }, arguments); }, __wbg_setAttribute_9e7d603908f63705: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { arg0.setAttribute(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); }, arguments); }, @@ -605,7 +623,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 75, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 70, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, @@ -615,7 +633,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 77, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 72, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); return ret; }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index 3b906d2..97cec2d 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From b084d94e484aa057cc839892c6e49df3caf8a0e6 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 20:01:00 +0100 Subject: Revert "wipfel: PWA — manifest, service worker, Web Share Target" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2df51e89039b9b160aafb52b700e874411eb0555. --- crates/wipfel/build-release.sh | 3 - crates/wipfel/serve-here.sh | 3 - crates/wipfel/src/app.rs | 32 ------- crates/wipfel/www/icons/icon-192.png | Bin 1425 -> 0 bytes crates/wipfel/www/icons/icon-512.png | Bin 4371 -> 0 bytes crates/wipfel/www/icons/icon-maskable-512.png | Bin 4005 -> 0 bytes crates/wipfel/www/index.html | 11 --- crates/wipfel/www/manifest.webmanifest | 25 ------ crates/wipfel/www/sw.js | 115 -------------------------- dist/wipfel/icons/icon-192.png | Bin 1425 -> 0 bytes dist/wipfel/icons/icon-512.png | Bin 4371 -> 0 bytes dist/wipfel/icons/icon-maskable-512.png | Bin 4005 -> 0 bytes dist/wipfel/index.html | 11 --- dist/wipfel/manifest.webmanifest | 25 ------ dist/wipfel/sw.js | 115 -------------------------- dist/wipfel/wipfel.js | 22 +---- dist/wipfel/wipfel_bg.wasm | Bin 515519 -> 511473 bytes 17 files changed, 2 insertions(+), 360 deletions(-) delete mode 100644 crates/wipfel/www/icons/icon-192.png delete mode 100644 crates/wipfel/www/icons/icon-512.png delete mode 100644 crates/wipfel/www/icons/icon-maskable-512.png delete mode 100644 crates/wipfel/www/manifest.webmanifest delete mode 100644 crates/wipfel/www/sw.js delete mode 100644 dist/wipfel/icons/icon-192.png delete mode 100644 dist/wipfel/icons/icon-512.png delete mode 100644 dist/wipfel/icons/icon-maskable-512.png delete mode 100644 dist/wipfel/manifest.webmanifest delete mode 100644 dist/wipfel/sw.js (limited to 'dist') diff --git a/crates/wipfel/build-release.sh b/crates/wipfel/build-release.sh index bf41513..1ee09b7 100755 --- a/crates/wipfel/build-release.sh +++ b/crates/wipfel/build-release.sh @@ -16,9 +16,6 @@ wasm-bindgen --remove-name-section --target web --out-dir "$DIST" target/wasm32- # the loader page (not the trunk entry point, which is dev-only) rm -f "$DIST"/wipfel.d.ts "$DIST"/wipfel_bg.wasm.d.ts cp crates/wipfel/www/index.html crates/wipfel/www/style.css "$DIST/" -cp crates/wipfel/www/sw.js crates/wipfel/www/manifest.webmanifest "$DIST/" -mkdir -p "$DIST/icons" -cp crates/wipfel/www/icons/*.png "$DIST/icons/" gzip -9 -n -c gipfel.dat > "$DIST/gipfel.dat.gz" echo "site assembled in $DIST ($(du -sh "$DIST" | cut -f1)):" ls "$DIST" diff --git a/crates/wipfel/serve-here.sh b/crates/wipfel/serve-here.sh index 9951829..2accdb9 100755 --- a/crates/wipfel/serve-here.sh +++ b/crates/wipfel/serve-here.sh @@ -8,8 +8,5 @@ DIST=/tmp/wipfel-dist mkdir -p "$DIST" wasm-bindgen --target web --out-dir "$DIST" target/wasm32-unknown-unknown/release/wipfel.wasm cp crates/wipfel/www/index.html crates/wipfel/www/style.css "$DIST/" -cp crates/wipfel/www/sw.js crates/wipfel/www/manifest.webmanifest "$DIST/" -mkdir -p "$DIST/icons" -cp crates/wipfel/www/icons/*.png "$DIST/icons/" gzip -9 -n -c gipfel.dat > "$DIST/gipfel.dat.gz" echo "dist refreshed: $(ls -la "$DIST" | awk '{s+=$5} END {print s" bytes"}')" diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 441f17c..78961fc 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -11,7 +11,6 @@ use gipfel_core::metadata::{apply_image_metadata, ImageMetaData}; use gipfel_core::panorama::Panorama; use wasm_bindgen::closure::Closure; use wasm_bindgen::JsCast; -use wasm_bindgen::JsValue; use wasm_bindgen_futures::spawn_local; use web_sys::{DragEvent, Event, HtmlCanvasElement, HtmlInputElement, InputEvent, MouseEvent}; use yew::prelude::*; @@ -451,37 +450,6 @@ pub fn app() -> Html { }) }; - // Web Share Target handoff: the service worker stashes the shared - // file at `__shared` and redirects here with ?shared=1 - { - let load_bytes = load_bytes.clone(); - let status = status.clone(); - use_effect_with((), move |_| { - let shared = web_sys::window() - .map(|w| { - w.location() - .search() - .map(|s| s.contains("shared=1")) - .unwrap_or(false) - }) - .unwrap_or(false); - if shared { - spawn_local(async move { - match bridge::fetch_bytes("__shared").await { - Ok(bytes) => load_bytes.emit((bytes, "shared image".into())), - Err(e) => status.set(format!("shared image missing: {e}")), - } - }); - if let Some(w) = web_sys::window() { - let _ = w - .history() - .and_then(|h| h.replace_state_with_url(&JsValue::NULL, "", Some("./"))); - } - } - || () - }); - } - let on_drop = { let read_file = read_file.clone(); let status = status.clone(); diff --git a/crates/wipfel/www/icons/icon-192.png b/crates/wipfel/www/icons/icon-192.png deleted file mode 100644 index 07262f1..0000000 Binary files a/crates/wipfel/www/icons/icon-192.png and /dev/null differ diff --git a/crates/wipfel/www/icons/icon-512.png b/crates/wipfel/www/icons/icon-512.png deleted file mode 100644 index e1f8dd0..0000000 Binary files a/crates/wipfel/www/icons/icon-512.png and /dev/null differ diff --git a/crates/wipfel/www/icons/icon-maskable-512.png b/crates/wipfel/www/icons/icon-maskable-512.png deleted file mode 100644 index 6dd4595..0000000 Binary files a/crates/wipfel/www/icons/icon-maskable-512.png and /dev/null differ diff --git a/crates/wipfel/www/index.html b/crates/wipfel/www/index.html index 69dd433..98f81e8 100644 --- a/crates/wipfel/www/index.html +++ b/crates/wipfel/www/index.html @@ -3,11 +3,7 @@ - wipfel — web based gipfel photogrammetry - - - @@ -15,12 +11,5 @@ import init from './wipfel.js'; init(); - diff --git a/crates/wipfel/www/manifest.webmanifest b/crates/wipfel/www/manifest.webmanifest deleted file mode 100644 index 29996fb..0000000 --- a/crates/wipfel/www/manifest.webmanifest +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "wipfel — web based gipfel photogrammetry", - "short_name": "wipfel", - "description": "Measure mountains from photographs. All processing stays on your device.", - "start_url": "./", - "scope": "./", - "display": "standalone", - "background_color": "#141418", - "theme_color": "#141418", - "icons": [ - { "src": "icons/icon-192.png", "sizes": "192x192", "type": "image/png" }, - { "src": "icons/icon-512.png", "sizes": "512x512", "type": "image/png" }, - { "src": "icons/icon-maskable-512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" } - ], - "share_target": { - "action": "__share", - "method": "POST", - "enctype": "multipart/form-data", - "params": { - "files": [ - { "name": "files", "accept": ["image/jpeg", "image/png", "image/webp"] } - ] - } - } -} diff --git a/crates/wipfel/www/sw.js b/crates/wipfel/www/sw.js deleted file mode 100644 index 2a5cfdc..0000000 --- a/crates/wipfel/www/sw.js +++ /dev/null @@ -1,115 +0,0 @@ -/* wipfel service worker: full offline + Web Share Target. - * - * Strategy: network-first with cache fallback, so an online app is - * always fresh and the app still starts offline after the first visit. - * - * Share target: the browser POSTs multipart/form-data to __share; we - * stash the file in a cache under __shared and redirect to the app - * with ?shared=1, which the app picks up on startup. - */ -const VERSION = "wipfel-v1"; -const SHARE_CACHE = "wipfel-share"; -const base = self.registration.scope; -const url = (p) => new URL(p, base).href; -const sharePath = new URL("__share", base).pathname; -const sharedPath = new URL("__shared", base).pathname; - -const SHELL = [ - "", - "index.html", - "wipfel.js", - "wipfel_bg.wasm", - "style.css", - "gipfel.dat.gz", - "manifest.webmanifest", - "icons/icon-192.png", - "icons/icon-512.png", - "icons/icon-maskable-512.png", -].map(url); - -self.addEventListener("install", (e) => { - e.waitUntil( - caches - .open(VERSION) - .then((c) => c.addAll(SHELL)) - .then(() => self.skipWaiting()) - ); -}); - -self.addEventListener("activate", (e) => { - e.waitUntil( - caches - .keys() - .then((keys) => - Promise.all( - keys.filter((k) => k !== VERSION && k !== SHARE_CACHE).map((k) => caches.delete(k)) - ) - ) - .then(() => self.clients.claim()) - ); -}); - -self.addEventListener("fetch", (e) => { - const req = e.request; - const u = new URL(req.url); - if (u.origin !== self.location.origin) return; - - // Web Share Target handoff - if (req.method === "POST" && u.pathname === sharePath) { - e.respondWith( - (async () => { - const form = await req.formData(); - const file = form.getAll("files")[0] || form.get("files"); - if (file && file.size) { - const buf = await file.arrayBuffer(); - const cache = await caches.open(SHARE_CACHE); - await cache.put( - sharedPath, - new Response(buf, { - headers: { - "Content-Type": file.type || "image/jpeg", - "X-File-Name": encodeURIComponent(file.name || "shared.jpg"), - }, - }) - ); - } - return Response.redirect(url("?shared=1"), 303); - })() - ); - return; - } - - // the stashed shared image - if (req.method === "GET" && u.pathname === sharedPath) { - e.respondWith( - caches.open(SHARE_CACHE).then((c) => - c.match(sharedPath).then( - (r) => r || new Response("no shared image", { status: 410 }) - ) - ) - ); - return; - } - - // app assets: network first, cache fallback - e.respondWith( - (async () => { - try { - const res = await fetch(req); - if (res.ok) { - const cache = await caches.open(VERSION); - cache.put(req, res.clone()); - } - return res; - } catch (err) { - const cached = await caches.match(req, { ignoreSearch: true }); - if (cached) return cached; - if (req.mode === "navigate") { - const idx = await caches.match(url("index.html")); - if (idx) return idx; - } - throw err; - } - })() - ); -}); diff --git a/dist/wipfel/icons/icon-192.png b/dist/wipfel/icons/icon-192.png deleted file mode 100644 index 07262f1..0000000 Binary files a/dist/wipfel/icons/icon-192.png and /dev/null differ diff --git a/dist/wipfel/icons/icon-512.png b/dist/wipfel/icons/icon-512.png deleted file mode 100644 index e1f8dd0..0000000 Binary files a/dist/wipfel/icons/icon-512.png and /dev/null differ diff --git a/dist/wipfel/icons/icon-maskable-512.png b/dist/wipfel/icons/icon-maskable-512.png deleted file mode 100644 index 6dd4595..0000000 Binary files a/dist/wipfel/icons/icon-maskable-512.png and /dev/null differ diff --git a/dist/wipfel/index.html b/dist/wipfel/index.html index 69dd433..98f81e8 100644 --- a/dist/wipfel/index.html +++ b/dist/wipfel/index.html @@ -3,11 +3,7 @@ - wipfel — web based gipfel photogrammetry - - - @@ -15,12 +11,5 @@ import init from './wipfel.js'; init(); - diff --git a/dist/wipfel/manifest.webmanifest b/dist/wipfel/manifest.webmanifest deleted file mode 100644 index 29996fb..0000000 --- a/dist/wipfel/manifest.webmanifest +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "wipfel — web based gipfel photogrammetry", - "short_name": "wipfel", - "description": "Measure mountains from photographs. All processing stays on your device.", - "start_url": "./", - "scope": "./", - "display": "standalone", - "background_color": "#141418", - "theme_color": "#141418", - "icons": [ - { "src": "icons/icon-192.png", "sizes": "192x192", "type": "image/png" }, - { "src": "icons/icon-512.png", "sizes": "512x512", "type": "image/png" }, - { "src": "icons/icon-maskable-512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" } - ], - "share_target": { - "action": "__share", - "method": "POST", - "enctype": "multipart/form-data", - "params": { - "files": [ - { "name": "files", "accept": ["image/jpeg", "image/png", "image/webp"] } - ] - } - } -} diff --git a/dist/wipfel/sw.js b/dist/wipfel/sw.js deleted file mode 100644 index 2a5cfdc..0000000 --- a/dist/wipfel/sw.js +++ /dev/null @@ -1,115 +0,0 @@ -/* wipfel service worker: full offline + Web Share Target. - * - * Strategy: network-first with cache fallback, so an online app is - * always fresh and the app still starts offline after the first visit. - * - * Share target: the browser POSTs multipart/form-data to __share; we - * stash the file in a cache under __shared and redirect to the app - * with ?shared=1, which the app picks up on startup. - */ -const VERSION = "wipfel-v1"; -const SHARE_CACHE = "wipfel-share"; -const base = self.registration.scope; -const url = (p) => new URL(p, base).href; -const sharePath = new URL("__share", base).pathname; -const sharedPath = new URL("__shared", base).pathname; - -const SHELL = [ - "", - "index.html", - "wipfel.js", - "wipfel_bg.wasm", - "style.css", - "gipfel.dat.gz", - "manifest.webmanifest", - "icons/icon-192.png", - "icons/icon-512.png", - "icons/icon-maskable-512.png", -].map(url); - -self.addEventListener("install", (e) => { - e.waitUntil( - caches - .open(VERSION) - .then((c) => c.addAll(SHELL)) - .then(() => self.skipWaiting()) - ); -}); - -self.addEventListener("activate", (e) => { - e.waitUntil( - caches - .keys() - .then((keys) => - Promise.all( - keys.filter((k) => k !== VERSION && k !== SHARE_CACHE).map((k) => caches.delete(k)) - ) - ) - .then(() => self.clients.claim()) - ); -}); - -self.addEventListener("fetch", (e) => { - const req = e.request; - const u = new URL(req.url); - if (u.origin !== self.location.origin) return; - - // Web Share Target handoff - if (req.method === "POST" && u.pathname === sharePath) { - e.respondWith( - (async () => { - const form = await req.formData(); - const file = form.getAll("files")[0] || form.get("files"); - if (file && file.size) { - const buf = await file.arrayBuffer(); - const cache = await caches.open(SHARE_CACHE); - await cache.put( - sharedPath, - new Response(buf, { - headers: { - "Content-Type": file.type || "image/jpeg", - "X-File-Name": encodeURIComponent(file.name || "shared.jpg"), - }, - }) - ); - } - return Response.redirect(url("?shared=1"), 303); - })() - ); - return; - } - - // the stashed shared image - if (req.method === "GET" && u.pathname === sharedPath) { - e.respondWith( - caches.open(SHARE_CACHE).then((c) => - c.match(sharedPath).then( - (r) => r || new Response("no shared image", { status: 410 }) - ) - ) - ); - return; - } - - // app assets: network first, cache fallback - e.respondWith( - (async () => { - try { - const res = await fetch(req); - if (res.ok) { - const cache = await caches.open(VERSION); - cache.put(req, res.clone()); - } - return res; - } catch (err) { - const cached = await caches.match(req, { ignoreSearch: true }); - if (cached) return cached; - if (req.mode === "navigate") { - const idx = await caches.match(url("index.html")); - if (idx) return idx; - } - throw err; - } - })() - ); -}); diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index 9e90bc5..e1eedc0 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -210,10 +210,6 @@ function __wbg_get_imports() { const ret = arg0.height; return ret; }, - __wbg_history_4128e7793fa4758c: function() { return handleError(function (arg0) { - const ret = arg0.history; - return ret; - }, arguments); }, __wbg_host_c1e5897b2ece281c: function(arg0) { const ret = arg0.host; return ret; @@ -317,10 +313,6 @@ function __wbg_get_imports() { const ret = arg0.__yew_listener_id; return isLikeNone(ret) ? Number.MAX_SAFE_INTEGER : (ret) >>> 0; }, - __wbg_location_9c46e8ada95d3174: function(arg0) { - const ret = arg0.location; - return ret; - }, __wbg_measureText_1035b288be51876c: function() { return handleError(function (arg0, arg1, arg2) { const ret = arg0.measureText(getStringFromWasm0(arg1, arg2)); return ret; @@ -449,20 +441,10 @@ function __wbg_get_imports() { const ret = arg0.removeChild(arg1); return ret; }, arguments); }, - __wbg_replaceState_8814bbf1e44e1990: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5) { - arg0.replaceState(arg1, getStringFromWasm0(arg2, arg3), arg4 === 0 ? undefined : getStringFromWasm0(arg4, arg5)); - }, arguments); }, __wbg_resolve_0076e10020304ede: function(arg0) { const ret = Promise.resolve(arg0); return ret; }, - __wbg_search_31c06ba77ebf51f4: function() { return handleError(function (arg0, arg1) { - const ret = arg1.search; - const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - const len1 = WASM_VECTOR_LEN; - getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); - getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); - }, arguments); }, __wbg_setAttribute_9e7d603908f63705: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { arg0.setAttribute(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); }, arguments); }, @@ -623,7 +605,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 70, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 75, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, @@ -633,7 +615,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 72, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 77, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); return ret; }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index 97cec2d..3b906d2 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From 4cdfae6ad5d5f9808ebf3078fb4630298051f464 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 20:02:23 +0100 Subject: web: GPS paste field in Viewpoint section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One text field accepting '47.676,13.32042' (optionally ',alt' as a third component; commas, semicolons or spaces as separators) — the format gallery apps show, so the coordinates can simply be copied and pasted. This replaces the PWA/share-target detour for getting a viewpoint onto mobile: EXIF GPS may be redacted by the OS, but the gallery displays the true coordinates for manual transfer. --- crates/wipfel/src/app.rs | 31 ++++++++++++++++++++++++++++++- crates/wipfel/src/widgets.rs | 29 +++++++++++++++++++++++++++++ crates/wipfel/www/style.css | 3 +++ dist/wipfel/style.css | 3 +++ dist/wipfel/wipfel.js | 6 +++--- dist/wipfel/wipfel_bg.wasm | Bin 511473 -> 517699 bytes 6 files changed, 68 insertions(+), 4 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 78961fc..137e121 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -19,7 +19,7 @@ use crate::bridge; use crate::canvas_view::{CanvasView, DotView, MarkerView, TrackView, ViewCallbacks, ViewState}; use crate::compass::{alph_at_img_x, Compass, CompassData}; use crate::markers::{self, Marker}; -use crate::widgets::{NumItem, SliderItem}; +use crate::widgets::{NumItem, SliderItem, TextItem}; /// sidebar-editable view parameters (degrees / meters / mm) #[derive(Clone, Copy, PartialEq)] @@ -548,6 +548,33 @@ pub fn app() -> Html { let on_lat = param_cb!(lat, |p: &mut Panorama, v| p.set_view_lat(v)); let on_lon = param_cb!(lon, |p, v| p.set_view_long(v)); let on_height = param_cb!(height, |p, v| p.set_view_height(v)); + // GPS paste field: "47.676,13.32042" — the format gallery apps show + // for coordinates; height stays a separate field + let on_gps = { + let vp = vp.clone(); + let pan = pan.clone(); + let status = status.clone(); + Callback::from(move |text: String| { + let parts: Vec = text + .replace([';', ' '], ",") + .split(',') + .filter(|p| !p.trim().is_empty()) + .filter_map(|p| p.trim().parse::().ok()) + .collect(); + if parts.len() < 2 || parts[0].abs() > 90.0 || parts[1].abs() > 180.0 { + status.set("GPS: expected \"lat,lon\" like 47.676,13.32042".to_string()); + return; + } + let mut u = *vp; + u.lat = parts[0]; + u.lon = parts[1]; + let mut p = pan.borrow_mut(); + p.set_view_lat(parts[0]); + p.set_view_long(parts[1]); + vp.set(u); + status.set(format!("Viewpoint: {:.5}, {:.5}", parts[0], parts[1])); + }) + }; let on_az = param_cb!(az, |p, v| p.set_center_angle(v)); let on_pitch = param_cb!(pitch, |p, v| p.set_pitch_angle(v)); let on_roll = param_cb!(roll, |p, v| p.set_roll_angle(v)); @@ -929,6 +956,8 @@ pub fn app() -> Html { onchange={on_lon} /> +
{ "Orientation" }
diff --git a/crates/wipfel/src/widgets.rs b/crates/wipfel/src/widgets.rs index 1d22bac..93e2cdc 100644 --- a/crates/wipfel/src/widgets.rs +++ b/crates/wipfel/src/widgets.rs @@ -46,6 +46,35 @@ pub fn slider_item(p: &SliderProps) -> Html { } } +/// single-line text row (e.g. paste a GPS string) +#[derive(Properties, PartialEq)] +pub struct TextProps { + pub label: AttrValue, + pub placeholder: AttrValue, + pub onchange: Callback, +} + +#[function_component(TextItem)] +pub fn text_item(p: &TextProps) -> Html { + let onchange = { + let onchange = p.onchange.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + onchange.emit(input.value()); + }) + }; + html! { + + } +} + #[derive(Properties, PartialEq)] pub struct NumProps { pub label: AttrValue, diff --git a/crates/wipfel/www/style.css b/crates/wipfel/www/style.css index 646444d..79e2dee 100644 --- a/crates/wipfel/www/style.css +++ b/crates/wipfel/www/style.css @@ -216,6 +216,9 @@ canvas.compass { border: 1px solid #34343e; border-radius: 4px; } +.numrow input[type="text"] { + width: 150px; +} .fpbackdrop { position: absolute; inset: 0; diff --git a/dist/wipfel/style.css b/dist/wipfel/style.css index 646444d..79e2dee 100644 --- a/dist/wipfel/style.css +++ b/dist/wipfel/style.css @@ -216,6 +216,9 @@ canvas.compass { border: 1px solid #34343e; border-radius: 4px; } +.numrow input[type="text"] { + width: 150px; +} .fpbackdrop { position: absolute; inset: 0; diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index e1eedc0..648289c 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -600,12 +600,12 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000001: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 47, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 48, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`. const ret = makeMutClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___wasm_bindgen_f1f668f83a5f514b___JsValue__core_37ee0ce0c4cd57d5___result__Result_____wasm_bindgen_f1f668f83a5f514b___JsError___true_); return ret; }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 75, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, @@ -615,7 +615,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 77, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 76, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); return ret; }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index 3b906d2..54e6444 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From 5b0da20a5a2c14060d8f41c7f096778f621c01bc Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 28 Oct 2026 08:24:03 +0100 Subject: web: usability pass — panel state, conditional buttons, track placement, hover distance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - control panel starts open on all screen sizes (so the image picker is reachable on phones); it auto-collapses on narrow screens once an image is loaded - 'Fit to window' and the whole Track section only appear when an image is loaded - Track section moved directly below Display, above the pinned info texts (which now carry the margin-top: auto) - hover readout shows the distance to the peak in km, matching the desktop format 'name · height m · dist km' --- crates/wipfel/src/app.rs | 66 +++++++++++++++++++++++++++----------------- crates/wipfel/www/style.css | 3 +- dist/wipfel/style.css | 3 +- dist/wipfel/wipfel.js | 4 +-- dist/wipfel/wipfel_bg.wasm | Bin 517699 -> 518461 bytes 5 files changed, 47 insertions(+), 29 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 137e121..eae47d9 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -182,16 +182,10 @@ pub fn app() -> Html { let find_peak = use_state(|| Option::::None); let show_hidden = use_state(|| false); let peak_labels = use_state(|| true); - // collapsible control panel (desktop nav bar behaviour): start - // collapsed on narrow screens - let nav_open = use_state(|| { - bridge::window() - .inner_width() - .ok() - .and_then(|w| w.as_f64()) - .unwrap_or(1200.0) - >= 900.0 - }); + // collapsible control panel (desktop nav bar behaviour): open at + // start so the image picker is reachable even on phones; it + // collapses automatically once an image is loaded on a narrow screen + let nav_open = use_state(|| true); // hill indices of the GPS track, in file order let track = use_state(Vec::::new); let track_width = use_state(|| 200.0f64); @@ -362,6 +356,7 @@ pub fn app() -> Html { let img_size = img_size.clone(); let find_peak = find_peak.clone(); let user_moved = user_moved.clone(); + let nav_open = nav_open.clone(); Callback::from(move |(bytes, name): (Vec, String)| { let (bitmap, status, fit, pan, markers, fit_info) = (bitmap.clone(), status.clone(), fit.clone(), pan.clone(), markers.clone(), fit_info.clone()); @@ -369,9 +364,21 @@ pub fn app() -> Html { let img_size = img_size.clone(); let find_peak = find_peak.clone(); let user_moved = user_moved.clone(); + let nav_open = nav_open.clone(); spawn_local(async move { match bridge::decode_bitmap(&bytes).await { Ok(bmp) => { + // narrow screens: give the canvas the room once + // the setup phase is over + let narrow = bridge::window() + .inner_width() + .ok() + .and_then(|w| w.as_f64()) + .unwrap_or(1200.0) + < 900.0; + if narrow { + nav_open.set(false); + } let (w, h) = (bmp.width(), bmp.height()); let mut md = ImageMetaData::new(); md.load_image_from_bytes(&bytes); @@ -824,7 +831,12 @@ pub fn app() -> Html { let name = markers::nearest_hill(&p, ix, iy, 20.0 / view.scale, *show_hidden) .map(|i| { let h = &p.hills[i]; - format!("{} · {:.0} m", h.name, h.height) + format!( + "{} · {:.0} m · {:.2} km", + h.name, + h.height, + p.get_real_distance(i) / 1000.0 + ) }); hover.set(name); }) @@ -930,7 +942,9 @@ pub fn app() -> Html { { "More information…" } - + if bitmap.is_some() { + + } Html { if let Some(h) = hover.as_ref() {

{ h.clone() }

} +
{ "Track" }
+ + if !track.is_empty() { + + } } -

- { "Hover a dot to see the peak · click to mark it (or pick from the list) · drag to adjust · right-click to remove." } -

-

- { "The view is fitted as soon as markers are placed; more markers improve the fit." } -

-
{ "Track" }
- - if !track.is_empty() { - - } +
+

+ { "Hover a dot to see the peak · click to mark it (or pick from the list) · drag to adjust · right-click to remove." } +

+

+ { "The view is fitted as soon as markers are placed; more markers improve the fit." } +

+
diff --git a/crates/wipfel/www/style.css b/crates/wipfel/www/style.css index 79e2dee..120aa8e 100644 --- a/crates/wipfel/www/style.css +++ b/crates/wipfel/www/style.css @@ -147,7 +147,8 @@ body { display: none; } /* pin the optional track section to the bottom of the control pane */ -.track-section { +.infofoot { + /* pins the info texts to the bottom of the sidebar */ margin-top: auto; } .main { diff --git a/dist/wipfel/style.css b/dist/wipfel/style.css index 79e2dee..120aa8e 100644 --- a/dist/wipfel/style.css +++ b/dist/wipfel/style.css @@ -147,7 +147,8 @@ body { display: none; } /* pin the optional track section to the bottom of the control pane */ -.track-section { +.infofoot { + /* pins the info texts to the bottom of the sidebar */ margin-top: auto; } .main { diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index 648289c..a3a8c29 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -605,7 +605,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 72, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, @@ -615,7 +615,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 76, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); return ret; }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index 54e6444..baf7c41 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From bec163e60432e1303a37a6a7371156500e8a98e6 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 28 Oct 2026 08:26:02 +0100 Subject: web: tagline becomes the info link; desktop hover wording MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'web gipfel photogrammetry' tag under the title now links to flpsed.org/gipfel.html (grey like plain text, accent blue on hover); the separate 'More information…' row is gone. Hover readout uses the desktop phrasing: 'Name · 2849 m · distance 12.34 km'. --- crates/wipfel/src/app.rs | 7 +++---- crates/wipfel/www/style.css | 9 +++------ dist/wipfel/style.css | 9 +++------ dist/wipfel/wipfel_bg.wasm | Bin 518461 -> 518287 bytes 4 files changed, 9 insertions(+), 16 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index eae47d9..466ccc7 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -832,7 +832,7 @@ pub fn app() -> Html { .map(|i| { let h = &p.hills[i]; format!( - "{} · {:.0} m · {:.2} km", + "{} · {:.0} m · distance {:.2} km", h.name, h.height, p.get_real_distance(i) / 1000.0 @@ -938,9 +938,8 @@ pub fn app() -> Html {

{ "wipfel" }

-

{ "web gipfel photogrammetry" }

- { "More information…" } + { "web gipfel photogrammetry" } if bitmap.is_some() { diff --git a/crates/wipfel/www/style.css b/crates/wipfel/www/style.css index 120aa8e..3ef48b1 100644 --- a/crates/wipfel/www/style.css +++ b/crates/wipfel/www/style.css @@ -87,19 +87,16 @@ body { font-size: 22px; } .tag { + display: block; margin: 0 0 12px; color: #8a8a94; font-size: 12px; text-transform: uppercase; letter-spacing: 1px; -} -.moreinfo { - color: #7fa5e8; - font-size: 12px; text-decoration: none; - margin-top: -6px; } -.moreinfo:hover { +.tag:hover { + color: #7fa5e8; text-decoration: underline; } .sidebar button { diff --git a/dist/wipfel/style.css b/dist/wipfel/style.css index 120aa8e..3ef48b1 100644 --- a/dist/wipfel/style.css +++ b/dist/wipfel/style.css @@ -87,19 +87,16 @@ body { font-size: 22px; } .tag { + display: block; margin: 0 0 12px; color: #8a8a94; font-size: 12px; text-transform: uppercase; letter-spacing: 1px; -} -.moreinfo { - color: #7fa5e8; - font-size: 12px; text-decoration: none; - margin-top: -6px; } -.moreinfo:hover { +.tag:hover { + color: #7fa5e8; text-decoration: underline; } .sidebar button { diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index baf7c41..e0e25c5 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From d57f022243850b532239ae08dd75717f55415fbf Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 28 Oct 2026 08:29:08 +0100 Subject: web: move hover peak info below the Track section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Appearing between Display and Track it pushed the whole Track block down on every hover. As the last item before the bottom-pinned info texts the flexible spacer absorbs it — nothing jumps anymore. --- crates/wipfel/src/app.rs | 9 ++++++--- dist/wipfel/wipfel_bg.wasm | Bin 518287 -> 518287 bytes 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 466ccc7..38c220e 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -1002,9 +1002,6 @@ pub fn app() -> Html { if !fit_info.is_empty() {

{ (*fit_info).clone() }

} - if let Some(h) = hover.as_ref() { -

{ h.clone() }

- }
{ "Track" }
if !track.is_empty() { @@ -1012,6 +1009,12 @@ pub fn app() -> Html { value={*track_width} min={50.0} max={1000.0} step={10.0} onchange={on_track_width} /> } + // last so revealing it on hover cannot shift any + // control above it (the bottom-pinned infofoot + // absorbs the height change) + if let Some(h) = hover.as_ref() { +

{ h.clone() }

+ } }
diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index e0e25c5..c3a3096 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From aab6af1601fa4cdb9b351987220f32de062d4b2c Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 28 Oct 2026 08:42:30 +0100 Subject: web: follow system light/dark preference All colors moved into CSS custom properties on :root (dark default) with a prefers-color-scheme: light override block. The two canvas- drawn surfaces follow too: the viewport now clears transparent so the CSS canvas background shows through, and the compass strip reads its colors from the same variables via a new bridge::css_var helper. theme-color metas (dark + light variants) tint mobile browser chrome to match. --- crates/wipfel/Cargo.toml | 1 + crates/wipfel/src/bridge.rs | 12 ++++ crates/wipfel/src/canvas_view.rs | 7 +-- crates/wipfel/src/compass.rs | 16 ++--- crates/wipfel/www/index.html | 2 + crates/wipfel/www/style.css | 126 ++++++++++++++++++++++++++++----------- dist/wipfel/index.html | 2 + dist/wipfel/style.css | 126 ++++++++++++++++++++++++++++----------- dist/wipfel/wipfel.js | 32 +++++++--- dist/wipfel/wipfel_bg.wasm | Bin 518287 -> 519140 bytes 10 files changed, 234 insertions(+), 90 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/Cargo.toml b/crates/wipfel/Cargo.toml index fad31ce..47faa60 100644 --- a/crates/wipfel/Cargo.toml +++ b/crates/wipfel/Cargo.toml @@ -19,6 +19,7 @@ features = [ "Blob", "CanvasRenderingContext2d", "DataTransfer", + "CssStyleDeclaration", "Document", "DomRect", "DragEvent", diff --git a/crates/wipfel/src/bridge.rs b/crates/wipfel/src/bridge.rs index 6dbba93..0f252c1 100644 --- a/crates/wipfel/src/bridge.rs +++ b/crates/wipfel/src/bridge.rs @@ -67,3 +67,15 @@ pub fn ctx2d(canvas: &HtmlCanvasElement) -> Option { .flatten() .and_then(|c| c.dyn_into::().ok()) } + +/// Read a CSS custom property from :root (follows the active +/// prefers-color-scheme), with a fallback when unavailable. +pub fn css_var(name: &str, fallback: &str) -> String { + window() + .document() + .and_then(|d| window().get_computed_style(&d.document_element()?).ok().flatten()) + .and_then(|s| s.get_property_value(name).ok()) + .map(|v| v.trim().to_string()) + .filter(|v| !v.is_empty()) + .unwrap_or_else(|| fallback.to_string()) +} diff --git a/crates/wipfel/src/canvas_view.rs b/crates/wipfel/src/canvas_view.rs index c5777e3..df46b5c 100644 --- a/crates/wipfel/src/canvas_view.rs +++ b/crates/wipfel/src/canvas_view.rs @@ -156,10 +156,9 @@ pub fn canvas_view(props: &Props) -> Html { canvas.set_height(bh); } let _ = ctx.set_transform(1.0, 0.0, 0.0, 1.0, 0.0, 0.0); - // web-sys 0.3: set_fill_style takes a JsValue (deprecated alias) - #[allow(deprecated)] - ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("#101014")); - ctx.fill_rect(0.0, 0.0, canvas.width() as f64, canvas.height() as f64); + // transparent clear: the CSS background of .canvaswrap + // (a theme variable) shows through + ctx.clear_rect(0.0, 0.0, canvas.width() as f64, canvas.height() as f64); let Some(bitmap) = bitmap else { return }; let _ = ctx.set_transform( dpr * view.scale, diff --git a/crates/wipfel/src/compass.rs b/crates/wipfel/src/compass.rs index b539e07..5e91c9a 100644 --- a/crates/wipfel/src/compass.rs +++ b/crates/wipfel/src/compass.rs @@ -127,9 +127,11 @@ pub fn compass(props: &Props) -> Html { } let _ = ctx.set_transform(dpr, 0.0, 0.0, dpr, 0.0, 0.0); - let on = "rgb(217, 217, 217)"; - let bg = "rgb(41, 41, 41)"; - let divider = "rgb(82, 82, 82)"; + // theme colors come from the CSS variables, so the strip + // follows light/dark preference like the rest of the UI + let on = bridge::css_var("--compass-fg", "rgb(217, 217, 217)"); + let bg = bridge::css_var("--compass-bg", "rgb(41, 41, 41)"); + let divider = bridge::css_var("--compass-divider", "rgb(82, 82, 82)"); let red = "rgb(255, 102, 64)"; let fill = |c: &str| { @@ -142,9 +144,9 @@ pub fn compass(props: &Props) -> Html { ctx.set_line_width(width); }; - fill(bg); + fill(&bg); ctx.fill_rect(0.0, 0.0, w, STRIP_H); - stroke(divider, 1.0); + stroke(÷r, 1.0); ctx.begin_path(); ctx.move_to(0.0, 0.5); ctx.line_to(w, 0.5); @@ -188,7 +190,7 @@ pub fn compass(props: &Props) -> Html { let a_hi = a_hi.min(c + fold); // baseline - stroke(on, 1.0); + stroke(&on, 1.0); ctx.begin_path(); ctx.move_to(0.0, y0 + 0.5); ctx.line_to(w, y0 + 0.5); @@ -225,7 +227,7 @@ pub fn compass(props: &Props) -> Html { if !x.is_finite() || x < -20.0 || x > w + 20.0 { continue; } - fill(if deg == 0.0 { red } else { on }); + fill(if deg == 0.0 { red } else { &on }); ctx.fill_text(name, x, label_y).ok(); } ctx.set_text_align("start"); diff --git a/crates/wipfel/www/index.html b/crates/wipfel/www/index.html index 98f81e8..67d0378 100644 --- a/crates/wipfel/www/index.html +++ b/crates/wipfel/www/index.html @@ -3,6 +3,8 @@ + + wipfel — web based gipfel photogrammetry diff --git a/crates/wipfel/www/style.css b/crates/wipfel/www/style.css index 3ef48b1..80c4d15 100644 --- a/crates/wipfel/www/style.css +++ b/crates/wipfel/www/style.css @@ -1,6 +1,56 @@ * { box-sizing: border-box; } +:root { + /* dark is the default theme; the light block below overrides for + users whose OS/browser prefers light */ + --bg: #101014; + --panel: #1a1a20; + --panel-border: #2c2c34; + --text: #e8e8ea; + --text-dim: #c8c8d0; + --text-faint: #8a8a94; + --input-bg: #24242c; + --input-border: #34343e; + --chip-bg: #2c2c34; + --chip-hover: #3b3b46; + --btn: #3b6fd4; + --btn-hover: #4a7ee4; + --accent: #7fa5e8; + --fitinfo: #9fd09f; + --canvas-bg: #101014; + --compass-bg: rgb(41, 41, 41); + --compass-fg: rgb(217, 217, 217); + --compass-divider: rgb(82, 82, 82); + --popover-bg: #1e1e26; + --popover-border: #3a3a46; + --popover-shadow: rgba(0, 0, 0, 0.5); +} +@media (prefers-color-scheme: light) { + :root { + --bg: #e9eaf0; + --panel: #ffffff; + --panel-border: #d6d8de; + --text: #1e1e26; + --text-dim: #44464e; + --text-faint: #7c7e88; + --input-bg: #f0f1f5; + --input-border: #c9ccd4; + --chip-bg: #e2e3e9; + --chip-hover: #d0d2da; + --btn: #3b6fd4; + --btn-hover: #2f5fbd; + --accent: #2b5cb8; + --fitinfo: #2e7d32; + --canvas-bg: #d9dbe2; + --compass-bg: rgb(240, 241, 245); + --compass-fg: rgb(40, 40, 48); + --compass-divider: rgb(170, 173, 182); + --popover-bg: #ffffff; + --popover-border: #c9ccd4; + --popover-shadow: rgba(40, 40, 60, 0.25); + } +} html, body { margin: 0; @@ -14,14 +64,14 @@ body { area behind the collapsing URL bar, pushing the compass below the fold; dvh tracks the actually visible area */ height: 100dvh; - background: #101014; - color: #e8e8ea; + background: var(--bg); + color: var(--text); } .sidebar { width: 300px; padding: 16px; - background: #1a1a20; - border-right: 1px solid #2c2c34; + background: var(--panel); + border-right: 1px solid var(--panel-border); display: flex; flex-direction: column; gap: 8px; @@ -38,12 +88,13 @@ body { width: 28px; height: 28px; padding: 0; - background: #2c2c34; + background: var(--chip-bg); + color: var(--text); font-size: 12px; border-radius: 5px; } .sidebar .collapse-btn:hover { - background: #3b3b46; + background: var(--chip-hover); } .nav-toggle { position: absolute; @@ -63,6 +114,7 @@ body { .nav-toggle:hover { background: rgba(59, 111, 212, 0.9); } +/* sits on top of the photo, so it stays dark in both themes */ .canvasstatus { position: absolute; bottom: 6px; @@ -89,19 +141,19 @@ body { .tag { display: block; margin: 0 0 12px; - color: #8a8a94; + color: var(--text-faint); font-size: 12px; text-transform: uppercase; letter-spacing: 1px; text-decoration: none; } .tag:hover { - color: #7fa5e8; + color: var(--accent); text-decoration: underline; } .sidebar button { padding: 8px 12px; - background: #3b6fd4; + background: var(--btn); color: #fff; border: 0; border-radius: 6px; @@ -109,16 +161,16 @@ body { cursor: pointer; } .sidebar button:hover { - background: #4a7ee4; + background: var(--btn-hover); } .status { font-size: 13px; - color: #c8c8d0; + color: var(--text-dim); word-break: break-word; } .hint { font-size: 12px; - color: #8a8a94; + color: var(--text-faint); } .row { display: flex; @@ -129,13 +181,13 @@ body { } .fitinfo { font-size: 12px; - color: #9fd09f; + color: var(--fitinfo); font-variant-numeric: tabular-nums; } .hover { font-size: 14px; font-weight: 600; - color: #ffffff; + color: var(--text); } .dim { opacity: 0.6; @@ -143,7 +195,6 @@ body { .hidden-file { display: none; } -/* pin the optional track section to the bottom of the control pane */ .infofoot { /* pins the info texts to the bottom of the sidebar */ margin-top: auto; @@ -158,6 +209,7 @@ body { flex: 1; position: relative; min-height: 0; + background: var(--canvas-bg); } canvas.viewport { position: absolute; @@ -179,8 +231,8 @@ canvas.compass { font-size: 11px; text-transform: uppercase; letter-spacing: 1px; - color: #8a8a94; - border-bottom: 1px solid #2c2c34; + color: var(--text-faint); + border-bottom: 1px solid var(--panel-border); padding-bottom: 3px; } .slider { @@ -193,10 +245,11 @@ canvas.compass { display: flex; justify-content: space-between; font-size: 12px; - color: #c8c8d0; + color: var(--text-dim); } .slider input[type="range"] { width: 100%; + accent-color: var(--btn); } .numrow { display: flex; @@ -209,9 +262,9 @@ canvas.compass { .numrow input { width: 130px; padding: 4px 6px; - background: #24242c; - color: #e8e8ea; - border: 1px solid #34343e; + background: var(--input-bg); + color: var(--text); + border: 1px solid var(--input-border); border-radius: 4px; } .numrow input[type="text"] { @@ -226,24 +279,24 @@ canvas.compass { position: absolute; z-index: 10; width: 280px; - background: #1e1e26; - border: 1px solid #3a3a46; + background: var(--popover-bg); + border: 1px solid var(--popover-border); border-radius: 6px; - box-shadow: 0 8px 24px rgba(0, 0, 0, 0.5); + box-shadow: 0 8px 24px var(--popover-shadow); display: flex; flex-direction: column; } .fpsearch { padding: 8px; - border-bottom: 1px solid #2c2c34; + border-bottom: 1px solid var(--panel-border); } .fpsearch input { width: 100%; padding: 5px 8px; - background: #24242c; - border: 1px solid #3a3a46; + background: var(--input-bg); + border: 1px solid var(--popover-border); border-radius: 4px; - color: #e8e8ea; + color: var(--text); font-size: 13px; } .fplist { @@ -253,18 +306,18 @@ canvas.compass { .fpempty { padding: 8px 10px; font-size: 13px; - color: #8a8a94; + color: var(--text-faint); margin: 0; } .fpfoot { padding: 6px 8px; - border-top: 1px solid #2c2c34; + border-top: 1px solid var(--panel-border); text-align: right; } .fpcancel { padding: 4px 12px; - background: #34343e; - color: #e8e8ea; + background: var(--chip-bg); + color: var(--text); border: 0; border-radius: 4px; font-size: 12px; @@ -275,8 +328,8 @@ canvas.compass { font-size: 11px; text-transform: uppercase; letter-spacing: 1px; - color: #8a8a94; - border-bottom: 1px solid #2c2c34; + color: var(--text-faint); + border-bottom: 1px solid var(--panel-border); } .fpitem { display: block; @@ -285,10 +338,11 @@ canvas.compass { padding: 6px 10px; background: none; border: 0; - color: #e8e8ea; + color: var(--text); font-size: 13px; cursor: pointer; } .fpitem:hover { - background: #2f6fd4; + background: var(--btn); + color: #fff; } diff --git a/dist/wipfel/index.html b/dist/wipfel/index.html index 98f81e8..67d0378 100644 --- a/dist/wipfel/index.html +++ b/dist/wipfel/index.html @@ -3,6 +3,8 @@ + + wipfel — web based gipfel photogrammetry diff --git a/dist/wipfel/style.css b/dist/wipfel/style.css index 3ef48b1..80c4d15 100644 --- a/dist/wipfel/style.css +++ b/dist/wipfel/style.css @@ -1,6 +1,56 @@ * { box-sizing: border-box; } +:root { + /* dark is the default theme; the light block below overrides for + users whose OS/browser prefers light */ + --bg: #101014; + --panel: #1a1a20; + --panel-border: #2c2c34; + --text: #e8e8ea; + --text-dim: #c8c8d0; + --text-faint: #8a8a94; + --input-bg: #24242c; + --input-border: #34343e; + --chip-bg: #2c2c34; + --chip-hover: #3b3b46; + --btn: #3b6fd4; + --btn-hover: #4a7ee4; + --accent: #7fa5e8; + --fitinfo: #9fd09f; + --canvas-bg: #101014; + --compass-bg: rgb(41, 41, 41); + --compass-fg: rgb(217, 217, 217); + --compass-divider: rgb(82, 82, 82); + --popover-bg: #1e1e26; + --popover-border: #3a3a46; + --popover-shadow: rgba(0, 0, 0, 0.5); +} +@media (prefers-color-scheme: light) { + :root { + --bg: #e9eaf0; + --panel: #ffffff; + --panel-border: #d6d8de; + --text: #1e1e26; + --text-dim: #44464e; + --text-faint: #7c7e88; + --input-bg: #f0f1f5; + --input-border: #c9ccd4; + --chip-bg: #e2e3e9; + --chip-hover: #d0d2da; + --btn: #3b6fd4; + --btn-hover: #2f5fbd; + --accent: #2b5cb8; + --fitinfo: #2e7d32; + --canvas-bg: #d9dbe2; + --compass-bg: rgb(240, 241, 245); + --compass-fg: rgb(40, 40, 48); + --compass-divider: rgb(170, 173, 182); + --popover-bg: #ffffff; + --popover-border: #c9ccd4; + --popover-shadow: rgba(40, 40, 60, 0.25); + } +} html, body { margin: 0; @@ -14,14 +64,14 @@ body { area behind the collapsing URL bar, pushing the compass below the fold; dvh tracks the actually visible area */ height: 100dvh; - background: #101014; - color: #e8e8ea; + background: var(--bg); + color: var(--text); } .sidebar { width: 300px; padding: 16px; - background: #1a1a20; - border-right: 1px solid #2c2c34; + background: var(--panel); + border-right: 1px solid var(--panel-border); display: flex; flex-direction: column; gap: 8px; @@ -38,12 +88,13 @@ body { width: 28px; height: 28px; padding: 0; - background: #2c2c34; + background: var(--chip-bg); + color: var(--text); font-size: 12px; border-radius: 5px; } .sidebar .collapse-btn:hover { - background: #3b3b46; + background: var(--chip-hover); } .nav-toggle { position: absolute; @@ -63,6 +114,7 @@ body { .nav-toggle:hover { background: rgba(59, 111, 212, 0.9); } +/* sits on top of the photo, so it stays dark in both themes */ .canvasstatus { position: absolute; bottom: 6px; @@ -89,19 +141,19 @@ body { .tag { display: block; margin: 0 0 12px; - color: #8a8a94; + color: var(--text-faint); font-size: 12px; text-transform: uppercase; letter-spacing: 1px; text-decoration: none; } .tag:hover { - color: #7fa5e8; + color: var(--accent); text-decoration: underline; } .sidebar button { padding: 8px 12px; - background: #3b6fd4; + background: var(--btn); color: #fff; border: 0; border-radius: 6px; @@ -109,16 +161,16 @@ body { cursor: pointer; } .sidebar button:hover { - background: #4a7ee4; + background: var(--btn-hover); } .status { font-size: 13px; - color: #c8c8d0; + color: var(--text-dim); word-break: break-word; } .hint { font-size: 12px; - color: #8a8a94; + color: var(--text-faint); } .row { display: flex; @@ -129,13 +181,13 @@ body { } .fitinfo { font-size: 12px; - color: #9fd09f; + color: var(--fitinfo); font-variant-numeric: tabular-nums; } .hover { font-size: 14px; font-weight: 600; - color: #ffffff; + color: var(--text); } .dim { opacity: 0.6; @@ -143,7 +195,6 @@ body { .hidden-file { display: none; } -/* pin the optional track section to the bottom of the control pane */ .infofoot { /* pins the info texts to the bottom of the sidebar */ margin-top: auto; @@ -158,6 +209,7 @@ body { flex: 1; position: relative; min-height: 0; + background: var(--canvas-bg); } canvas.viewport { position: absolute; @@ -179,8 +231,8 @@ canvas.compass { font-size: 11px; text-transform: uppercase; letter-spacing: 1px; - color: #8a8a94; - border-bottom: 1px solid #2c2c34; + color: var(--text-faint); + border-bottom: 1px solid var(--panel-border); padding-bottom: 3px; } .slider { @@ -193,10 +245,11 @@ canvas.compass { display: flex; justify-content: space-between; font-size: 12px; - color: #c8c8d0; + color: var(--text-dim); } .slider input[type="range"] { width: 100%; + accent-color: var(--btn); } .numrow { display: flex; @@ -209,9 +262,9 @@ canvas.compass { .numrow input { width: 130px; padding: 4px 6px; - background: #24242c; - color: #e8e8ea; - border: 1px solid #34343e; + background: var(--input-bg); + color: var(--text); + border: 1px solid var(--input-border); border-radius: 4px; } .numrow input[type="text"] { @@ -226,24 +279,24 @@ canvas.compass { position: absolute; z-index: 10; width: 280px; - background: #1e1e26; - border: 1px solid #3a3a46; + background: var(--popover-bg); + border: 1px solid var(--popover-border); border-radius: 6px; - box-shadow: 0 8px 24px rgba(0, 0, 0, 0.5); + box-shadow: 0 8px 24px var(--popover-shadow); display: flex; flex-direction: column; } .fpsearch { padding: 8px; - border-bottom: 1px solid #2c2c34; + border-bottom: 1px solid var(--panel-border); } .fpsearch input { width: 100%; padding: 5px 8px; - background: #24242c; - border: 1px solid #3a3a46; + background: var(--input-bg); + border: 1px solid var(--popover-border); border-radius: 4px; - color: #e8e8ea; + color: var(--text); font-size: 13px; } .fplist { @@ -253,18 +306,18 @@ canvas.compass { .fpempty { padding: 8px 10px; font-size: 13px; - color: #8a8a94; + color: var(--text-faint); margin: 0; } .fpfoot { padding: 6px 8px; - border-top: 1px solid #2c2c34; + border-top: 1px solid var(--panel-border); text-align: right; } .fpcancel { padding: 4px 12px; - background: #34343e; - color: #e8e8ea; + background: var(--chip-bg); + color: var(--text); border: 0; border-radius: 4px; font-size: 12px; @@ -275,8 +328,8 @@ canvas.compass { font-size: 11px; text-transform: uppercase; letter-spacing: 1px; - color: #8a8a94; - border-bottom: 1px solid #2c2c34; + color: var(--text-faint); + border-bottom: 1px solid var(--panel-border); } .fpitem { display: block; @@ -285,10 +338,11 @@ canvas.compass { padding: 6px 10px; background: none; border: 0; - color: #e8e8ea; + color: var(--text); font-size: 13px; cursor: pointer; } .fpitem:hover { - background: #2f6fd4; + background: var(--btn); + color: #fff; } diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index a3a8c29..b27047b 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -81,6 +81,9 @@ function __wbg_get_imports() { const ret = arg0.childNodes; return ret; }, + __wbg_clearRect_a5e36505218c247a: function(arg0, arg1, arg2, arg3, arg4) { + arg0.clearRect(arg1, arg2, arg3, arg4); + }, __wbg_click_d990e70c576b7c54: function(arg0) { arg0.click(); }, @@ -139,6 +142,10 @@ function __wbg_get_imports() { const ret = arg0.devicePixelRatio; return ret; }, + __wbg_documentElement_3f718a9a39a893d3: function(arg0) { + const ret = arg0.documentElement; + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, __wbg_document_9854e03c05fc8834: function(arg0) { const ret = arg0.document; return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); @@ -194,10 +201,21 @@ function __wbg_get_imports() { const ret = arg0.getBoundingClientRect(); return ret; }, + __wbg_getComputedStyle_dd0f456804795fd6: function() { return handleError(function (arg0, arg1) { + const ret = arg0.getComputedStyle(arg1); + return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); + }, arguments); }, __wbg_getContext_635e36719cad2623: function() { return handleError(function (arg0, arg1, arg2) { const ret = arg0.getContext(getStringFromWasm0(arg1, arg2)); return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); }, arguments); }, + __wbg_getPropertyValue_e90a3628c2de4fb6: function() { return handleError(function (arg0, arg1, arg2, arg3) { + const ret = arg1.getPropertyValue(getStringFromWasm0(arg2, arg3)); + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }, arguments); }, __wbg_get_6c896e0571ddae51: function(arg0, arg1) { const ret = arg0[arg1 >>> 0]; return ret; @@ -606,12 +624,12 @@ function __wbg_get_imports() { }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 72, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. - const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); + const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_fd3e5a073eeae266___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, __wbindgen_generic_0000000000000003: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Ref(NamedExternref("Event"))], shim_idx: 90, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. - const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures________invoke___web_sys_d6718dd818f67bd6___features__gen_Event__Event______true_); + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Ref(NamedExternref("Event"))], shim_idx: 92, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures________invoke___web_sys_fd3e5a073eeae266___features__gen_Event__Event______true_); return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { @@ -644,8 +662,8 @@ function wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true wasm.wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_(arg0, arg1); } -function wasm_bindgen_f1f668f83a5f514b___convert__closures________invoke___web_sys_d6718dd818f67bd6___features__gen_Event__Event______true_(arg0, arg1, arg2) { - wasm.wasm_bindgen_f1f668f83a5f514b___convert__closures________invoke___web_sys_d6718dd818f67bd6___features__gen_Event__Event______true_(arg0, arg1, arg2); +function wasm_bindgen_f1f668f83a5f514b___convert__closures________invoke___web_sys_fd3e5a073eeae266___features__gen_Event__Event______true_(arg0, arg1, arg2) { + wasm.wasm_bindgen_f1f668f83a5f514b___convert__closures________invoke___web_sys_fd3e5a073eeae266___features__gen_Event__Event______true_(arg0, arg1, arg2); } function wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___wasm_bindgen_f1f668f83a5f514b___JsValue__core_37ee0ce0c4cd57d5___result__Result_____wasm_bindgen_f1f668f83a5f514b___JsError___true_(arg0, arg1, arg2) { @@ -659,8 +677,8 @@ function wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_3 wasm.wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Function_fn_wasm_bindgen_f1f668f83a5f514b___JsValue_____wasm_bindgen_f1f668f83a5f514b___sys__Undefined___js_sys_351dd7d36d5f7033___Function_fn_wasm_bindgen_f1f668f83a5f514b___JsValue_____wasm_bindgen_f1f668f83a5f514b___sys__Undefined_______true_(arg0, arg1, arg2, arg3); } -function wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_(arg0, arg1, arg2, arg3) { - wasm.wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_(arg0, arg1, arg2, arg3); +function wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_fd3e5a073eeae266___features__gen_ResizeObserver__ResizeObserver______true_(arg0, arg1, arg2, arg3) { + wasm.wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_fd3e5a073eeae266___features__gen_ResizeObserver__ResizeObserver______true_(arg0, arg1, arg2, arg3); } function addToExternrefTable0(obj) { diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index c3a3096..3f5974a 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From 11689fb14f3a4d0291e2ccc05d6cb3556e4ea1ab Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 28 Oct 2026 09:23:46 +0100 Subject: core: fix focal-length-to-scale constant (36 mm film width, not 35) The 35mm film frame is 36 mm wide, so a lens with 35mm-equivalent focal length f projects with focal length f*w/36 in pixels. The original C++ code divided by 35, making the EXIF-derived initial scale ~2.9% too large (and the fitted focal readout ~2.9% low). - EXIF init and the focal slider/readout in both apps now use /36 - the gipfel JPEG comment KEEPS its historical scale*35/w encoding (focal_from_comment flag), so annotated JPEGs written by any older gipfel version still reproduce the identical view, and files saved by this version remain readable by them - new regression test focal_scale_exif_vs_comment; golden tests untouched (they pin the comment path) --- crates/gipfel-app/src/main.rs | 9 ++++++--- crates/gipfel-core/src/metadata.rs | 36 +++++++++++++++++++++++++++++++++--- crates/wipfel/src/app.rs | 4 ++-- dist/wipfel/wipfel_bg.wasm | Bin 519140 -> 519240 bytes 4 files changed, 41 insertions(+), 8 deletions(-) (limited to 'dist') diff --git a/crates/gipfel-app/src/main.rs b/crates/gipfel-app/src/main.rs index 12e2845..9ef046a 100644 --- a/crates/gipfel-app/src/main.rs +++ b/crates/gipfel-app/src/main.rs @@ -363,11 +363,11 @@ impl Gipfel { } fn focal_35mm(&self) -> f64 { - self.pan.get_scale() * 35.0 / self.img_max() + self.pan.get_scale() * 36.0 / self.img_max() } fn set_focal_35mm(&mut self, f: f64) { - self.pan.set_scale(f * self.img_max() / 35.0); + self.pan.set_scale(f * self.img_max() / 36.0); } fn sync_inputs(&mut self) { @@ -476,7 +476,10 @@ impl Gipfel { md.direction = self.pan.get_center_angle(); md.pitch = self.pan.get_pitch_angle(); md.roll = self.pan.get_roll_angle(); - md.focal_length_35mm = self.focal_35mm(); + // the comment keeps its historical scale * 35 / w encoding so + // annotated JPEGs stay interchangeable with older gipfel + // versions (see apply_image_metadata) + md.focal_length_35mm = self.pan.get_scale() * 35.0 / self.img_max(); md.projection_type = self.pan.projection_type as i32; md.k0 = self.pan.parms.k0; md.k1 = self.pan.parms.k1; diff --git a/crates/gipfel-core/src/metadata.rs b/crates/gipfel-core/src/metadata.rs index f55bf1c..9d73a8d 100644 --- a/crates/gipfel-core/src/metadata.rs +++ b/crates/gipfel-core/src/metadata.rs @@ -25,6 +25,10 @@ pub struct ImageMetaData { pub x0: f64, pub focal_length: f64, pub focal_length_35mm: f64, + /// true when focal_length_35mm came from a gipfel JPEG comment rather + /// than EXIF; the comment uses a legacy scale encoding (see + /// apply_image_metadata) + pub focal_from_comment: bool, pub projection_type: i32, } @@ -44,6 +48,7 @@ impl Default for ImageMetaData { x0: NAN, focal_length: NAN, focal_length_35mm: NAN, + focal_from_comment: false, projection_type: 0, } } @@ -147,6 +152,7 @@ impl ImageMetaData { self.pitch = pit.unwrap(); self.roll = rol.unwrap(); self.focal_length_35mm = fr.unwrap(); + self.focal_from_comment = true; self.projection_type = pt; // n >= 10: k0 and k1 were matched; x0 defaults to 0.0 when only 10 @@ -548,13 +554,20 @@ pub fn apply_image_metadata( pan.set_roll_angle(md.roll); } - // set_focal_length_35mm: scale = fl * max(w, h) / 35 + // scale = f35 * w / 36: the 35mm film frame is 36 mm wide, so a lens + // with 35mm-equivalent focal length f projects with focal length + // f * w / 36 in pixels. Exception: the gipfel JPEG comment has always + // encoded the focal as scale * 35 / w, so that legacy encoding is + // kept for comments to reproduce identical views with annotated + // JPEGs written by older gipfel versions. let w = img_w.max(img_h); if md.focal_length_35mm.is_nan() || md.focal_length_35mm == 0.0 { - pan.set_scale(35.0 * w as f64 / 35.0); + pan.set_scale(35.0 * w as f64 / 36.0); have_info = false; - } else { + } else if md.focal_from_comment { pan.set_scale(md.focal_length_35mm * w as f64 / 35.0); + } else { + pan.set_scale(md.focal_length_35mm * w as f64 / 36.0); } // distortion parameters, C ordering: @@ -721,4 +734,21 @@ mod tests { } let _ = std::fs::remove_dir_all(&dir); } + + #[test] + fn focal_scale_exif_vs_comment() { + // EXIF 35mm-equivalent focal: scale = f * w / 36 (film width) + let mut md = ImageMetaData::new(); + md.focal_length_35mm = 50.0; + let mut pan = crate::panorama::Panorama::new(); + apply_image_metadata(&mut pan, &md, 1000, 800); + assert!((pan.get_scale() - 50.0 * 1000.0 / 36.0).abs() < 1e-9); + + // gipfel comment: legacy encoding scale = f * w / 35, kept so + // annotated JPEGs from older versions reproduce the same view + md.focal_from_comment = true; + let mut pan = crate::panorama::Panorama::new(); + apply_image_metadata(&mut pan, &md, 1000, 800); + assert!((pan.get_scale() - 50.0 * 1000.0 / 35.0).abs() < 1e-9); + } } diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 38c220e..a7af089 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -391,7 +391,7 @@ pub fn app() -> Html { lon: p.get_view_long(), height: p.get_view_height(), az: p.get_center_angle().rem_euclid(360.0), - focal: (p.get_scale() * 35.0 / w as f64).clamp(1.0, 300.0), + focal: (p.get_scale() * 36.0 / w as f64).clamp(1.0, 300.0), pitch: p.get_pitch_angle(), roll: p.get_roll_angle(), vis: (0.11 - p.height_dist_ratio).clamp(0.01, 0.1), @@ -596,7 +596,7 @@ pub fn app() -> Html { vp.set(u); let w = img_size.0 as f64; if w > 0.0 { - pan.borrow_mut().set_scale(v * w / 35.0); + pan.borrow_mut().set_scale(v * w / 36.0); } }) }; diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index 3f5974a..d35f0ae 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From 8b87a9d31c966b431e9547bcc411f9da7f3c527a Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 28 Oct 2026 09:25:36 +0100 Subject: web: load an alternative hill database from the UI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Secondary button under the database status line: picks a .dat (or gzipped) peak list at runtime — e.g. a regional file like everest.dat instead of the full 21k gipfel.dat. Markers and track reference hill indices, so they are dropped when the database is swapped. --- crates/wipfel/src/app.rs | 71 ++++++++++++++++++++++++++++++++++++++++++++ crates/wipfel/www/style.css | 9 ++++++ dist/wipfel/style.css | 9 ++++++ dist/wipfel/wipfel.js | 4 +-- dist/wipfel/wipfel_bg.wasm | Bin 519240 -> 523068 bytes 5 files changed, 91 insertions(+), 2 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index a7af089..fbe49c4 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -190,6 +190,8 @@ pub fn app() -> Html { let track = use_state(Vec::::new); let track_width = use_state(|| 200.0f64); let track_file_ref = use_node_ref(); + // optional alternative hill database (e.g. a regional list) + let db_file_ref = use_node_ref(); // set once the user pans or zooms by hand; auto-fit is then suppressed // until the next image load let user_moved = use_mut_ref(|| false); @@ -492,6 +494,65 @@ pub fn app() -> Html { }) }; + let open_db_picker = { + let db_file_ref = db_file_ref.clone(); + Callback::from(move |_: MouseEvent| { + if let Some(input) = db_file_ref.cast::() { + input.click(); + } + }) + }; + + // replace the hill database at runtime (e.g. everest.dat for the + // Khumbu); markers and track reference hill indices and are dropped + let on_db_file_change = { + let pan = pan.clone(); + let db_status = db_status.clone(); + let markers = markers.clone(); + let track = track.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + let Some(file) = input.files().and_then(|f| f.item(0)) else { + return; + }; + let (pan, db_status, markers, track) = ( + pan.clone(), + db_status.clone(), + markers.clone(), + track.clone(), + ); + let name = file.name(); + spawn_local(async move { + match bridge::read_blob(&file).await { + Ok(bytes) => { + // accept plain .dat and gzipped variants + let raw = match bytes.first() { + Some(0x1f) if bytes.get(1) == Some(&0x8b) => match gunzip(&bytes) { + Ok(r) => r, + Err(err) => { + db_status.set(format!("gunzip failed: {err}")); + return; + } + }, + _ => bytes, + }; + match pan.borrow_mut().load_data_from_bytes(&raw) { + Ok(()) => { + markers.set(Vec::new()); + track.set(Vec::new()); + let n = pan.borrow().hills.len(); + db_status.set(format!("Hill database {name}: {n} peaks")); + } + Err(err) => db_status.set(format!("Database failed: {err}")), + } + } + Err(err) => db_status.set(format!("Failed to read {name}: {err}")), + } + }); + input.set_value(""); // allow re-selecting the same file + }) + }; + // parse a GPX file and swap it into the panorama as track-point hills // (always appended last, so marker hill indices never shift) let on_track_file_change = { @@ -960,6 +1021,16 @@ pub fn app() -> Html { />

{ (*status).clone() }

{ (*db_status).clone() }

+ + if bitmap.is_some() { <>
{ "Viewpoint" }
diff --git a/crates/wipfel/www/style.css b/crates/wipfel/www/style.css index 80c4d15..9ed7bd8 100644 --- a/crates/wipfel/www/style.css +++ b/crates/wipfel/www/style.css @@ -163,6 +163,15 @@ body { .sidebar button:hover { background: var(--btn-hover); } +.sidebar button.secondary { + background: var(--chip-bg); + color: var(--text); + font-size: 13px; + padding: 6px 10px; +} +.sidebar button.secondary:hover { + background: var(--chip-hover); +} .status { font-size: 13px; color: var(--text-dim); diff --git a/dist/wipfel/style.css b/dist/wipfel/style.css index 80c4d15..9ed7bd8 100644 --- a/dist/wipfel/style.css +++ b/dist/wipfel/style.css @@ -163,6 +163,15 @@ body { .sidebar button:hover { background: var(--btn-hover); } +.sidebar button.secondary { + background: var(--chip-bg); + color: var(--text); + font-size: 13px; + padding: 6px 10px; +} +.sidebar button.secondary:hover { + background: var(--chip-hover); +} .status { font-size: 13px; color: var(--text-dim); diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index b27047b..f3c4b1b 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -623,7 +623,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 72, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_fd3e5a073eeae266___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, @@ -633,7 +633,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 76, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); return ret; }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index d35f0ae..83fe2ec 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From d91f4022a48fb2468f307026b44cb4555eade7a4 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 28 Oct 2026 09:42:59 +0100 Subject: web: sync orientation and focal sliders with the fitted values do_refit only updated the fit-info text; the Azimuth/Pitch/Roll/Focal sliders kept showing their pre-fit values because the slider state (vp) was never synced from the panorama after a fit. Long-standing wipfel bug, independent of the recent focal-constant change. The compass strip was unaffected (it reads the panorama at render time). --- crates/wipfel/src/app.rs | 28 +++++++++++++++++++++------- dist/wipfel/wipfel_bg.wasm | Bin 523068 -> 523275 bytes 2 files changed, 21 insertions(+), 7 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index fbe49c4..4194789 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -311,6 +311,8 @@ pub fn app() -> Html { let pan = pan.clone(); let fit_info = fit_info.clone(); let fit_distortion = fit_distortion.clone(); + let vp = vp.clone(); + let img_size = img_size.clone(); Rc::new(move |mk: &[Marker]| { if mk.is_empty() { fit_info.set(String::new()); @@ -319,13 +321,25 @@ pub fn app() -> Html { let info = { let mut p = pan.borrow_mut(); match markers::refit(&mut p, mk, *fit_distortion) { - Ok(()) => format!( - "fit: az {:.2}° · pitch {:.2}° · roll {:.2}° · scale {:.1}", - p.get_center_angle(), - p.get_pitch_angle(), - p.get_roll_angle(), - p.get_scale() - ), + Ok(()) => { + // push the fitted values into the slider state, + // otherwise Azimuth/Pitch/Roll/Focal keep showing + // the pre-fit numbers + let mut u = *vp; + u.az = p.get_center_angle().rem_euclid(360.0); + u.pitch = p.get_pitch_angle(); + u.roll = p.get_roll_angle(); + let w = img_size.0.max(1) as f64; + u.focal = (p.get_scale() * 36.0 / w).clamp(1.0, 300.0); + vp.set(u); + format!( + "fit: az {:.2}° · pitch {:.2}° · roll {:.2}° · scale {:.1}", + p.get_center_angle(), + p.get_pitch_angle(), + p.get_roll_angle(), + p.get_scale() + ) + } Err(e) => format!("fit failed: {e}"), } }; diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index 83fe2ec..13d92ec 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From fe75cd82d6f4f4ecca9c7cd97d9cdfbae646dcff Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 28 Oct 2026 10:46:31 +0100 Subject: web: fix panic when loading an alternative hill database The load result was matched on while the scrutinee's borrow_mut() was still alive; the Ok arm called pan.borrow() again, which panics (and traps the whole wasm module, hanging the app). End the borrow before the match. --- crates/wipfel/src/app.rs | 6 +++++- dist/wipfel/wipfel_bg.wasm | Bin 523275 -> 523275 bytes 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 4194789..71cd168 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -550,7 +550,11 @@ pub fn app() -> Html { }, _ => bytes, }; - match pan.borrow_mut().load_data_from_bytes(&raw) { + // NOTE: the borrow must end before the match arm, + // which calls pan.borrow() itself (nested borrow + // would panic and trap the whole wasm module) + let res = pan.borrow_mut().load_data_from_bytes(&raw); + match res { Ok(()) => { markers.set(Vec::new()); track.set(Vec::new()); diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index 13d92ec..0ab8fbc 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From 6fc70d457737507df60c725795c4c736affc95c8 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 28 Oct 2026 10:56:13 +0100 Subject: web: move hill database loader below the track section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Renamed to 'Load alternative hill database…' and placed after 'Load GPX Track…' — the default database loads automatically, so the button must not sit where it could look like a required first step. --- crates/wipfel/src/app.rs | 23 +++++++++++++---------- dist/wipfel/wipfel_bg.wasm | Bin 523275 -> 523323 bytes 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 71cd168..0c66c35 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -1039,16 +1039,6 @@ pub fn app() -> Html { />

{ (*status).clone() }

{ (*db_status).clone() }

- - if bitmap.is_some() { <>
{ "Viewpoint" }
@@ -1098,6 +1088,19 @@ pub fn app() -> Html { value={*track_width} min={50.0} max={1000.0} step={10.0} onchange={on_track_width} /> } + // deliberately below the track controls: the + // default database is loaded automatically, this + // is only an optional replacement + + // last so revealing it on hover cannot shift any // control above it (the bottom-pinned infofoot // absorbs the height change) diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index 0ab8fbc..0bc8c3d 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From 969297d6658bb801de13cba132af774197c62ca8 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 28 Oct 2026 11:14:29 +0100 Subject: web: image picker accepts images only again The */* workaround did not circumvent the MediaProvider EXIF redaction, so no reason to show non-image files in the picker. --- crates/wipfel/src/app.rs | 2 +- dist/wipfel/wipfel_bg.wasm | Bin 523323 -> 523323 bytes 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 0c66c35..09f3ac3 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -1026,7 +1026,7 @@ pub fn app() -> Html { diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index 0bc8c3d..aab2e64 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From 34377db6b5c8e563dca18f72cc8174a5df2dd92e Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 28 Oct 2026 20:18:01 +0100 Subject: web: fix redraw tick stalling in persistent resize closures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A UseStateHandle cloned into a long-lived closure derefs to its render-time snapshot (same root cause as the pinch bug), so tick.set(*tick + 1) wrote the same value on every resize after the first: no state change, no redraw, stale stretched canvas backing store — the distortion thought fixed by d465654 returned on the second resize (the window-resize listener, created once at startup, never worked at all). Yew 0.21 has no functional-update setter, so the tick now has a use_mut_ref mirror as the live counter. --- crates/wipfel/src/app.rs | 24 +++++++++++++++++++++--- dist/wipfel/wipfel_bg.wasm | Bin 523323 -> 524243 bytes 2 files changed, 21 insertions(+), 3 deletions(-) (limited to 'dist') diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 09f3ac3..96325eb 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -197,11 +197,23 @@ pub fn app() -> Html { let user_moved = use_mut_ref(|| false); // force a redraw when the window is resized so the canvas backing - // store tracks its CSS size (listener lives as long as the app) + // store tracks its CSS size (listener lives as long as the app). + // The live counter lives in a RefCell: a UseStateHandle cloned into + // these persistent closures would deref to its render-time snapshot + // and stall the bump after the first resize. + let tick_live = use_mut_ref(|| 0u32); { let tick = tick.clone(); + let live = tick_live.clone(); use_effect_with((), move |_| { - let closure = Closure::wrap(Box::new(move || tick.set(*tick + 1)) as Box); + let closure = Closure::wrap(Box::new(move || { + let v = { + let mut l = live.borrow_mut(); + *l += 1; + *l + }; + tick.set(v); + }) as Box); let _ = bridge::window() .add_event_listener_with_callback("resize", closure.as_ref().unchecked_ref()); // the listener is never removed (app lifetime); leak the closure @@ -284,9 +296,15 @@ pub fn app() -> Html { let fit2 = fit.clone(); let um = user_moved.clone(); let tick2 = tick.clone(); + let live2 = tick_live.clone(); let closure = wasm_bindgen::closure::Closure::wrap(Box::new( move |_entries: js_sys::Array, _obs: web_sys::ResizeObserver| { - tick2.set(*tick2 + 1); + let v = { + let mut l = live2.borrow_mut(); + *l += 1; + *l + }; + tick2.set(v); if !*um.borrow() { fit2.emit(MouseEvent::new("fit").unwrap()); } diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index aab2e64..e0ce1d7 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3 From dbc0fd52a8497c5002e8311eb1728050a4e97c7a Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Fri, 30 Oct 2026 08:42:39 +0100 Subject: web: ship a Content-Security-Policy as meta tag Self-contained hardening, no server config required: default-src 'self'; script-src 'self' 'wasm-unsafe-eval'; img-src 'self' blob: data:; connect-src 'self' blob: data:; style-src 'self' 'unsafe-inline' - script-src needs 'wasm-unsafe-eval' for WebAssembly compilation (the scoped exception; plain 'unsafe-eval' stays forbidden) and no inline script is allowed, so the module loader moved from an inline + diff --git a/crates/wipfel/www/loader.js b/crates/wipfel/www/loader.js new file mode 100644 index 0000000..8880478 --- /dev/null +++ b/crates/wipfel/www/loader.js @@ -0,0 +1,4 @@ +// External loader so the page needs no inline + diff --git a/dist/wipfel/loader.js b/dist/wipfel/loader.js new file mode 100644 index 0000000..8880478 --- /dev/null +++ b/dist/wipfel/loader.js @@ -0,0 +1,4 @@ +// External loader so the page needs no inline + + diff --git a/crates/gipfel/www/loader.js b/crates/gipfel/www/loader.js new file mode 100644 index 0000000..5fbd558 --- /dev/null +++ b/crates/gipfel/www/loader.js @@ -0,0 +1,4 @@ +// External loader so the page needs no inline - - diff --git a/crates/wipfel/www/loader.js b/crates/wipfel/www/loader.js deleted file mode 100644 index 8880478..0000000 --- a/crates/wipfel/www/loader.js +++ /dev/null @@ -1,4 +0,0 @@ -// External loader so the page needs no inline + + diff --git a/dist/gipfel/loader.js b/dist/gipfel/loader.js new file mode 100644 index 0000000..5fbd558 --- /dev/null +++ b/dist/gipfel/loader.js @@ -0,0 +1,4 @@ +// External loader so the page needs no inline - - diff --git a/dist/wipfel/loader.js b/dist/wipfel/loader.js deleted file mode 100644 index 8880478..0000000 --- a/dist/wipfel/loader.js +++ /dev/null @@ -1,4 +0,0 @@ -// External loader so the page needs no inline