diff --git a/apps/gipy/ChangeLog b/apps/gipy/ChangeLog index 4d469eda7..8646ba11a 100644 --- a/apps/gipy/ChangeLog +++ b/apps/gipy/ChangeLog @@ -80,3 +80,10 @@ 0.18: * Major rewrite of display : now tile based * We have a map. Never get lost again. + +0.19: + * Several fixes for osm requests and map computations + * Display path in leaflet + * Reduce framerate if locked + * Stroke to move around in the map + * Fix for missing paths in display diff --git a/apps/gipy/app.js b/apps/gipy/app.js index ae94071ea..60e4bb5af 100644 --- a/apps/gipy/app.js +++ b/apps/gipy/app.js @@ -243,6 +243,7 @@ class Map { let local_y = displayed_y - this.start_coordinates[1]; let tile_x = Math.floor(local_x / this.side); let tile_y = Math.floor(local_y / this.side); + let limit = 1; if (!zoomed) { limit = 2; @@ -266,6 +267,18 @@ class Map { sin_direction ) ) { +// let colors = [ +// [0, 0, 0], +// [0, 0, 1], +// [0, 1, 0], +// [0, 1, 1], +// [1, 0, 0], +// [1, 0, 1], +// [1, 1, 0], +// [1, 1, 0.5], +// [0.5, 0, 0.5], +// [0, 0.5, 0.5], +// ]; if (this.color[0] == 1 && this.color[1] == 0 && this.color[2] == 0) { this.display_thick_tile( x, @@ -301,33 +314,32 @@ class Map { cos_direction, sin_direction ) { - let center_x = g.getWidth() / 2; - let center_y = g.getHeight() / 2 + Y_OFFSET; + let width = g.getWidth(); + let height = g.getHeight(); + let center_x = width / 2; + let center_y = height / 2 + Y_OFFSET; let side = this.side; - let x1 = tile_x * side; - let y1 = tile_y * side; - let x2 = x1 + side; - let y2 = y1 + side; - let scaled_x1 = (x1 - current_x) * scale_factor; - let scaled_y1 = (y1 - current_y) * scale_factor; - let rotated_x1 = scaled_x1 * cos_direction - scaled_y1 * sin_direction; - let rotated_y1 = scaled_x1 * sin_direction + scaled_y1 * cos_direction; - let scaled_x2 = (x2 - current_x) * scale_factor; - let scaled_y2 = (y2 - current_y) * scale_factor; - let rotated_x2 = scaled_x2 * cos_direction - scaled_y2 * sin_direction; - let rotated_y2 = scaled_x2 * sin_direction + scaled_y2 * cos_direction; + let tile_center_x = (tile_x + 0.5) * side; + let tile_center_y = (tile_y + 0.5) * side; + let scaled_center_x = (tile_center_x - current_x) * scale_factor; + let scaled_center_y = (tile_center_y - current_y) * scale_factor; + let rotated_center_x = scaled_center_x * cos_direction - scaled_center_y * sin_direction; + let rotated_center_y = scaled_center_x * sin_direction + scaled_center_y * cos_direction; + let on_screen_center_x = center_x - rotated_center_x; + let on_screen_center_y = center_y + rotated_center_y; - if (center_x < rotated_x1 && center_x < rotated_x2) { - return false; - } - if (-center_x > rotated_x1 && -center_x > rotated_x2) { - return false; - } + let scaled_side = side * scale_factor * Math.sqrt(1/2); - if (center_y < rotated_y1 && center_y < rotated_y2) { + if (on_screen_center_x + scaled_side <= 0) { return false; } - if (-center_y > rotated_y1 && -center_y > rotated_y2) { + if (on_screen_center_x - scaled_side >= width) { + return false; + } + if (on_screen_center_y + scaled_side <= 0) { + return false; + } + if (on_screen_center_y - scaled_side >= height) { return false; } return true; @@ -652,8 +664,8 @@ class Status { } else { let previous_point = this.old_points[this.old_points.length - 1]; let distance_to_previous = previous_point.distance(position); - // gps signal is noisy but rarely above 4 meters - if (distance_to_previous < 4) { + // gps signal is noisy but rarely above 5 meters + if (distance_to_previous < 5) { return null; } } @@ -725,12 +737,6 @@ class Status { // console.log("we are not late"); // } - // // abort most frames if locked - // if (Bangle.isLocked() && this.gps_coordinates_counter % 5 != 0) { - // console.log("we are filtered"); - // return; - // } - if (this.path !== null) { // detect segment we are on now let res = this.path.nearest_segment( @@ -803,6 +809,12 @@ class Status { } } } + + // abort most frames if locked + if (Bangle.isLocked() && this.gps_coordinates_counter % 5 != 0) { + return; + } + // re-display this.display(); } @@ -1391,8 +1403,8 @@ function start_gipy(path, maps, interests) { let s = status.adjusted_sin_direction; let rotated_x = xdiff * c - ydiff * s; let rotated_y = xdiff * s + ydiff * c; - status.displayed_x += rotated_x / ((status.scale_factor * 4) / 3); - status.displayed_y -= rotated_y / ((status.scale_factor * 4) / 3); + status.displayed_position.lon += 1.3 * rotated_x / status.scale_factor; + status.displayed_position.lat -= 1.3 * rotated_y / status.scale_factor; status.display(); }); diff --git a/apps/gipy/interface.html b/apps/gipy/interface.html index 13297e17b..892349df9 100644 --- a/apps/gipy/interface.html +++ b/apps/gipy/interface.html @@ -75,6 +75,9 @@ function display_polygon(map) { document.getElementById('upload').disabled = true; if (displayed_polygon !== null) { displayed_polygon.remove(); + } + if (displayed_path !== null) { + displayed_path.remove(); } let polygon = get_polygon(gps_data); let min_lat = polygon[0]; @@ -97,11 +100,21 @@ function display_polygon(map) { } } displayed_polygon = L.polygon(map_polygon).addTo(map); + + let polyline = get_polyline(gps_data); + if (polyline.length > 0) { + let map_polyline = []; + for (let i = 0 ; i < polyline.length ; i+= 2) { + map_polyline.push([polyline[i], polyline[i+1]]); + } + displayed_path = L.polyline(map_polyline, {color: 'red'}).addTo(map); + } + map.fitBounds(L.latLngBounds(L.latLng(min_lat, min_lng), L.latLng(max_lat, max_lng))); document.getElementById('convert').disabled = false; } -import init, { load_gps_from_string, get_polygon, request_map, get_gps_content, get_gps_map_svg, gps_from_area } from "./pkg/gps.js"; +import init, { load_gps_from_string, get_polygon, get_polyline, request_map, get_gps_content, get_gps_map_svg, gps_from_area } from "./pkg/gps.js"; console.log("imported wasm"); // start map @@ -138,6 +151,7 @@ let gps_data = null; let gps_filename = null; let gps_content = null; let displayed_polygon = null; +let displayed_path = null; init().then(() => { @@ -200,7 +214,6 @@ document status.innerHTML = "file converted"; gps_content = get_gps_content(gps_data); let svg_string = get_gps_map_svg(gps_data); - console.log("svg string is", svg_string); let img = document.getElementById("svgmap"); img.innerHTML = svg_string; if (gps_filename !== null) { diff --git a/apps/gipy/metadata.json b/apps/gipy/metadata.json index 0ec42d4c3..8b8c88780 100644 --- a/apps/gipy/metadata.json +++ b/apps/gipy/metadata.json @@ -2,7 +2,7 @@ "id": "gipy", "name": "Gipy", "shortName": "Gipy", - "version": "0.18", + "version": "0.19", "description": "Follow gpx files using the gps. Don't get lost in your bike trips and hikes.", "allow_emulator":false, "icon": "gipy.png", diff --git a/apps/gipy/pkg/gps.d.ts b/apps/gipy/pkg/gps.d.ts index 48fe96776..15a90b1e8 100644 --- a/apps/gipy/pkg/gps.d.ts +++ b/apps/gipy/pkg/gps.d.ts @@ -2,21 +2,26 @@ /* eslint-disable */ /** * @param {Gps} gps +* @returns {string} +*/ +export function get_gps_map_svg(gps: Gps): string; +/** +* @param {Gps} gps * @returns {Float64Array} */ export function get_polygon(gps: Gps): Float64Array; /** * @param {Gps} gps +* @returns {Float64Array} +*/ +export function get_polyline(gps: Gps): Float64Array; +/** +* @param {Gps} gps * @returns {Uint8Array} */ export function get_gps_content(gps: Gps): Uint8Array; /** * @param {Gps} gps -* @returns {string} -*/ -export function get_gps_map_svg(gps: Gps): string; -/** -* @param {Gps} gps * @param {string} key1 * @param {string} value1 * @param {string} key2 @@ -52,20 +57,21 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl export interface InitOutput { readonly memory: WebAssembly.Memory; readonly __wbg_gps_free: (a: number) => void; - readonly get_polygon: (a: number, b: number) => void; - readonly get_gps_content: (a: number, b: number) => void; readonly get_gps_map_svg: (a: number, b: number) => void; + readonly get_polygon: (a: number, b: number) => void; + readonly get_polyline: (a: number, b: number) => void; + readonly get_gps_content: (a: number, b: number) => void; readonly request_map: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number) => number; readonly load_gps_from_string: (a: number, b: number) => number; readonly gps_from_area: (a: number, b: number, c: number, d: number) => number; readonly __wbindgen_malloc: (a: number) => number; readonly __wbindgen_realloc: (a: number, b: number, c: number) => number; readonly __wbindgen_export_2: WebAssembly.Table; - readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h6bb6801698d941c0: (a: number, b: number, c: number) => void; + readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hab13c10d53cd1c5a: (a: number, b: number, c: number) => void; readonly __wbindgen_add_to_stack_pointer: (a: number) => number; readonly __wbindgen_free: (a: number, b: number) => void; readonly __wbindgen_exn_store: (a: number) => void; - readonly wasm_bindgen__convert__closures__invoke2_mut__h33169a25550cd50b: (a: number, b: number, c: number, d: number) => void; + readonly wasm_bindgen__convert__closures__invoke2_mut__h26ce002f44a5439b: (a: number, b: number, c: number, d: number) => void; } export type SyncInitInput = BufferSource | WebAssembly.Module; diff --git a/apps/gipy/pkg/gps.js b/apps/gipy/pkg/gps.js index 25c39c123..ce9ebe5f8 100644 --- a/apps/gipy/pkg/gps.js +++ b/apps/gipy/pkg/gps.js @@ -98,6 +98,14 @@ function takeObject(idx) { return ret; } +const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); + +cachedTextDecoder.decode(); + +function getStringFromWasm0(ptr, len) { + return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len)); +} + function addHeapObject(obj) { if (heap_next === heap.length) heap.push(heap.length + 1); const idx = heap_next; @@ -107,14 +115,6 @@ function addHeapObject(obj) { return idx; } -const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); - -cachedTextDecoder.decode(); - -function getStringFromWasm0(ptr, len) { - return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len)); -} - function debugString(val) { // primitive types const type = typeof val; @@ -205,7 +205,7 @@ function makeMutClosure(arg0, arg1, dtor, f) { return real; } function __wbg_adapter_24(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h6bb6801698d941c0(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hab13c10d53cd1c5a(arg0, arg1, addHeapObject(arg2)); } function _assertClass(instance, klass) { @@ -214,6 +214,23 @@ function _assertClass(instance, klass) { } return instance.ptr; } +/** +* @param {Gps} gps +* @returns {string} +*/ +export function get_gps_map_svg(gps) { + try { + const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); + _assertClass(gps, Gps); + wasm.get_gps_map_svg(retptr, gps.ptr); + var r0 = getInt32Memory0()[retptr / 4 + 0]; + var r1 = getInt32Memory0()[retptr / 4 + 1]; + return getStringFromWasm0(r0, r1); + } finally { + wasm.__wbindgen_add_to_stack_pointer(16); + wasm.__wbindgen_free(r0, r1); + } +} let cachedFloat64Memory0 = new Float64Array(); @@ -246,6 +263,25 @@ export function get_polygon(gps) { } } +/** +* @param {Gps} gps +* @returns {Float64Array} +*/ +export function get_polyline(gps) { + try { + const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); + _assertClass(gps, Gps); + wasm.get_polyline(retptr, gps.ptr); + var r0 = getInt32Memory0()[retptr / 4 + 0]; + var r1 = getInt32Memory0()[retptr / 4 + 1]; + var v0 = getArrayF64FromWasm0(r0, r1).slice(); + wasm.__wbindgen_free(r0, r1 * 8); + return v0; + } finally { + wasm.__wbindgen_add_to_stack_pointer(16); + } +} + function getArrayU8FromWasm0(ptr, len) { return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len); } @@ -268,24 +304,6 @@ export function get_gps_content(gps) { } } -/** -* @param {Gps} gps -* @returns {string} -*/ -export function get_gps_map_svg(gps) { - try { - const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); - _assertClass(gps, Gps); - wasm.get_gps_map_svg(retptr, gps.ptr); - var r0 = getInt32Memory0()[retptr / 4 + 0]; - var r1 = getInt32Memory0()[retptr / 4 + 1]; - return getStringFromWasm0(r0, r1); - } finally { - wasm.__wbindgen_add_to_stack_pointer(16); - wasm.__wbindgen_free(r0, r1); - } -} - /** * @param {Gps} gps * @param {string} key1 @@ -350,8 +368,8 @@ function handleError(f, args) { wasm.__wbindgen_exn_store(addHeapObject(e)); } } -function __wbg_adapter_83(arg0, arg1, arg2, arg3) { - wasm.wasm_bindgen__convert__closures__invoke2_mut__h33169a25550cd50b(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3)); +function __wbg_adapter_84(arg0, arg1, arg2, arg3) { + wasm.wasm_bindgen__convert__closures__invoke2_mut__h26ce002f44a5439b(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3)); } /** @@ -426,45 +444,30 @@ function getImports() { imports.wbg.__wbindgen_object_drop_ref = function(arg0) { takeObject(arg0); }; - imports.wbg.__wbindgen_object_clone_ref = function(arg0) { - const ret = getObject(arg0); - return addHeapObject(ret); - }; imports.wbg.__wbindgen_string_new = function(arg0, arg1) { const ret = getStringFromWasm0(arg0, arg1); return addHeapObject(ret); }; - imports.wbg.__wbg_fetch_56a6919da5e4c21c = function(arg0) { + imports.wbg.__wbg_fetch_57429b87be3dcc33 = function(arg0) { const ret = fetch(getObject(arg0)); return addHeapObject(ret); }; - imports.wbg.__wbg_fetch_a48a10a635c75705 = function(arg0, arg1) { + imports.wbg.__wbindgen_object_clone_ref = function(arg0) { + const ret = getObject(arg0); + return addHeapObject(ret); + }; + imports.wbg.__wbg_fetch_749a56934f95c96c = function(arg0, arg1) { const ret = getObject(arg0).fetch(getObject(arg1)); return addHeapObject(ret); }; - imports.wbg.__wbg_new_79046c4e23ea4a68 = function() { return handleError(function () { + imports.wbg.__wbg_new_2d0053ee81e4dd2a = function() { return handleError(function () { const ret = new Headers(); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_append_419e47e76db2bf58 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + imports.wbg.__wbg_append_de37df908812970d = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { getObject(arg0).append(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); }, arguments) }; - imports.wbg.__wbg_newwithstrandinit_88469b4854505aec = function() { return handleError(function (arg0, arg1, arg2) { - const ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_signal_ef3cb12ade6e3e58 = function(arg0) { - const ret = getObject(arg0).signal; - return addHeapObject(ret); - }; - imports.wbg.__wbg_new_0660dc54dc784268 = function() { return handleError(function () { - const ret = new AbortController(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_abort_5eaedf61218dad4e = function(arg0) { - getObject(arg0).abort(); - }; - imports.wbg.__wbg_instanceof_Response_f5253ba882b9f20c = function(arg0) { + imports.wbg.__wbg_instanceof_Response_eaa426220848a39e = function(arg0) { let result; try { result = getObject(arg0) instanceof Response; @@ -474,25 +477,40 @@ function getImports() { const ret = result; return ret; }; - imports.wbg.__wbg_url_31e1075302fd753f = function(arg0, arg1) { + imports.wbg.__wbg_url_74285ddf2747cb3d = function(arg0, arg1) { const ret = getObject(arg1).url; const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); const len0 = WASM_VECTOR_LEN; getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; }; - imports.wbg.__wbg_status_b1116741940de98b = function(arg0) { + imports.wbg.__wbg_status_c4ef3dd591e63435 = function(arg0) { const ret = getObject(arg0).status; return ret; }; - imports.wbg.__wbg_headers_bb43d11ba08fa4bd = function(arg0) { + imports.wbg.__wbg_headers_fd64ad685cf22e5d = function(arg0) { const ret = getObject(arg0).headers; return addHeapObject(ret); }; - imports.wbg.__wbg_text_84312300339af335 = function() { return handleError(function (arg0) { + imports.wbg.__wbg_text_1169d752cc697903 = function() { return handleError(function (arg0) { const ret = getObject(arg0).text(); return addHeapObject(ret); }, arguments) }; + imports.wbg.__wbg_signal_31753ac644b25fbb = function(arg0) { + const ret = getObject(arg0).signal; + return addHeapObject(ret); + }; + imports.wbg.__wbg_new_6396e586b56e1dff = function() { return handleError(function () { + const ret = new AbortController(); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_abort_064ae59cda5cd244 = function(arg0) { + getObject(arg0).abort(); + }; + imports.wbg.__wbg_newwithstrandinit_05d7180788420c40 = function() { return handleError(function (arg0, arg1, arg2) { + const ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2)); + return addHeapObject(ret); + }, arguments) }; imports.wbg.__wbg_new_abda76e883ba8a5f = function() { const ret = new Error(); return addHeapObject(ret); @@ -525,11 +543,11 @@ function getImports() { const ret = typeof(val) === 'object' && val !== null; return ret; }; - imports.wbg.__wbg_newnoargs_e60ecc77c37e3a52 = function(arg0, arg1) { + imports.wbg.__wbg_newnoargs_b5b063fc6c2f0376 = function(arg0, arg1) { const ret = new Function(getStringFromWasm0(arg0, arg1)); return addHeapObject(ret); }; - imports.wbg.__wbg_next_204d18f7da3b87aa = function(arg0) { + imports.wbg.__wbg_next_579e583d33566a86 = function(arg0) { const ret = getObject(arg0).next; return addHeapObject(ret); }; @@ -537,31 +555,31 @@ function getImports() { const ret = typeof(getObject(arg0)) === 'function'; return ret; }; - imports.wbg.__wbg_value_55672421087ba68e = function(arg0) { + imports.wbg.__wbg_value_1ccc36bc03462d71 = function(arg0) { const ret = getObject(arg0).value; return addHeapObject(ret); }; - imports.wbg.__wbg_iterator_06c08a312c33a792 = function() { + imports.wbg.__wbg_iterator_6f9d4f28845f426c = function() { const ret = Symbol.iterator; return addHeapObject(ret); }; - imports.wbg.__wbg_new_c985446080b753ed = function() { + imports.wbg.__wbg_new_0b9bfdd97583284e = function() { const ret = new Object(); return addHeapObject(ret); }; - imports.wbg.__wbg_self_6626a919974a3fe1 = function() { return handleError(function () { + imports.wbg.__wbg_self_6d479506f72c6a71 = function() { return handleError(function () { const ret = self.self; return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_window_53efdaa5bfb50c7e = function() { return handleError(function () { + imports.wbg.__wbg_window_f2557cc78490aceb = function() { return handleError(function () { const ret = window.window; return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_globalThis_1d749c41ddffdb92 = function() { return handleError(function () { + imports.wbg.__wbg_globalThis_7f206bda628d5286 = function() { return handleError(function () { const ret = globalThis.globalThis; return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_global_ab5d31db46028bf4 = function() { return handleError(function () { + imports.wbg.__wbg_global_ba75c50d1cf384f4 = function() { return handleError(function () { const ret = global.global; return addHeapObject(ret); }, arguments) }; @@ -569,30 +587,30 @@ function getImports() { const ret = getObject(arg0) === undefined; return ret; }; - imports.wbg.__wbg_call_f14a389d3721b1c3 = function() { return handleError(function (arg0, arg1) { + imports.wbg.__wbg_call_97ae9d8645dc388b = function() { return handleError(function (arg0, arg1) { const ret = getObject(arg0).call(getObject(arg1)); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_call_fd5f197e56af4014 = function() { return handleError(function (arg0, arg1, arg2) { + imports.wbg.__wbg_call_168da88779e35f61 = function() { return handleError(function (arg0, arg1, arg2) { const ret = getObject(arg0).call(getObject(arg1), getObject(arg2)); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_next_74bb1f65e2afa2ac = function() { return handleError(function (arg0) { + imports.wbg.__wbg_next_aaef7c8aa5e212ac = function() { return handleError(function (arg0) { const ret = getObject(arg0).next(); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_done_3a03f6e9c5c77561 = function(arg0) { + imports.wbg.__wbg_done_1b73b0672e15f234 = function(arg0) { const ret = getObject(arg0).done; return ret; }; - imports.wbg.__wbg_new_54a2183d2c64f703 = function(arg0, arg1) { + imports.wbg.__wbg_new_9962f939219f1820 = function(arg0, arg1) { try { var state0 = {a: arg0, b: arg1}; var cb0 = (arg0, arg1) => { const a = state0.a; state0.a = 0; try { - return __wbg_adapter_83(a, state0.b, arg0, arg1); + return __wbg_adapter_84(a, state0.b, arg0, arg1); } finally { state0.a = a; } @@ -603,46 +621,46 @@ function getImports() { state0.a = state0.b = 0; } }; - imports.wbg.__wbg_resolve_06857cc092d7a5a5 = function(arg0) { + imports.wbg.__wbg_resolve_99fe17964f31ffc0 = function(arg0) { const ret = Promise.resolve(getObject(arg0)); return addHeapObject(ret); }; - imports.wbg.__wbg_then_9d00e221486eb3fd = function(arg0, arg1) { + imports.wbg.__wbg_then_11f7a54d67b4bfad = function(arg0, arg1) { const ret = getObject(arg0).then(getObject(arg1)); return addHeapObject(ret); }; - imports.wbg.__wbg_then_1a0d89f52d89bc91 = function(arg0, arg1, arg2) { + imports.wbg.__wbg_then_cedad20fbbd9418a = function(arg0, arg1, arg2) { const ret = getObject(arg0).then(getObject(arg1), getObject(arg2)); return addHeapObject(ret); }; - imports.wbg.__wbg_buffer_dbc8aa65574f18f0 = function(arg0) { + imports.wbg.__wbg_buffer_3f3d764d4747d564 = function(arg0) { const ret = getObject(arg0).buffer; return addHeapObject(ret); }; - imports.wbg.__wbg_newwithbyteoffsetandlength_dc61a8150553a946 = function(arg0, arg1, arg2) { + imports.wbg.__wbg_newwithbyteoffsetandlength_d9aa266703cb98be = function(arg0, arg1, arg2) { const ret = new Uint8Array(getObject(arg0), arg1 >>> 0, arg2 >>> 0); return addHeapObject(ret); }; - imports.wbg.__wbg_new_397df785177a4c42 = function(arg0) { + imports.wbg.__wbg_new_8c3f0052272a457a = function(arg0) { const ret = new Uint8Array(getObject(arg0)); return addHeapObject(ret); }; - imports.wbg.__wbg_stringify_4f9ffcaf0f4c3046 = function() { return handleError(function (arg0) { - const ret = JSON.stringify(getObject(arg0)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_get_838d84ef03e3a353 = function() { return handleError(function (arg0, arg1) { + imports.wbg.__wbg_get_765201544a2b6869 = function() { return handleError(function (arg0, arg1) { const ret = Reflect.get(getObject(arg0), getObject(arg1)); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_has_d8ce53e88270beb1 = function() { return handleError(function (arg0, arg1) { + imports.wbg.__wbg_has_8359f114ce042f5a = function() { return handleError(function (arg0, arg1) { const ret = Reflect.has(getObject(arg0), getObject(arg1)); return ret; }, arguments) }; - imports.wbg.__wbg_set_c1da7a4e82cfe2ad = function() { return handleError(function (arg0, arg1, arg2) { + imports.wbg.__wbg_set_bf3f89b92d5a34bf = function() { return handleError(function (arg0, arg1, arg2) { const ret = Reflect.set(getObject(arg0), getObject(arg1), getObject(arg2)); return ret; }, arguments) }; + imports.wbg.__wbg_stringify_d6471d300ded9b68 = function() { return handleError(function (arg0) { + const ret = JSON.stringify(getObject(arg0)); + return addHeapObject(ret); + }, arguments) }; imports.wbg.__wbindgen_debug_string = function(arg0, arg1) { const ret = debugString(getObject(arg1)); const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); @@ -657,8 +675,8 @@ function getImports() { const ret = wasm.memory; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper2246 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 285, __wbg_adapter_24); + imports.wbg.__wbindgen_closure_wrapper2298 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 260, __wbg_adapter_24); return addHeapObject(ret); }; diff --git a/apps/gipy/pkg/gps_bg.wasm b/apps/gipy/pkg/gps_bg.wasm index 9fef1e28f..6999cb946 100644 Binary files a/apps/gipy/pkg/gps_bg.wasm and b/apps/gipy/pkg/gps_bg.wasm differ diff --git a/apps/gipy/pkg/gps_bg.wasm.d.ts b/apps/gipy/pkg/gps_bg.wasm.d.ts index 99806d7e5..df9a024fa 100644 --- a/apps/gipy/pkg/gps_bg.wasm.d.ts +++ b/apps/gipy/pkg/gps_bg.wasm.d.ts @@ -2,17 +2,18 @@ /* eslint-disable */ export const memory: WebAssembly.Memory; export function __wbg_gps_free(a: number): void; -export function get_polygon(a: number, b: number): void; -export function get_gps_content(a: number, b: number): void; export function get_gps_map_svg(a: number, b: number): void; +export function get_polygon(a: number, b: number): void; +export function get_polyline(a: number, b: number): void; +export function get_gps_content(a: number, b: number): void; export function request_map(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number): number; export function load_gps_from_string(a: number, b: number): number; export function gps_from_area(a: number, b: number, c: number, d: number): number; export function __wbindgen_malloc(a: number): number; export function __wbindgen_realloc(a: number, b: number, c: number): number; export const __wbindgen_export_2: WebAssembly.Table; -export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h6bb6801698d941c0(a: number, b: number, c: number): void; +export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hab13c10d53cd1c5a(a: number, b: number, c: number): void; export function __wbindgen_add_to_stack_pointer(a: number): number; export function __wbindgen_free(a: number, b: number): void; export function __wbindgen_exn_store(a: number): void; -export function wasm_bindgen__convert__closures__invoke2_mut__h33169a25550cd50b(a: number, b: number, c: number, d: number): void; +export function wasm_bindgen__convert__closures__invoke2_mut__h26ce002f44a5439b(a: number, b: number, c: number, d: number): void;