schnabu/maputnik
1
0
Fork 0
mirror of https://github.com/a-nyx/maputnik-with-pmtiles.git synced 2024-12-27 09:55:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempt to correctly upgrade old-style filter functions to expressions.

Browse source
This commit is contained in:
orangemug 2020-09-09 15:55:20 +01:00
parent a572bc02a6
commit ae3f79f4ad
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/FilterEditor.jsx
View file

@ -2,8 +2,9 @@ import React from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { combiningFilterOps } from '../libs/filterops.js' import { combiningFilterOps } from '../libs/filterops.js'
import {mdiTableRowPlusAfter} from '@mdi/js'; import {mdiTableRowPlusAfter} from '@mdi/js';
import {isEqual} from 'lodash';
import {latest, validate, migrate} from '@mapbox/mapbox-gl-style-spec' import {latest, validate, migrate, convertFilter} from '@mapbox/mapbox-gl-style-spec'
import InputSelect from './InputSelect' import InputSelect from './InputSelect'
import Block from './Block' import Block from './Block'
import SingleFilterEditor from './SingleFilterEditor' import SingleFilterEditor from './SingleFilterEditor'
@ -155,7 +156,11 @@ export default class FilterEditor extends React.Component {
static getDerivedStateFromProps (props, currentState) { static getDerivedStateFromProps (props, currentState) {
const {filter} = props; const {filter} = props;
const displaySimpleFilter = checkIfSimpleFilter(combiningFilter(props)); const tempFilter = combiningFilter(props);
const expression = convertFilter(tempFilter);
// If we convert a filter that is an expression to an expression it'll remain the same in value
const displaySimpleFilter = !isEqual(expression, tempFilter);
// Upgrade but never downgrade // Upgrade but never downgrade
if (!displaySimpleFilter && currentState.displaySimpleFilter === true) { if (!displaySimpleFilter && currentState.displaySimpleFilter === true) {