chore(deps): Bump maplibre-gl from 5.5.0 to 5.6.2 (#1308)

Bumps [maplibre-gl](https://github.com/maplibre/maplibre-gl-js) from 5.5.0 to 5.6.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/maplibre/maplibre-gl-js/releases">maplibre-gl's releases</a>.</em></p> <blockquote> <h2>v5.6.2</h2> <p><a href="https://github.com/maplibre/maplibre-gl-js">https://github.com/maplibre/maplibre-gl-js</a> <a href="https://github.com/maplibre/maplibre-gl-js/compare/v5.6.1...v5.6.2">Changes</a> since <a href="https://github.com/maplibre/maplibre-gl-js/releases/tag/v5.6.1">MapLibre GL JS v5.6.1</a>:</p> <h3>🐞 Bug fixes</h3> <ul> <li>Fix white artifacts when using non-zero elevation (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/6032">#6032</a>)</li> <li>Fix geolocate control lock loss on window resize and zoom (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/3504">#3504</a>)</li> <li>Fix a memory leak in <code>GeoJSONSource</code> when rapidly updating data (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/6163">#6163</a>)</li> <li>Fix <code>Map.setTransformRequest</code> parameter type to include <code>null</code> (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6179">#6179</a>)</li> <li>Fix typo <code>_rotatePitchHandler</code> in the <code>navigation_control.ts</code> file (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6207">#6207</a>)</li> </ul> <h2>v5.6.1</h2> <p><a href="https://github.com/maplibre/maplibre-gl-js">https://github.com/maplibre/maplibre-gl-js</a> <a href="https://github.com/maplibre/maplibre-gl-js/compare/v5.6.0...v5.6.1">Changes</a> since <a href="https://github.com/maplibre/maplibre-gl-js/releases/tag/v5.6.0">MapLibre GL JS v5.6.0</a>:</p> <h3>🐞 Bug fixes</h3> <ul> <li>Fix use of <code>textureSize</code> call in color relief shader (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5980">#5980</a>)</li> <li>Fix Y axis transformation in projectFromLabelPlaneToClipSpace (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/6021">#6021</a>)</li> <li>Alpha-sort all examples (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/6049">#6049</a>)</li> <li>Ensure opacity is reset for popups when <code>locationOccludedOpacity</code> no longer applicable (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/6088">#6088</a>)</li> </ul> <h2>v5.6.0</h2> <p><a href="https://github.com/maplibre/maplibre-gl-js">https://github.com/maplibre/maplibre-gl-js</a> <a href="https://github.com/maplibre/maplibre-gl-js/compare/v5.5.0...v5.6.0">Changes</a> since <a href="https://github.com/maplibre/maplibre-gl-js/releases/tag/v5.5.0">MapLibre GL JS v5.5.0</a>:</p> <h3>✨ Features and improvements</h3> <ul> <li>Add <code>setGlobalStateProperty()</code> and <code>getGlobalState()</code> to the map public API (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5613">#5613</a>)</li> <li>Improve tile frustum culling for globe, leading to better performance and faster loading times. (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5865">#5865</a>)</li> <li>Add new <code>color-relief</code> layer type to render hypsometric tint from terrain-RGB tiles. (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5742">#5742</a>)</li> </ul> <h3>🐞 Bug fixes</h3> <ul> <li>Fix <code>queryRenderedFeatures</code> bounding box crossing antimeridian in globe view. (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5856">#5856</a>)</li> <li>Fix handling invalid glyph placement results along lines (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5118">#5118</a>)</li> <li>Fix <code>refreshTiles()</code> for vector tiles (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5875">#5875</a>)</li> <li>Revert changes to polygon intersection detection (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5590">#5590</a> caused issue <a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/5864">5864</a>)</li> <li>Fix breaking clusters when non-integer value provided for <code>clusterMaxZoom</code> (warning is shown) (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/5929">#5929</a>) + clarify API docs</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/maplibre/maplibre-gl-js/blob/main/CHANGELOG.md">maplibre-gl's changelog</a>.</em></p> <blockquote> <h2>5.6.2</h2> <h3>🐞 Bug fixes</h3> <ul> <li>Fix white artifacts when using non-zero elevation (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/6032">#6032</a>)</li> <li>Fix geolocate control lock loss on window resize and zoom (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/3504">#3504</a>)</li> <li>Fix a memory leak in <code>GeoJSONSource</code> when rapidly updating data (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/6163">#6163</a>)</li> <li>Fix <code>Map.setTransformRequest</code> parameter type to include <code>null</code> (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6179">#6179</a>)</li> <li>Fix typo <code>_rotatePitchHandler</code> in the <code>navigation_control.ts</code> file (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6207">#6207</a>)</li> </ul> <h2>5.6.1</h2> <h3>🐞 Bug fixes</h3> <ul> <li>Fix use of <code>textureSize</code> call in color relief shader (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5980">#5980</a>)</li> <li>Fix Y axis transformation in projectFromLabelPlaneToClipSpace (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/6021">#6021</a>)</li> <li>Alpha-sort all examples (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/6049">#6049</a>)</li> <li>Ensure opacity is reset for popups when <code>locationOccludedOpacity</code> no longer applicable (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/6088">#6088</a>)</li> </ul> <h2>5.6.0</h2> <h3>✨ Features and improvements</h3> <ul> <li>Add <code>setGlobalStateProperty()</code> and <code>getGlobalState()</code> to the map public API (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5613">#5613</a>)</li> <li>Improve tile frustum culling for globe, leading to better performance and faster loading times. (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5865">#5865</a>)</li> <li>Add new <code>color-relief</code> layer type to render hypsometric tint from terrain-RGB tiles. (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5742">#5742</a>)</li> </ul> <h3>🐞 Bug fixes</h3> <ul> <li>Fix <code>queryRenderedFeatures</code> bounding box crossing antimeridian in globe view. (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5856">#5856</a>)</li> <li>Fix handling invalid glyph placement results along lines (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5118">#5118</a>)</li> <li>Fix <code>refreshTiles()</code> for vector tiles (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5875">#5875</a>)</li> <li>Revert changes to polygon intersection detection (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5590">#5590</a> caused issue <a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/5864">5864</a>)</li> <li>Fix breaking clusters when non-integer value provided for <code>clusterMaxZoom</code> (warning is shown) (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/5929">#5929</a>) + clarify API docs</li> <li>Fix use of reserved GLSL <code>switch</code> statement in hillshade shader (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/pull/5972">#5972</a>)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/maplibre/maplibre-gl-js/commit/7887f2c899dcc7f7bfa8a05f5a98c92bf1a5bf5a"><code>7887f2c</code></a> Bump version to 5.6.2 (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6225">#6225</a>)</li> <li><a href="https://github.com/maplibre/maplibre-gl-js/commit/f3bf5d392ede4d8928028f3275f8d8548ab70565"><code>f3bf5d3</code></a> msft tier update (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6212">#6212</a>)</li> <li><a href="https://github.com/maplibre/maplibre-gl-js/commit/6a66c1193637f608ec2f4f6e43203ccdbe6c83db"><code>6a66c11</code></a> Fix: issue <a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/3504">#3504</a> geolocate lock loss zoom (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6219">#6219</a>)</li> <li><a href="https://github.com/maplibre/maplibre-gl-js/commit/627ddaf4ad1517b253fb645ec073df73511a8004"><code>627ddaf</code></a> chore(deps): bump <code>@mapbox/tiny-sdf</code> from 2.0.6 to 2.0.7 (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6224">#6224</a>)</li> <li><a href="https://github.com/maplibre/maplibre-gl-js/commit/5bbdd804aba154264321bd091d1854921e0f35c4"><code>5bbdd80</code></a> chore(deps-dev): bump <code>@typescript-eslint/eslint-plugin</code> (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6221">#6221</a>)</li> <li><a href="https://github.com/maplibre/maplibre-gl-js/commit/cb873a583369402f267d08b6ba7ef7f4b9ce69b8"><code>cb873a5</code></a> chore(deps-dev): bump <code>@types/node</code> from 24.1.0 to 24.2.0 (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6222">#6222</a>)</li> <li><a href="https://github.com/maplibre/maplibre-gl-js/commit/b20ddb10491a67b78ddb9f3cd171c8b116e5c2dc"><code>b20ddb1</code></a> chore(deps-dev): bump <code>@typescript-eslint/parser</code> from 8.38.0 to 8.39.0 (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6220">#6220</a>)</li> <li><a href="https://github.com/maplibre/maplibre-gl-js/commit/34b050ca74a905745e23015307e1196e8fa5d83a"><code>34b050c</code></a> chore(deps-dev): bump devtools-protocol from 0.0.1493946 to 0.0.1495869 (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6218">#6218</a>)</li> <li><a href="https://github.com/maplibre/maplibre-gl-js/commit/cc4dfc25d57d6cec656673dbb3c9d276d5144d26"><code>cc4dfc2</code></a> Fix _rotatePitchHandler typo (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6208">#6208</a>)</li> <li><a href="https://github.com/maplibre/maplibre-gl-js/commit/b1a2d8971000af94b7d0c5e6b8df28bf3c1acd53"><code>b1a2d89</code></a> chore(deps-dev): bump stylelint-config-standard from 38.0.0 to 39.0.0 (<a href="https://redirect.github.com/maplibre/maplibre-gl-js/issues/6203">#6203</a>)</li> <li>Additional commits viewable in <a href="https://github.com/maplibre/maplibre-gl-js/compare/v5.5.0...v5.6.2">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=maplibre-gl&package-manager=npm_and_yarn&previous-version=5.5.0&new-version=5.6.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Birk Skyum <74932975+birkskyum@users.noreply.github.com> Co-authored-by: Harel M <harel.mazor@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-06-17 12:47:27 +00:00 · 2025-09-07 14:24:50 +00:00
parent 4d5c74f4ee
commit 7289e26563
16 changed files with 249 additions and 537 deletions
@@ -4,6 +4,7 @@ import {Accordion} from 'react-accessible-accordion';
 import {MdMoreVert} from 'react-icons/md'
 import { IconContext } from 'react-icons'
 import {BackgroundLayerSpecification, LayerSpecification, SourceSpecification} from 'maplibre-gl';
+import {v8} from '@maplibre/maplibre-gl-style-spec';

 import FieldJson from './FieldJson'
 import FilterEditor from './FilterEditor'
@@ -17,23 +18,78 @@ import FieldComment from './FieldComment'
 import FieldSource from './FieldSource'
 import FieldSourceLayer from './FieldSourceLayer'
 import { changeType, changeProperty } from '../libs/layer'
-import layout from '../config/layout.json'
 import {formatLayerId} from '../libs/format';
 import { WithTranslation, withTranslation } from 'react-i18next';
 import { TFunction } from 'i18next';
+import { NON_SOURCE_LAYERS } from '../libs/non-source-layers';

+type MaputnikLayoutGroup = {
+  id: string;
+  title: string;
+  type: string;
+  fields: string[];
+}

-function getLayoutForType(type: LayerSpecification["type"], t: TFunction) {
-  return layout[type] ? {
-    ...layout[type],
-    groups: layout[type].groups.map(group => {
-      return {
-        ...group,
-        id: group.title.replace(/ /g, "_"),
-        title: t(group.title)
-      };
-    }),
-  } : layout.invalid;
+function getLayoutForSymbolType(t: TFunction): MaputnikLayoutGroup[] {
+  const groups: MaputnikLayoutGroup[] = [];
+  groups.push({
+    title: t("General layout properties"),
+    id: "General_layout_properties",
+    type: "properties",
+    fields: Object.keys(v8["layout_symbol"]).filter(f => f.startsWith("symbol-"))
+  });
+  groups.push({
+    title: t("Text layout properties"),
+    id: "Text_layout_properties",
+    type: "properties",
+    fields: Object.keys(v8["layout_symbol"]).filter(f => f.startsWith("text-"))
+  });
+  groups.push({
+    title: t("Icon layout properties"),
+    id: "Icon_layout_properties",
+    type: "properties",
+    fields: Object.keys(v8["layout_symbol"]).filter(f => f.startsWith("icon-"))
+  });
+  groups.push({
+    title: t("Text paint properties"),
+    id: "Text_paint_properties",
+    type: "properties",
+    fields: Object.keys(v8["paint_symbol"]).filter(f => f.startsWith("text-"))
+  });
+  groups.push({
+    title: t("Icon paint properties"),
+    id: "Icon_paint_properties",
+    type: "properties",
+    fields: Object.keys(v8["paint_symbol"]).filter(f => f.startsWith("icon-"))
+  });
+  return groups;
+}
+
+function getLayoutForType(type: LayerSpecification["type"], t: TFunction): MaputnikLayoutGroup[] {
+  if (Object.keys(v8.layer.type.values).indexOf(type) < 0) {
+    return []
+  }
+  if (type === "symbol") {
+    return getLayoutForSymbolType(t);
+  }
+  const groups: MaputnikLayoutGroup[] = [];
+  if (Object.keys(v8["paint_" + type]).length > 0) {
+    groups.push({
+      title: t("Paint properties"),
+      id: "Paint_properties",
+      type: "properties",
+      fields: Object.keys(v8["paint_" + type]),
+    });
+  }
+  if (Object.keys(v8["layout_" + type]).length > 0) {
+    groups.push({
+      title: t("Layout properties"),
+      id: "Layout_properties",
+      type: "properties",
+      fields: Object.keys(v8["layout_" + type])
+    });
+  }
+  return groups;
 }

 function layoutGroups(layerType: LayerSpecification["type"], t: TFunction): {id: string, title: string, type: string, fields?: string[]}[] {
@@ -53,13 +109,13 @@ function layoutGroups(layerType: LayerSpecification["type"], t: TFunction): {id:
    type: 'jsoneditor'
  }
  return [layerGroup, filterGroup]
-    .concat(getLayoutForType(layerType, t).groups)
+    .concat(getLayoutForType(layerType, t))
    .concat([editorGroup])
 }

 type LayerEditorInternalProps = {
  layer: LayerSpecification
-  sources: {[key: string]: SourceSpecification}
+  sources: {[key: string]: SourceSpecification & {layers: string[]}}
  vectorLayers: {[key: string]: any}
  spec: object
  onLayerChanged(...args: unknown[]): unknown
@@ -89,11 +145,10 @@ class LayerEditorInternal extends React.Component<LayerEditorInternalProps, Laye
  constructor(props: LayerEditorInternalProps) {
    super(props)

-    //TODO: Clean this up and refactor into function
    const editorGroups: {[keys:string]: boolean} = {}
-    layoutGroups(this.props.layer.type, props.t).forEach(group => {
+    for (const group of layoutGroups(this.props.layer.type, props.t)) {
      editorGroups[group.title] = true
-    })
+    }

    this.state = { editorGroups }
  }
@@ -101,11 +156,11 @@ class LayerEditorInternal extends React.Component<LayerEditorInternalProps, Laye
  static getDerivedStateFromProps(props: Readonly<LayerEditorInternalProps>, state: LayerEditorState) {
    const additionalGroups = { ...state.editorGroups }

-    getLayoutForType(props.layer.type, props.t).groups.forEach(group => {
+    for (const group of getLayoutForType(props.layer.type, props.t)) {
      if(!(group.title in additionalGroups)) {
        additionalGroups[group.title] = true
      }
-    })
+    }

    return {
      editorGroups: additionalGroups
@@ -153,7 +208,7 @@ class LayerEditorInternal extends React.Component<LayerEditorInternalProps, Laye
    let sourceLayerIds;
    const layer = this.props.layer as Exclude<LayerSpecification, BackgroundLayerSpecification>;
    if(Object.prototype.hasOwnProperty.call(this.props.sources, layer.source)) {
-      sourceLayerIds = (this.props.sources[layer.source] as any).layers;
+      sourceLayerIds = this.props.sources[layer.source].layers;
    }

    switch(type) {
@@ -180,7 +235,7 @@ class LayerEditorInternal extends React.Component<LayerEditorInternalProps, Laye
        onChange={v => this.changeProperty(null, 'source', v)}
      />
      }
-      {['background', 'raster', 'hillshade', 'heatmap'].indexOf(this.props.layer.type) < 0 &&
+      {!NON_SOURCE_LAYERS.includes(this.props.layer.type) &&
        <FieldSourceLayer
          error={errorData['source-layer']}
          sourceLayerIds={sourceLayerIds}