gipy: ok for release

pull/3545/head
frederic wagner 2024-07-27 13:24:03 +02:00
parent 95875276f6
commit cac7374021
5 changed files with 14 additions and 20 deletions

View File

@ -105,30 +105,30 @@ class TilesOffsets {
offset += 2; offset += 2;
let bytes = (type_size==24)?3:2; let bytes = (type_size==24)?3:2;
let buffer = E.toArrayBuffer(s.read(filename, offset, bytes_per_tile_index*non_empty_tiles_number+bytes*non_empty_tiles_number)); let buffer = E.toArrayBuffer(s.read(filename, offset, bytes_per_tile_index*non_empty_tiles_number));
if (bytes_per_tile_index == 2) { if (bytes_per_tile_index == 2) {
this.non_empty_tiles = Uint16Array(buffer, 0, non_empty_tiles_number); this.non_empty_tiles = Uint16Array(buffer, 0, non_empty_tiles_number);
} else { } else {
this.non_empty_tiles = Uint24Array(buffer, 0, non_empty_tiles_number); this.non_empty_tiles = Uint24Array(buffer, 0, non_empty_tiles_number);
} }
offset += bytes_per_tile_index * non_empty_tiles_number; offset += bytes_per_tile_index * non_empty_tiles_number;
let tile_buffer = E.toArrayBuffer(s.read(filename, offset, bytes*non_empty_tiles_number));
if (type_size == 24) { if (type_size == 24) {
this.non_empty_tiles_ends = Uint24Array( this.non_empty_tiles_ends = Uint24Array(
buffer, tile_buffer,
2*non_empty_tiles_number, 0,
non_empty_tiles_number non_empty_tiles_number
); );
offset += 3 * non_empty_tiles_number;
} else if (type_size == 16) { } else if (type_size == 16) {
this.non_empty_tiles_ends = Uint16Array( this.non_empty_tiles_ends = Uint16Array(
buffer, tile_buffer,
2*non_empty_tiles_number, 0,
non_empty_tiles_number non_empty_tiles_number
); );
offset += 2 * non_empty_tiles_number;
} else { } else {
throw "unknown size"; throw "unknown size";
} }
offset += bytes * non_empty_tiles_number;
return [this, offset]; return [this, offset];
} }
tile_start_offset(tile_index) { tile_start_offset(tile_index) {
@ -183,10 +183,7 @@ class Map {
offset += 8; offset += 8;
// tiles offsets // tiles offsets
let bytes_per_tile_index = 2; let bytes_per_tile_index = (this.grid_size[0] * this.grid_size[1] > 65536)?3:2;
if (this.grid_size[0] * this.grid_size[1]) >= 65536 {
bytes_per_tile_index = 3;
}
let res = new TilesOffsets(filename, offset, bytes_per_tile_index); let res = new TilesOffsets(filename, offset, bytes_per_tile_index);
this.tiles_offsets = res[0]; this.tiles_offsets = res[0];
offset = res[1]; offset = res[1];
@ -322,11 +319,8 @@ class Interests {
this.side = side_array[0]; this.side = side_array[0];
offset += 8; offset += 8;
let bytes_per_tile_index = 2; let bytes_per_tile_index = (this.grid_size[0] * this.grid_size[1] > 65536)?3:2;
if (this.grid_size[0] * this.grid_size[1]) >= 65536 { let res = new TilesOffsets(filename, offset, bytes_per_tile_index);
bytes_per_tile_index = 3;
}
let res = new TilesOffsets(filename, offset);
offset = res[1]; offset = res[1];
this.offsets = res[0]; this.offsets = res[0];
let end = this.offsets.end_offset(); let end = this.offsets.end_offset();

View File

@ -1,5 +1,5 @@
/* tslint:disable */ /* tslint:disable */
/* eslint-disable */
/** /**
* @param {Gps} gps * @param {Gps} gps
*/ */

View File

@ -695,8 +695,8 @@ function getImports() {
const ret = wasm.memory; const ret = wasm.memory;
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper2378 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper2375 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 302, __wbg_adapter_24); const ret = makeMutClosure(arg0, arg1, 301, __wbg_adapter_24);
return addHeapObject(ret); return addHeapObject(ret);
}; };

Binary file not shown.

View File

@ -1,5 +1,5 @@
/* tslint:disable */ /* tslint:disable */
/* eslint-disable */
export const memory: WebAssembly.Memory; export const memory: WebAssembly.Memory;
export function __wbg_gps_free(a: number): void; export function __wbg_gps_free(a: number): void;
export function disable_elevation(a: number): void; export function disable_elevation(a: number): void;