Skip to content

Commit

Permalink
Merge branch 'task-manager/schema-config' of github.com:gmmorris/kiba…
Browse files Browse the repository at this point in the history 
…na into task-manager/schema-config

* 'task-manager/schema-config' of github.com:gmmorris/kibana:
  [Maps] push mapbox value extraction from VectorStyle and into DynamicStyleProperty (elastic#53806)
  • Loading branch information
@gmmorris
gmmorris committed Jan 3, 2020
2 parents 5f8e2e5 + f317390 commit ce915d8
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 80 deletions.
17 changes: 16 additions & 1 deletion x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,23 @@ function getSymbolSizeIcons() {
}

export class DynamicSizeProperty extends DynamicStyleProperty {
constructor(options, styleName, field, getFieldMeta, getFieldFormatter, isSymbolizedAsIcon) {
super(options, styleName, field, getFieldMeta, getFieldFormatter);
this._isSymbolizedAsIcon = isSymbolizedAsIcon;
}

supportsFeatureState() {
return this.getStyleName() !== VECTOR_STYLES.LABEL_SIZE;
// mb style "icon-size" does not support feature state
if (this.getStyleName() === VECTOR_STYLES.ICON_SIZE && this._isSymbolizedAsIcon) {
return false;
}

// mb style "text-size" does not support feature state
if (this.getStyleName() === VECTOR_STYLES.LABEL_SIZE) {
return false;
}

return true;
}

syncHaloWidthWithMb(mbLayerId, mbMap) {
Expand Down
26 changes: 21 additions & 5 deletions x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { AbstractStyleProperty } from './style_property';
import { DEFAULT_SIGMA } from '../vector_style_defaults';
import { STYLE_TYPE } from '../../../../../common/constants';
import { DynamicLegendRow } from './components/dynamic_legend_row';
import { scaleValue } from '../style_util';
import React from 'react';

export class DynamicStyleProperty extends AbstractStyleProperty {
Expand Down Expand Up @@ -119,13 +120,28 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
}

formatField(value) {
if (this.getField()) {
const fieldName = this.getField().getName();
const fieldFormatter = this._getFieldFormatter(fieldName);
return fieldFormatter ? fieldFormatter(value) : value;
} else {
if (!this.getField()) {
return value;
}

const fieldName = this.getField().getName();
const fieldFormatter = this._getFieldFormatter(fieldName);
return fieldFormatter ? fieldFormatter(value) : value;
}

getMbValue(value) {
if (!this.isOrdinal()) {
return this.formatField(value);
}

const valueAsFloat = parseFloat(value);
if (this.isScaled()) {
return scaleValue(valueAsFloat, this.getFieldMeta());
}
if (isNaN(valueAsFloat)) {
return 0;
}
return valueAsFloat;
}

renderLegendDetailRow() {
Expand Down
89 changes: 15 additions & 74 deletions x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { VectorStyleLegend } from './components/legend/vector_style_legend';
import { VECTOR_SHAPE_TYPES } from '../../sources/vector_feature_types';
import { SYMBOLIZE_AS_CIRCLE, SYMBOLIZE_AS_ICON } from './vector_constants';
import { getMakiSymbolAnchor } from './symbol_utils';
import { getComputedFieldName, isOnlySingleFeatureType, scaleValue } from './style_util';
import { getComputedFieldName, isOnlySingleFeatureType } from './style_util';
import { StaticStyleProperty } from './properties/static_style_property';
import { DynamicStyleProperty } from './properties/dynamic_style_property';
import { DynamicSizeProperty } from './properties/dynamic_size_property';
Expand Down Expand Up @@ -81,7 +81,8 @@ export class VectorStyle extends AbstractStyle {
);
this._iconSizeStyleProperty = this._makeSizeProperty(
this._descriptor.properties[VECTOR_STYLES.ICON_SIZE],
VECTOR_STYLES.ICON_SIZE
VECTOR_STYLES.ICON_SIZE,
this._descriptor.properties[VECTOR_STYLES.SYMBOL].options.symbolizeAs === SYMBOLIZE_AS_ICON
);
this._iconOrientationProperty = this._makeOrientationProperty(
this._descriptor.properties[VECTOR_STYLES.ICON_ORIENTATION],
Expand Down Expand Up @@ -434,37 +435,6 @@ export class VectorStyle extends AbstractStyle {
);
}

_getFeatureStyleParams() {
return this.getDynamicPropertiesArray().map(styleProperty => {
// "feature-state" data expressions are not supported with layout properties.
// To work around this limitation, some styling values must fall back to geojson property values.
let supportsFeatureState;
let isScaled;
// TODO move first check into DynamicSizeProperty.supportsFeatureState
if (
styleProperty.getStyleName() === VECTOR_STYLES.ICON_SIZE &&
this._descriptor.properties.symbol.options.symbolizeAs === SYMBOLIZE_AS_ICON
) {
supportsFeatureState = false;
isScaled = true;
} else {
supportsFeatureState = styleProperty.supportsFeatureState();
isScaled = styleProperty.isScaled();
}

const field = styleProperty.getField();
return {
supportsFeatureState,
isScaled,
isOrdinal: styleProperty.isOrdinal(),
name: field.getName(),
meta: this._getFieldMeta(field.getName()),
formatter: this._getFieldFormatter(field.getName()),
computedName: getComputedFieldName(styleProperty.getStyleName(), field.getName()),
};
});
}

clearFeatureState(featureCollection, mbMap, sourceId) {
const tmpFeatureIdentifier = {
source: null,
Expand All @@ -478,27 +448,13 @@ export class VectorStyle extends AbstractStyle {
}
}

_getOrdinalValue(value, isScaled, range) {
const valueAsFloat = parseFloat(value);

if (isScaled) {
return scaleValue(valueAsFloat, range);
}

if (isNaN(valueAsFloat)) {
return 0;
}

return valueAsFloat;
}

setFeatureStateAndStyleProps(featureCollection, mbMap, mbSourceId) {
if (!featureCollection) {
return;
}

const featureStateParams = this._getFeatureStyleParams();
if (featureStateParams.length === 0) {
const dynamicStyleProps = this.getDynamicPropertiesArray();
if (dynamicStyleProps.length === 0) {
return;
}

Expand All @@ -508,31 +464,15 @@ export class VectorStyle extends AbstractStyle {
};
const tmpFeatureState = {};

//scale to [0,1] domain
for (let i = 0; i < featureCollection.features.length; i++) {
const feature = featureCollection.features[i];

for (let j = 0; j < featureStateParams.length; j++) {
const {
supportsFeatureState,
isScaled,
isOrdinal,
name,
meta: range,
formatter,
computedName,
} = featureStateParams[j];

let styleValue;
if (isOrdinal) {
styleValue = this._getOrdinalValue(feature.properties[name], isScaled, range);
} else if (formatter) {
styleValue = formatter(feature.properties[name]);
} else {
styleValue = feature.properties[name];
}

if (supportsFeatureState) {
for (let j = 0; j < dynamicStyleProps.length; j++) {
const dynamicStyleProp = dynamicStyleProps[j];
const name = dynamicStyleProp.getField().getName();
const computedName = getComputedFieldName(dynamicStyleProp.getStyleName(), name);
const styleValue = dynamicStyleProp.getMbValue(feature.properties[name]);
if (dynamicStyleProp.supportsFeatureState()) {
tmpFeatureState[computedName] = styleValue;
} else {
feature.properties[computedName] = styleValue;
Expand All @@ -547,7 +487,7 @@ export class VectorStyle extends AbstractStyle {
//this return-value is used in an optimization for style-updates with mapbox-gl.
//`true` indicates the entire data needs to reset on the source (otherwise the style-rules will not be reapplied)
//`false` indicates the data does not need to be reset on the store, because styles are re-evaluated if they use featureState
return featureStateParams.some(({ supportsFeatureState }) => !supportsFeatureState);
return dynamicStyleProps.some(dynamicStyleProp => !dynamicStyleProp.supportsFeatureState());
}

arePointsSymbolizedAsCircles() {
Expand Down Expand Up @@ -614,7 +554,7 @@ export class VectorStyle extends AbstractStyle {
}
}

_makeSizeProperty(descriptor, styleName) {
_makeSizeProperty(descriptor, styleName, isSymbolizedAsIcon) {
if (!descriptor || !descriptor.options) {
return new StaticSizeProperty({ size: 0 }, styleName);
} else if (descriptor.type === StaticStyleProperty.type) {
Expand All @@ -626,7 +566,8 @@ export class VectorStyle extends AbstractStyle {
styleName,
field,
this._getFieldMeta,
this._getFieldFormatter
this._getFieldFormatter,
isSymbolizedAsIcon
);
} else {
throw new Error(`${descriptor} not implemented`);
Expand Down

0 comments on commit ce915d8

Please sign in to comment.