Merge pull request #9700 from KaiVolland/9692-typescript

Solves typescript related issues
This commit is contained in:
Tim Schaub
2019-06-21 07:48:15 -06:00
committed by GitHub
4 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -167,7 +167,7 @@ class DragPan extends PointerInteraction {
} }
/** /**
* @param {ol.MapBrowserEvent} mapBrowserEvent Browser event. * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Browser event.
* @return {boolean} Combined condition result. * @return {boolean} Combined condition result.
*/ */
function defaultCondition(mapBrowserEvent) { function defaultCondition(mapBrowserEvent) {
+3 -3
View File
@@ -86,12 +86,12 @@ class VectorTileLayer extends BaseVectorLayer {
delete baseOptions.preload; delete baseOptions.preload;
delete baseOptions.useInterimTilesOnError; delete baseOptions.useInterimTilesOnError;
super(/** @type {import("./Vector.js").Options} */ (baseOptions)); super(/** @type {import("./BaseVector.js").Options} */ (baseOptions));
const renderMode = options.renderMode || VectorTileRenderType.HYBRID; const renderMode = options.renderMode || VectorTileRenderType.HYBRID;
assert(renderMode == undefined || assert(renderMode == undefined ||
renderMode == VectorTileRenderType.IMAGE || renderMode == VectorTileRenderType.IMAGE ||
renderMode == VectorTileRenderType.HYBRID, renderMode == VectorTileRenderType.HYBRID,
28); // `renderMode` must be `'image'` or `'hybrid'` 28); // `renderMode` must be `'image'` or `'hybrid'`
/** /**
+1 -1
View File
@@ -27,7 +27,7 @@ class CompositeMapRenderer extends MapRenderer {
super(map); super(map);
/** /**
* @type {import("./events.js").EventsKey} * @type {import("../events.js").EventsKey}
*/ */
this.labelCacheKey_ = listen(labelCache, EventType.CLEAR, map.redrawText.bind(map)); this.labelCacheKey_ = listen(labelCache, EventType.CLEAR, map.redrawText.bind(map));
+2 -2
View File
@@ -4,7 +4,7 @@
/** /**
* @return {Array<number>} 4x4 matrix representing a 3D identity transform. * @return {Array<number>} "4x4 matrix representing a 3D identity transform."
*/ */
export function create() { export function create() {
return [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; return [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
@@ -14,7 +14,7 @@ export function create() {
/** /**
* @param {Array<number>} mat4 Flattened 4x4 matrix receiving the result. * @param {Array<number>} mat4 Flattened 4x4 matrix receiving the result.
* @param {import("../transform.js").Transform} transform Transformation matrix. * @param {import("../transform.js").Transform} transform Transformation matrix.
* @return {Array<number>} 2D transformation matrix as flattened 4x4 matrix. * @return {Array<number>} "2D transformation matrix as flattened 4x4 matrix."
*/ */
export function fromTransform(mat4, transform) { export function fromTransform(mat4, transform) {
mat4[0] = transform[0]; mat4[0] = transform[0];