Skip to content

use source with data property #176

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

use source with data property #176

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
b493a58
use source with data property
Jun 24, 2024
d76b3af
Merge branch 'main' into mlgeojsonLayer-with-option.source.data
Jun 24, 2024
cec569b
useLayar also with options.source undefined
Jun 24, 2024
08ae66a
unused import removed
Jun 24, 2024
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
12 changes: 9 additions & 3 deletions src/components/MlGeoJsonLayer/MlGeoJsonLayer.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ const OsmProtocolSourceDemo = () => {
mapHook.map?.jumpTo({ center: [2.651811, 39.571309], zoom: 16.5 });
}, [mapHook.map]);

// useSource({sourceId: "test", source: {
// type: 'geojson',
// data: `osm://osm/palma.osm?completeFeature=true&allFeatures=false&renderTagged=false&excludeWay=false&suppressWay=false`,
// } })

return (
<>
<MlGeoJsonLayer
Expand All @@ -112,13 +117,14 @@ const OsmProtocolSourceDemo = () => {
},
}}
options={{
source: {
source:
{
type: 'geojson',
data: `osm://osm/palma.osm?completeFeature=true&allFeatures=false&renderTagged=false&excludeWay=false&suppressWay=false`,
},
}}
labelProp="name"
labelOptions={{
labelOptions={{
paint: {
'text-color': '#ff0000',
},
Expand Down Expand Up @@ -505,4 +511,4 @@ DefaultPaintOverrides.args = { geojson: sample_geojson_1, type: 'fill' };

export const CatalogueDemo = catalogueTemplate.bind({});
CatalogueDemo.parameters = {};
CatalogueDemo.args = {};
CatalogueDemo.args = {};
13 changes: 9 additions & 4 deletions src/components/MlGeoJsonLayer/MlGeoJsonLayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,11 @@ const MlGeoJsonLayer = (props: MlGeoJsonLayerProps) => {
useLayer({
mapId: props.mapId,
layerId: layerId.current,
options: {
source: 'source-' + layerId.current,
...props.options,
options: {
...(typeof props?.options?.source !== 'undefined' &&
typeof props?.options?.source === 'string'
? {source: props.options.source}
: {source: 'source-' + layerId.current}),
paint: {
...(props.paint || getDefaultPaintPropsByType(layerType, props.defaultPaintOverrides)),
...props?.options?.paint,
Expand All @@ -168,7 +170,10 @@ const MlGeoJsonLayer = (props: MlGeoJsonLayerProps) => {
useLayer({
mapId: props.mapId,
options: {
source: props.labelProp ? 'source-' + layerId.current : undefined,
...(typeof props?.options?.source !== 'undefined' &&
Copy link
Member

@cioddi cioddi Aug 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

props.labelProp must still be checked and in case it is undefined options.source prop of label/symbol useLayer hook must be set to undefined to prevent its initialization.

typeof props?.options?.source === 'string'
? {source: props.options.source}
: {source: 'source-' + layerId.current}),
id: labelLayerId,
type: 'symbol',
maxzoom: 24,
Expand Down