-
Notifications
You must be signed in to change notification settings - Fork 8.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Maps] Add XYZTMSSource unit test #58567
Merged
thomasneirynck
merged 10 commits into
elastic:master
from
thomasneirynck:maps/type_test
Feb 26, 2020
Merged
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
653ae4f
add some dummy typing
thomasneirynck 53792fa
add sample unit test
thomasneirynck 5db064f
add constructor to al
thomasneirynck 899d221
trim definition to minimum
thomasneirynck d1dec2c
lock down tilelayer constructor
thomasneirynck 14e0e88
add some more tests
thomasneirynck 050ef14
Merge branch 'master' into maps/type_test
thomasneirynck 0fb3a68
move test
thomasneirynck 391f11c
relax type-check
thomasneirynck 0396bf8
fix test name
thomasneirynck File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
import { ILayerDescriptor } from '../../common/descriptor_types'; | ||
import { ISource } from './sources/source'; | ||
|
||
export interface ILayer { | ||
destroy(): void; | ||
} | ||
|
||
interface ILayerArguments { | ||
layerDescriptor: ILayerDescriptor; | ||
source: ISource; | ||
} | ||
|
||
export class AbstractLayer implements ILayer { | ||
constructor(layerArguments: ILayerArguments); | ||
destroy(): void; | ||
} |
18 changes: 18 additions & 0 deletions
18
x-pack/legacy/plugins/maps/public/layers/sources/source.d.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { ISourceDescriptor } from '../../../common/descriptor_types'; | ||
import { ILayer } from '../layer'; | ||
|
||
export interface ISource { | ||
createDefaultLayer(): ILayer; | ||
} | ||
|
||
export class AbstractSource implements ISource { | ||
constructor(sourceDescriptor: ISourceDescriptor, inspectorAdapters: object); | ||
|
||
createDefaultLayer(): ILayer; | ||
} |
15 changes: 15 additions & 0 deletions
15
x-pack/legacy/plugins/maps/public/layers/sources/tms_source.d.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { AbstractSource, ISource } from './source'; | ||
|
||
export interface ITMSSource extends ISource { | ||
getUrlTemplate(): Promise<string>; | ||
} | ||
|
||
export class AbstractTMSSource extends AbstractSource implements ITMSSource { | ||
getUrlTemplate(): Promise<string>; | ||
} |
11 changes: 11 additions & 0 deletions
11
x-pack/legacy/plugins/maps/public/layers/sources/xyz_tms_source.d.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
import { AbstractTMSSource } from './tms_source'; | ||
import { IXYZTMSSourceDescriptor } from '../../../common/descriptor_types'; | ||
|
||
export class XYZTMSSource extends AbstractTMSSource { | ||
constructor(sourceDescriptor: IXYZTMSSourceDescriptor, inspectorAdapters: unknown); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
x-pack/legacy/plugins/maps/public/layers/sources/xyz_tms_source.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { XYZTMSSource } from './xyz_tms_source'; | ||
import { ILayer } from '../layer'; | ||
import { TileLayer } from '../tile_layer'; | ||
import { EMS_XYZ } from '../../../common/constants'; | ||
import { IXYZTMSSourceDescriptor } from '../../../common/descriptor_types'; | ||
|
||
const descriptor: IXYZTMSSourceDescriptor = { | ||
type: EMS_XYZ, | ||
urlTemplate: 'https://example.com/{x}/{y}/{z}.png', | ||
id: 'foobar', | ||
}; | ||
describe('xyz Tilemap Source', () => { | ||
it('should create a tile-layer', () => { | ||
const source = new XYZTMSSource(descriptor, null); | ||
const layer: ILayer = source.createDefaultLayer(); | ||
expect(layer instanceof TileLayer).toEqual(true); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is more to illustrate the typing in this PR. When |
||
}); | ||
|
||
it('should echo url template', () => { | ||
const source = new XYZTMSSource(descriptor, null); | ||
const template = source.getUrlTemplate(); | ||
expect(template).toEqual(descriptor.urlTemplate); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { AbstractLayer } from './layer'; | ||
|
||
export class TileLayer extends AbstractLayer {} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this import was an oversight. remove.