ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2025-12-12 01:00:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix/update-deps

Browse Source 
Conflicts:
	src/components/Toolbar.jsx
This commit is contained in:
orangemug
2017-11-08 09:01:35 +00:00
parent f79a945fa4 616f45c586
commit 3aae2e976f
10 changed files with 145 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/fields/FunctionSpecField.jsx
View File

@@ -90,6 +90,16 @@ export default class FunctionSpecProperty extends React.Component {
this.props.onChange(this.props.fieldName, zoomFunc)
}
getFieldFunctionType(fieldSpec) {
if (fieldSpec.function === "interpolated") {
return "exponential"
}
if (fieldSpec.type === "number") {
return "interval"
}
return "categorical"
}
getDataFunctionTypes(functionType) {
if (functionType === "interpolated") {
return ["categorical", "interval", "exponential"]
@@ -132,6 +142,9 @@ export default class FunctionSpecProperty extends React.Component {
}
renderDataProperty() {
if (typeof this.props.value.type === "undefined") {
this.props.value.type = this.getFieldFunctionType(this.props.fieldSpec)
}
const dataFields = this.props.value.stops.map((stop, idx) => {
const zoomLevel = stop[0].zoom
const dataLevel = stop[0].value