Skip to content

Commit

Permalink
Added checkbox for cluster attribute (#810)
Browse files Browse the repository at this point in the history
* Added additional checkbox to set the cluster attribute when adding a GeoJson source

* Fixed default source function in the 'geojson_json' case

---------

Co-authored-by: shimon <[email protected]>
  • Loading branch information
Eliav-B and Shimonshawat authored Oct 20, 2023
1 parent 3727c9a commit 393f4a3
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 13 deletions.
1 change: 1 addition & 0 deletions src/components/ModalSources.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ class AddSource extends React.Component {
}
case 'geojson_json': return {
type: 'geojson',
cluster: source.cluster || false,
data: {}
}
case 'tilejson_vector': return {
Expand Down
39 changes: 26 additions & 13 deletions src/components/ModalSourcesTypeEditor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import FieldSelect from './FieldSelect'
import FieldDynamicArray from './FieldDynamicArray'
import FieldArray from './FieldArray'
import FieldJson from './FieldJson'
import FieldCheckbox from './FieldCheckbox'


class TileJSONSourceEditor extends React.Component {
Expand Down Expand Up @@ -80,7 +81,7 @@ class TileURLSourceEditor extends React.Component {
})}
/>
{this.props.children}
</div>
</div>

}
}
Expand Down Expand Up @@ -205,23 +206,35 @@ class GeoJSONSourceFieldJsonEditor extends React.Component {
}

render() {
return <Block label={"GeoJSON"} fieldSpec={latest.source_geojson.data}>
<FieldJson
layer={this.props.source.data}
maxHeight={200}
mode={{
name: "javascript",
json: true
}}
lint={true}
onChange={data => {
return <div>
<Block label={"GeoJSON"} fieldSpec={latest.source_geojson.data}>
<FieldJson
layer={this.props.source.data}
maxHeight={200}
mode={{
name: "javascript",
json: true
}}
lint={true}
onChange={data => {
this.props.onChange({
...this.props.source,
data,
})
}}
/>
</Block>
<FieldCheckbox
label={'Cluster'}
value={this.props.source.cluster}
onChange={cluster => {
this.props.onChange({
...this.props.source,
data,
cluster: cluster,
})
}}
/>
</Block>
</div>
}
}

Expand Down

0 comments on commit 393f4a3

Please sign in to comment.