astro-viewer 3.0.0 → 3.1.0

package/lib-esm/services/tapRepoService.js

@@ -1,9 +1,21 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
+export {};
 // // addTAPRepo.ts
 // import { TapRepo } from '../model/tap/TapRepo.js'
 // import {TapMetadata} from '../model/tap/TapMetadata.js'
 // import {TapMetadataList} from '../model/tap/TapMetadataList.js'
 // import global from '../Global.js'
-export {};
 // import {CatalogueGL} from '../model/catalogues/CatalogueGL.js'
 // import {FootprintSetGL} from '../model/footprints/FootprintSetGL.js'
 // let catId = 1

package/lib-esm/services/types.js

@@ -1 +1,13 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 export {};

package/lib-esm/shader/CatalogueShaderProgram.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 // HiPSShaderProgram.ts
 import { mat4 } from 'gl-matrix';
 import ShaderManager from './ShaderManager.js';

package/lib-esm/shader/FootprintShaderProgram.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 // HiPSShaderProgram.ts
 import { mat4 } from 'gl-matrix';
 import ShaderManager from './ShaderManager.js';

package/lib-esm/shader/GridShaderManager.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 // GridShaderManager.ts
 'use strict';
 class GridShaderManager {

package/lib-esm/shader/HiPSShaderProgram.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 // HiPSShaderProgram.ts
 import ShaderManager from './ShaderManager.js';
 import { ColorMaps } from '../model/ColorMaps.js';

package/lib-esm/shader/ShaderManager.js

@@ -1,4 +1,15 @@
-// ShaderManager.ts
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 export default class ShaderManager {
     static catalogueVS() {
         return `#version 300 es

package/lib-esm/shader/ShaderManagerMutliHiPS.js

@@ -1,4 +1,15 @@
-// ShaderManagerMultiHiPS.ts
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 export default class ShaderManagerMultiHiPS {
     static hipsVS() {
         return `#version 300 es

package/lib-esm/shader/XYZShaderProgram.d.ts

@@ -3,6 +3,7 @@ type XYZLocations = {
     mMatrix: WebGLUniformLocation | null;
     vMatrix: WebGLUniformLocation | null;
     sampler: WebGLUniformLocation | null;
+    colorMapIdx: WebGLUniformLocation | null;
     vertexPositionAttribute: number;
     textureCoordAttribute: number;
 };
@@ -10,11 +11,23 @@ export declare class XYZShaderProgram {
     readonly locations: XYZLocations;
     private _webgl;
     private _shaderProgram?;
+    private _colorMapBlockIndex;
+    private _colorMapBuffer;
+    private _runtimeColorMap;
+    private _colorMapVariableInfo;
     constructor(webgl: WebGL2RenderingContext);
     get shaderProgram(): WebGLProgram;
     enableProgram(): void;
-    enableShaders(pMatrix: Float32Array, vMatrix: Float32Array, mMatrix: Float32Array): void;
+    setRuntimeColorMap(colorMap: {
+        r: Float32Array;
+        g: Float32Array;
+        b: Float32Array;
+    } | undefined): void;
+    enableShaders(pMatrix: Float32Array, vMatrix: Float32Array, mMatrix: Float32Array, colorMapIdx?: number): void;
     private initShaders;
     private compileShader;
+    private initColorMapBuffer;
+    private uploadColorMap;
+    private getColorMap;
 }
 export {};

package/lib-esm/shader/XYZShaderProgram.js

@@ -1,7 +1,28 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
+import { ColorMaps } from '../model/ColorMaps.js';
 export class XYZShaderProgram {
     locations;
     _webgl;
     _shaderProgram;
+    _colorMapBlockIndex = null;
+    _colorMapBuffer = null;
+    _runtimeColorMap;
+    _colorMapVariableInfo = {
+        r_palette: { index: 0, offset: 0 },
+        g_palette: { index: 0, offset: 0 },
+        b_palette: { index: 0, offset: 0 },
+    };
     constructor(webgl) {
         this._webgl = webgl;
         this.locations = {
@@ -9,6 +30,7 @@ export class XYZShaderProgram {
             mMatrix: null,
             vMatrix: null,
             sampler: null,
+            colorMapIdx: null,
             vertexPositionAttribute: -1,
             textureCoordAttribute: -1,
         };
@@ -29,7 +51,10 @@ export class XYZShaderProgram {
     enableProgram() {
         this._webgl.useProgram(this.shaderProgram);
     }
-    enableShaders(pMatrix, vMatrix, mMatrix) {
+    setRuntimeColorMap(colorMap) {
+        this._runtimeColorMap = colorMap;
+    }
+    enableShaders(pMatrix, vMatrix, mMatrix, colorMapIdx = 0) {
         const gl = this._webgl;
         const program = this.shaderProgram;
         gl.useProgram(program);
@@ -37,12 +62,17 @@ export class XYZShaderProgram {
         this.locations.mMatrix = gl.getUniformLocation(program, 'uMMatrix');
         this.locations.vMatrix = gl.getUniformLocation(program, 'uVMatrix');
         this.locations.sampler = gl.getUniformLocation(program, 'uSampler');
+        this.locations.colorMapIdx = gl.getUniformLocation(program, 'cmapIdx');
         this.locations.vertexPositionAttribute = gl.getAttribLocation(program, 'aVertexPosition');
         this.locations.textureCoordAttribute = gl.getAttribLocation(program, 'aTextureCoord');
         gl.uniformMatrix4fv(this.locations.pMatrix, false, pMatrix);
         gl.uniformMatrix4fv(this.locations.vMatrix, false, vMatrix);
         gl.uniformMatrix4fv(this.locations.mMatrix, false, mMatrix);
         gl.uniform1i(this.locations.sampler, 0);
+        gl.uniform1i(this.locations.colorMapIdx, colorMapIdx);
+        if (colorMapIdx >= 2) {
+            this.uploadColorMap(colorMapIdx);
+        }
     }
     initShaders() {
         const gl = this._webgl;
@@ -61,9 +91,40 @@ export class XYZShaderProgram {
       precision mediump float;
       in vec2 vTextureCoord;
       uniform sampler2D uSampler;
+      uniform int cmapIdx;
+
+      layout (std140) uniform colormap {
+        float r_palette[256];
+        float g_palette[256];
+        float b_palette[256];
+      };
+
       out vec4 outColor;
+
       void main(void) {
-        outColor = texture(uSampler, vTextureCoord);
+        vec4 color = texture(uSampler, vTextureCoord);
+
+        if (cmapIdx == 1) {
+          float gray = 0.21 * color.r + 0.71 * color.g + 0.07 * color.b;
+          outColor = vec4(vec3(gray), color.a);
+          return;
+        }
+
+        if (cmapIdx >= 2) {
+          int rIndex = int(clamp(color.r * 255.0, 0.0, 255.0));
+          int gIndex = int(clamp(color.g * 255.0, 0.0, 255.0));
+          int bIndex = int(clamp(color.b * 255.0, 0.0, 255.0));
+
+          outColor = vec4(
+            r_palette[rIndex] / 256.0,
+            g_palette[gIndex] / 256.0,
+            b_palette[bIndex] / 256.0,
+            color.a
+          );
+          return;
+        }
+
+        outColor = color;
       }`);
         gl.attachShader(this._shaderProgram, vertexShader);
         gl.attachShader(this._shaderProgram, fragmentShader);
@@ -71,6 +132,7 @@ export class XYZShaderProgram {
         if (!gl.getProgramParameter(this._shaderProgram, gl.LINK_STATUS)) {
             throw new Error(gl.getProgramInfoLog(this._shaderProgram) || 'Could not initialise XYZ shaders');
         }
+        this.initColorMapBuffer();
     }
     compileShader(type, source) {
         const gl = this._webgl;
@@ -85,4 +147,67 @@ export class XYZShaderProgram {
         }
         return shader;
     }
+    initColorMapBuffer() {
+        const gl = this._webgl;
+        const program = this._shaderProgram;
+        const blockIndex = gl.getUniformBlockIndex(program, 'colormap');
+        if (blockIndex === gl.INVALID_INDEX) {
+            this._colorMapBlockIndex = null;
+            return;
+        }
+        this._colorMapBlockIndex = blockIndex;
+        const variableNames = ['r_palette', 'g_palette', 'b_palette'];
+        const variableIndices = gl.getUniformIndices(program, variableNames);
+        const variableOffsets = gl.getActiveUniforms(program, variableIndices, gl.UNIFORM_OFFSET);
+        variableNames.forEach((name, index) => {
+            this._colorMapVariableInfo[name] = {
+                index: variableIndices[index],
+                offset: variableOffsets[index],
+            };
+        });
+        this._colorMapBuffer = gl.createBuffer();
+        gl.bindBuffer(gl.UNIFORM_BUFFER, this._colorMapBuffer);
+        gl.bufferData(gl.UNIFORM_BUFFER, 3 * 4096, gl.STATIC_DRAW);
+        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
+        gl.bindBufferBase(gl.UNIFORM_BUFFER, 0, this._colorMapBuffer);
+        gl.uniformBlockBinding(program, blockIndex, 0);
+    }
+    uploadColorMap(colorMapIdx) {
+        if (!this._colorMapBuffer || this._colorMapBlockIndex === null) {
+            return;
+        }
+        const colorMap = this.getColorMap(colorMapIdx);
+        if (!colorMap) {
+            return;
+        }
+        const gl = this._webgl;
+        const program = this.shaderProgram;
+        gl.uniformBlockBinding(program, this._colorMapBlockIndex, 0);
+        gl.bindBuffer(gl.UNIFORM_BUFFER, this._colorMapBuffer);
+        const info = this._colorMapVariableInfo;
+        gl.bufferSubData(gl.UNIFORM_BUFFER, info.r_palette.offset, colorMap.r, 0);
+        gl.bufferSubData(gl.UNIFORM_BUFFER, info.g_palette.offset, colorMap.g, 0);
+        gl.bufferSubData(gl.UNIFORM_BUFFER, info.b_palette.offset, colorMap.b, 0);
+        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
+    }
+    getColorMap(colorMapIdx) {
+        switch (colorMapIdx) {
+            case 2:
+                return ColorMaps.planck;
+            case 3:
+                return ColorMaps.cmb;
+            case 4:
+                return ColorMaps.rainbow;
+            case 5:
+                return ColorMaps.eosb;
+            case 6:
+                return ColorMaps.cubehelix;
+            case 7:
+                return ColorMaps.hot;
+            case 8:
+                return ColorMaps.gray;
+            default:
+                return this._runtimeColorMap;
+        }
+    }
 }

package/lib-esm/utils/CoordsType.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 /**
  * Enum for coordinate types.
  * @author Fabrizio Giordano (Fab77)

package/lib-esm/utils/FoVUtils.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 'use strict';
 /**
  * @author Fabrizio Giordano (Fab)

package/lib-esm/utils/GeomUtils.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 import { Point } from "../model/Point.js";
 import Point2D from "../model/Point2D.js";
 import { CoordsType } from "./CoordsType.js";

package/lib-esm/utils/MouseHelper.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 /**
  * @author Fabrizio Giordano (Fab)
  */

package/lib-esm/utils/PerspectiveMatrixManager.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 import { mat4 } from "gl-matrix";
 export class PerspectiveMatrixManager {
     _pMatrix;

package/lib-esm/utils/RayPickingUtils.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 /**
  * @author Fabrizio Giordano (Fab)
  */

package/lib-esm/utils/STCSParser.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 /**
  * @author Fabrizio Giordano (Fab77)
  */

package/lib-esm/utils/ShaderUtility.js

@@ -1,6 +1,18 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
+export {};
 // import global from "../Global.js";
 // // import ShaderManager from "../shader/ShaderManager.js";
-export {};
 // // type GL = WebGLRenderingContext | WebGL2RenderingContext;
 // class ShaderUtility {
 //   private lastUsedProgram: WebGLProgram | null = null;

package/lib-esm/utils/Utils.js

@@ -1,3 +1,15 @@
+/*
+ * AstroViewer
+ * Copyright (C) Fabrizio Giordano
+ * SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
+ *
+ * This file is part of AstroViewer.
+ * AstroViewer is distributed under a dual-license model.
+ * Commercial use requires a separate commercial license.
+ * Non-commercial use is governed by LICENSE-NONCOMMERCIAL.md.
+ *
+ * See LICENSE.md, LICENSE-COMMERCIAL.md, and LICENSE-NONCOMMERCIAL.md for details.
+ */
 /**
  * @author Fabrizio Giordano (Fab)
  */

package/lib-esm/utils/XYZRayPickingUtils.d.ts

@@ -0,0 +1,27 @@
+import { ReadonlyMat4, ReadonlyVec3, vec3 } from 'gl-matrix';
+import Camera from '../Camera.js';
+import { AbstractSkyEntity } from '../model/AbstractSkyEntity.js';
+import type { XYZTileCoord } from '../model/earth/XYZTypes.js';
+export type XYZLonLat = {
+    lonDeg: number;
+    latDeg: number;
+};
+declare class XYZRayPickingUtils {
+    static getRayFromMouse(mouseX: number, mouseY: number, pMatrix: ReadonlyMat4, webgl: WebGL2RenderingContext, vMatrix: ReadonlyMat4): vec3;
+    static raySphere(rayOrigWorld: ReadonlyVec3, rayDirectionWorld: ReadonlyVec3, sphere: Pick<AbstractSkyEntity, 'center' | 'radius'>): number;
+    static getIntersectionPointWithModel(mouseX: number, mouseY: number, xyzModel: AbstractSkyEntity, webgl: WebGL2RenderingContext, camera: Camera, pMatrix: ReadonlyMat4): [number, number, number] | null;
+    static getLonLatFromMouse(mouseX: number, mouseY: number, xyzModel: AbstractSkyEntity, webgl: WebGL2RenderingContext, camera: Camera, pMatrix: ReadonlyMat4): XYZLonLat | null;
+    static getTileFromMouse(mouseX: number, mouseY: number, z: number, xyzModel: AbstractSkyEntity, webgl: WebGL2RenderingContext, camera: Camera, pMatrix: ReadonlyMat4): XYZTileCoord | null;
+    static getVisibleTilesFromViewport(z: number, xyzModel: AbstractSkyEntity, webgl: WebGL2RenderingContext, camera: Camera, pMatrix: ReadonlyMat4, sampleCount?: number, padding?: number): XYZTileCoord[];
+    static modelPointToLonLat(point: Readonly<[number, number, number]>): XYZLonLat;
+    static lonLatToTile(lonDeg: number, latDeg: number, z: number): XYZTileCoord;
+    static getNeighborTiles(tile: XYZTileCoord, ring?: number): XYZTileCoord[];
+    static deduplicateTiles(tiles: XYZTileCoord[]): XYZTileCoord[];
+    private static fillSmallTileGaps;
+    private static latToTileY;
+    private static isMercatorLatitude;
+    private static wrapTileX;
+    private static clampTileY;
+    private static mat4MultiplyVec4;
+}
+export default XYZRayPickingUtils;