Skip to content
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.

Sign up for GitHub

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] fix IVectorLayer.getStyle typing #75829

Merged
merged 4 commits into from
Aug 25, 2020
Merged

[Maps] fix IVectorLayer.getStyle typing #75829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
784862c
[Maps] fix IVectorLayer.getStyle typing
nreese Aug 24, 2020
133d263
update typing in VectorLayer type definition
nreese Aug 24, 2020
f8dbc9d
fix unit tests
nreese Aug 24, 2020
de6db09
review feedback
nreese Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ export interface IVectorLayer extends ILayer {
getJoins(): IJoin[];
getValidJoins(): IJoin[];
getSource(): IVectorSource;
getStyle(): IVectorStyle;
getFeatureById(id: string | number): Feature | null;
getPropertiesForTooltip(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
hasJoins(): boolean;
Expand Down Expand Up @@ -79,7 +78,6 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
_setMbPointsProperties(mbMap: unknown, mvtSourceLayer?: string): void;
_setMbLinePolygonProperties(mbMap: unknown, mvtSourceLayer?: string): void;
getSource(): IVectorSource;
getStyle(): IVectorStyle;
getFeatureById(id: string | number): Feature | null;
getPropertiesForTooltip(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
hasJoins(): boolean;
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/maps/public/classes/styles/vector/properties/__tests__/test_util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

// eslint-disable-next-line max-classes-per-file
import { FIELD_ORIGIN } from '../../../../../../common/constants';
import { FIELD_ORIGIN, LAYER_STYLE_TYPE } from '../../../../../../common/constants';
import { StyleMeta } from '../../style_meta';
import {
CategoryFieldMeta,
Expand Down Expand Up @@ -44,7 +44,7 @@ export class MockStyle implements IStyle {
}

getType() {
return 'mockStyle';
return LAYER_STYLE_TYPE.VECTOR;
}

getStyleMeta(): StyleMeta {
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
import { IField } from '../../../fields/field';
import { IVectorLayer } from '../../../layers/vector_layer/vector_layer';
import { IJoin } from '../../../joins/join';
import { IVectorStyle } from '../vector_style';

export interface IDynamicStyleProperty<T> extends IStyleProperty<T> {
getFieldMetaOptions(): FieldMetaOptions;
Expand Down Expand Up @@ -88,7 +89,7 @@ export class DynamicStyleProperty<T> extends AbstractStyleProperty<T>
}

getRangeFieldMeta() {
const style = this._layer.getStyle();
const style = this._layer.getStyle() as IVectorStyle;
const styleMeta = style.getStyleMeta();
const fieldName = this.getFieldName();
const rangeFieldMetaFromLocalFeatures = styleMeta.getRangeFieldMetaDescriptor(fieldName);
Expand All @@ -113,7 +114,7 @@ export class DynamicStyleProperty<T> extends AbstractStyleProperty<T>
}

getCategoryFieldMeta() {
const style = this._layer.getStyle();
const style = this._layer.getStyle() as IVectorStyle;
const styleMeta = style.getStyleMeta();
const fieldName = this.getFieldName();
const categoryFieldMetaFromLocalFeatures = styleMeta.getCategoryFieldMetaDescriptor(fieldName);
Expand Down