Add building massing authoring workflow (#2020)

* feat: add building massing workflow

* Address Claude review feedback

- Keep ordinary polygon sketches flat by leaving height defaults to massing mode.
- Reset only the auto-managed extrusion style after the last massing feature is removed.
- Add regression coverage for massing detection and style transitions.

* fix: harden massing style synchronization

* fix: refine massing interaction on globe

* fix: preserve mixed sketch rendering

* Address Claude review feedback

- Respect a manual switch away from extrusion: the Style panel's 2D and
  3D-elevation radios clear `extrusionEnabled` without clearing
  `extrusionHeightExpression`, so the old "already customized" guard (which
  required `extrusionEnabled`) was skipped and the next sync re-enabled
  massing extrusion, silently reverting the user's choice. The auto-managed
  expression paired with extrusion off is now treated as user-owned, with a
  regression test for the draw -> switch to 2D -> edit sequence.
- Remove `sketchesIdleDisplayOverride`, which became dead code in e8bd03b
  (the only `= true` assignment was dropped to fix the second-footprint
  rubber-band regression). Its doc comment described behavior that can no
  longer happen, and both of its checks were constant.
- Clear `preMassingExtrusionStyles` in `deactivate()` so entries for old
  Sketches layer ids do not linger alongside the other module-state resets.

* Address Claude review feedback

- Gate the "user's own extrusion expression" guard on
  `extrusionAdvancedStyleEnabled`, mirroring `extrusionHeightValue`, which
  ignores `extrusionHeightExpression` unless advanced mode is on. Without it a
  stray expression left behind by a since-disabled advanced mode blocked
  massing auto-management for good, with no feedback. Tested both ways.
- Localize the two user-facing strings `GEO_EDITOR_OPTIONS` carries as copy.
  The plugins package cannot call `t()`, so `setGeoEditorLabels` follows the
  host-push pattern of `maplibre-graticule`/`maplibre-reverse-geocode`:
  TopToolbar pushes `geoEditorPlugin.*` on mount and on every language change,
  and `getGeoEditorOptions` reads the current values. The third-party control
  reads its options once at construction, so a mid-session language switch
  applies on the next activation; that is documented on the setter.

* fix: show massing extrusion while the draw tool stays armed

Drawing a massing footprint left the map looking unchanged: the Sketches
store layer is the only thing that renders the extrusion, and it is
suppressed for as long as the editor is in an interaction mode. The massing
tool stays armed after each completed footprint so the next one can be drawn,
so the user saw Geoman's flat polygon until they explicitly disabled the
tool.

`sketchesIdleDisplayOverride` used to cover this by treating the editor as
idle after a create, but that hid *all* of Geoman including the in-progress
rubber band, which is why e8bd03b dropped it.

Split the two instead: while the Sketches layer carries the auto-managed
massing extrusion and a draw tool (not an edit tool, whose handles hit-test
against them) is armed, hide only Geoman's `gm_main-*` committed-feature
layers and show the Sketches layer, leaving the transient aids visible.

Verified in the browser: a footprint extrudes as soon as it is completed with
the tool still armed, the second footprint still rubber-bands while being
drawn, and a height edit re-renders live.

* Address Claude review feedback

- Let a manual 2D switch outrank the pre-massing snapshot. Switching the
  layer out of extrusion while massing features are present is already
  honored by the enable path; the reset path then restored the pre-massing
  style when the last footprint went away, silently turning extrusion back on
  for a layer that had one before. The snapshot is now dropped and the user's
  style left alone, with a test for that sequence.

* fix: avoid low-zoom massing artifacts

Render zoom-gated building massing as a normal flat fill below the extrusion cutoff so globe triangulation cannot create world-scale shards.

* style: auto-format (ruff + oxfmt) [pre-commit.ci]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: giswqs

apps/geolibre-desktop/package.json

@@ -82,7 +82,7 @@
     "maplibre-gl-enviroatlas": "^0.1.1",
     "maplibre-gl-esri-wayback": "^0.2.2",
     "maplibre-gl-fema-wms": "^0.1.2",
-    "maplibre-gl-geo-editor": "^0.10.3",
+    "maplibre-gl-geo-editor": "^0.10.4",
     "maplibre-gl-geoagent": "^0.5.6",
     "maplibre-gl-lidar": "^0.16.2",
     "maplibre-gl-nasa-earthdata": "^0.1.4",

apps/geolibre-desktop/src/components/layout/TopToolbar.tsx

@@ -27,6 +27,7 @@ import {
   openVectorLayerPanel,
   setAnnotationLabels,
   setBasemapControlLabels,
+  setGeoEditorLabels,
   setGraticuleLabels,
   setH3Labels,
   setS2Labels,
@@ -585,6 +586,10 @@ export function TopToolbar({
       engineTitiler: t("huggingFace.engineTitiler"),
       resetDefaults: t("huggingFace.resetDefaults"),
     });
+    setGeoEditorLabels({
+      attributePanelTitle: t("geoEditorPlugin.attributePanelTitle"),
+      massingHeight: t("geoEditorPlugin.massingHeight"),
+    });
     setGraticuleLabels({
       title: t("graticule.title"),
       getTitle: () => i18n.t("graticule.title"),

apps/geolibre-desktop/src/i18n/locales/en.json

@@ -3677,6 +3677,10 @@
     "confirmStyleReplace_one": "Switching to \"{{name}}\" replaces the whole map style and will remove the stacked basemap you added. Continue?",
     "confirmStyleReplace_other": "Switching to \"{{name}}\" replaces the whole map style and will remove the {{count}} stacked basemaps you added. Continue?"
   },
+  "geoEditorPlugin": {
+    "attributePanelTitle": "Feature properties",
+    "massingHeight": "Height (m)"
+  },
   "annotations": {
     "toolbar": "Annotation tools",
     "layerName": "Annotations",

package-lock.json

@@ -367,6 +367,33 @@ function styleLayerZoomRange(style: LayerStyle): {
   };
 }
 
+/**
+ * Return the first zoom where a zoom-stepped extrusion becomes non-flat.
+ * A zero-height fill-extrusion is still triangulated as 3D geometry by
+ * MapLibre and can produce large tile-boundary shards on the globe. Callers
+ * use this cutoff to render an ordinary fill below it instead.
+ */
+function flatExtrusionCutoff(style: LayerStyle): number | null {
+  if (!style.extrusionAdvancedStyleEnabled || !style.extrusionHeightExpression) return null;
+  try {
+    const expression: unknown = JSON.parse(style.extrusionHeightExpression);
+    if (
+      Array.isArray(expression) &&
+      expression[0] === "step" &&
+      Array.isArray(expression[1]) &&
+      expression[1][0] === "zoom" &&
+      expression[2] === 0 &&
+      typeof expression[3] === "number" &&
+      Number.isFinite(expression[3])
+    ) {
+      return clampLayerZoom(expression[3], MIN_LAYER_ZOOM);
+    }
+  } catch {
+    // Invalid expressions are handled by the existing style-expression path.
+  }
+  return null;
+}
+
 // Intersect a native layer's source-declared zoom range with the user-configured
 // style range, taking the tighter bound on each end. This keeps a tile
 // service's zoom floor/ceiling intact while still letting the user narrow the
@@ -1908,15 +1935,50 @@ function applyVectorDataRenderLayers(
 
   if (profile.hasPolygon) {
     if (layer.style.extrusionEnabled) {
-      removeIfExists(map, fillLayerId(layer.id));
+      const zoomRange = styleLayerZoomRange(layer.style);
+      const flatBelowZoom = flatExtrusionCutoff(layer.style);
+      const hasFlatRange = flatBelowZoom !== null && zoomRange.minzoom < flatBelowZoom;
+      if (hasFlatRange) {
+        ensureLayer(
+          map,
+          fillLayerId(layer.id),
+          {
+            id: fillLayerId(layer.id),
+            type: "fill",
+            ...sourceSpec,
+            minzoom: zoomRange.minzoom,
+            maxzoom: Math.min(zoomRange.maxzoom, flatBelowZoom),
+            filter: withFeatureFilters(layer, [
+              "match",
+              ["geometry-type"],
+              ["Polygon", "MultiPolygon"],
+              true,
+              false,
+            ]),
+            paint: {
+              ...fillPaint(layer.style, opacity),
+              "fill-pattern": (fillPatternId ?? null) as unknown as string,
+            },
+            layout: { visibility },
+          },
+          beforeId,
+        );
+      } else {
+        removeIfExists(map, fillLayerId(layer.id));
+      }
       ensureLayer(
         map,
         fillExtrusionLayerId(layer.id),
         {
           id: fillExtrusionLayerId(layer.id),
           type: "fill-extrusion",
           ...sourceSpec,
-          ...styleLayerZoomRange(layer.style),
+          ...zoomRange,
+          ...(flatBelowZoom !== null
+            ? {
+                minzoom: Math.min(zoomRange.maxzoom, Math.max(zoomRange.minzoom, flatBelowZoom)),
+              }
+            : {}),
           filter: withFeatureFilters(layer, [
             "match",
             ["geometry-type"],
@@ -2020,7 +2082,7 @@ function applyVectorDataRenderLayers(
     removeSourceIfExists(map, invertedSourceId(layer.id));
   }
 
-  if (!layer.style.extrusionEnabled && (profile.hasLine || profile.hasPolygon)) {
+  if (profile.hasLine || (!layer.style.extrusionEnabled && profile.hasPolygon)) {
     ensureLayer(
       map,
       lineLayerId(layer.id),
@@ -2032,7 +2094,9 @@ function applyVectorDataRenderLayers(
         filter: withFeatureFilters(layer, [
           "match",
           ["geometry-type"],
-          ["LineString", "MultiLineString", "Polygon", "MultiPolygon"],
+          layer.style.extrusionEnabled
+            ? ["LineString", "MultiLineString"]
+            : ["LineString", "MultiLineString", "Polygon", "MultiPolygon"],
           true,
           false,
         ]),
@@ -2092,7 +2156,7 @@ function applyVectorDataRenderLayers(
     removeIfExists(map, lineDecorationLayerId(layer.id));
   }
 
-  if (!layer.style.extrusionEnabled && profile.hasPoint && renderer === "heatmap") {
+  if (profile.hasPoint && renderer === "heatmap") {
     // Heatmap renderer: one density layer, no circle/cluster/marker layers.
     removeIfExists(map, circleLayerId(layer.id));
     removeIfExists(map, markerLayerId(layer.id));
@@ -2117,7 +2181,7 @@ function applyVectorDataRenderLayers(
       },
       beforeId,
     );
-  } else if (!layer.style.extrusionEnabled && profile.hasPoint && renderer === "cluster") {
+  } else if (profile.hasPoint && renderer === "cluster") {
     // Cluster renderer: a bubble + count for aggregated clusters, plus a circle
     // for the individual (unclustered) points. The source carries clusters
     // (geojson source-level clustering, or supercluster tiles on the tiled path).
@@ -2177,7 +2241,7 @@ function applyVectorDataRenderLayers(
       },
       beforeId,
     );
-  } else if (!layer.style.extrusionEnabled && profile.hasPoint) {
+  } else if (profile.hasPoint) {
     // Single (default) renderer: a marker icon per point when a marker is
     // configured, otherwise one circle per point.
     removeIfExists(map, heatmapLayerId(layer.id));
@@ -2259,7 +2323,7 @@ function applyVectorDataRenderLayers(
     removeIfExists(map, clusterCountLayerId(layer.id));
   }
 
-  if (!layer.style.extrusionEnabled && hasTextMarkers) {
+  if (hasTextMarkers) {
     ensureLayer(
       map,
       textLayerId(layer.id),

packages/map/src/layer-sync.ts

@@ -55,7 +55,7 @@
     "maplibre-gl-enviroatlas": "^0.1.1",
     "maplibre-gl-esri-wayback": "^0.2.2",
     "maplibre-gl-fema-wms": "^0.1.2",
-    "maplibre-gl-geo-editor": "^0.10.3",
+    "maplibre-gl-geo-editor": "^0.10.4",
     "maplibre-gl-geoagent": "^0.5.6",
     "maplibre-gl-lidar": "^0.16.2",
     "maplibre-gl-nasa-earthdata": "^0.1.4",

packages/plugins/package.json

@@ -387,6 +387,9 @@ export { maplibreFemaWmsPlugin } from "./plugins/maplibre-fema-wms";
 export {
   maplibreGeoEditorPlugin,
   GEO_EDITOR_PLUGIN_ID,
+  DEFAULT_GEO_EDITOR_LABELS,
+  setGeoEditorLabels,
+  type GeoEditorLabels,
   canEditLayerGeometry,
   SKETCHES_SOURCE_KIND,
   startLayerGeometryEdit,