@maplibre-yaml/core 0.1.3 → 0.2.1

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-export { ColorOrExpressionSchema, ColorSchema, ContentBlockSchema, ContentElementSchema, ContentItemSchema, ExpressionSchema, GeoJSONSourceSchema, ImageSourceSchema, LatitudeSchema, LayerSourceSchema, LngLatBoundsSchema, LngLatSchema, LoadingConfigSchema, LongitudeSchema, NumberOrExpressionSchema, RasterSourceSchema, StreamConfigSchema, ValidTagNames, VectorSourceSchema, VideoSourceSchema, ZoomLevelSchema } from './schemas/index.js';
-import { L as LayerSchema, P as PopupContentSchema, C as ControlsConfigSchema, c as MapConfig, G as GlobalConfig, d as MapBlock } from './page.schema-EBT_0Ojm.js';
-export { m as BackgroundLayerSchema, B as BaseLayerPropertiesSchema, Q as Block, J as BlockSchema, y as Chapter, z as ChapterAction, v as ChapterActionSchema, A as ChapterLayers, w as ChapterLayersSchema, x as ChapterSchema, g as CircleLayerSchema, r as ControlPosition, p as ControlPositionSchema, s as ControlsConfig, k as FillExtrusionLayerSchema, F as FillLayerSchema, N as GlobalConfigSchema, H as HeatmapLayerSchema, l as HillshadeLayerSchema, I as InteractiveConfigSchema, o as LayerOrReferenceSchema, n as LayerReferenceSchema, t as LegendConfig, a as LegendConfigSchema, f as LegendItemSchema, h as LineLayerSchema, M as MapBlockSchema, b as MapConfigSchema, u as MapFullPageBlock, q as MapFullPageBlockSchema, O as MixedBlock, E as MixedBlockSchema, T as Page, K as PageSchema, e as PopupContentItemSchema, j as RasterLayerSchema, U as RootConfig, R as RootSchema, D as ScrollytellingBlock, S as ScrollytellingBlockSchema, i as SymbolLayerSchema } from './page.schema-EBT_0Ojm.js';
-export { L as LegendBuilder, M as MapRenderer, c as MapRendererEvents, b as MapRendererOptions, P as ParseError, a as ParseResult, Y as YAMLParser, p as parseYAMLConfig, s as safeParseYAMLConfig } from './map-renderer-Br4guic2.js';
+export { ColorOrExpressionSchema, ColorSchema, ContentBlockSchema, ContentElementSchema, ContentItemSchema, ExpressionSchema, LatitudeSchema, LngLatBoundsSchema, LngLatSchema, LongitudeSchema, NumberOrExpressionSchema, ValidTagNames, ZoomLevelSchema } from './schemas/index.js';
+import { L as LayerSchema, P as PopupContentSchema, C as ControlsConfigSchema, d as MapConfig, G as GlobalConfig, e as MapBlock } from './page.schema-Cad2FFqh.js';
+export { t as BackgroundLayerSchema, B as BaseLayerPropertiesSchema, _ as Block, W as BlockSchema, N as Chapter, O as ChapterAction, E as ChapterActionSchema, Q as ChapterLayers, J as ChapterLayersSchema, K as ChapterSchema, n as CircleLayerSchema, y as ControlPosition, w as ControlPositionSchema, z as ControlsConfig, r as FillExtrusionLayerSchema, F as FillLayerSchema, h as GeoJSONSourceSchema, Y as GlobalConfigSchema, H as HeatmapLayerSchema, s as HillshadeLayerSchema, I as ImageSourceSchema, l as InteractiveConfigSchema, v as LayerOrReferenceSchema, u as LayerReferenceSchema, c as LayerSourceSchema, A as LegendConfig, a as LegendConfigSchema, m as LegendItemSchema, o as LineLayerSchema, g as LoadingConfigSchema, M as MapBlockSchema, b as MapConfigSchema, D as MapFullPageBlock, x as MapFullPageBlockSchema, Z as MixedBlock, U as MixedBlockSchema, $ as Page, X as PageSchema, k as PopupContentItemSchema, q as RasterLayerSchema, i as RasterSourceSchema, a0 as RootConfig, R as RootSchema, T as ScrollytellingBlock, S as ScrollytellingBlockSchema, f as StreamConfigSchema, p as SymbolLayerSchema, V as VectorSourceSchema, j as VideoSourceSchema } from './page.schema-Cad2FFqh.js';
+export { L as LegendBuilder, M as MapRenderer, c as MapRendererEvents, b as MapRendererOptions, P as ParseError, a as ParseResult, Y as YAMLParser, p as parseYAMLConfig, s as safeParseYAMLConfig } from './map-renderer-SjO3KQmx.js';
 import { Map, LngLat } from 'maplibre-gl';
 import { z } from 'zod';
 import { FeatureCollection } from 'geojson';

package/dist/index.js

@@ -1,6 +1,6 @@
 import { z, ZodError } from 'zod';
 import { parse } from 'yaml';
-import maplibregl2 from 'maplibre-gl';
+import { Popup, NavigationControl, GeolocateControl, ScaleControl, FullscreenControl, Map as Map$1 } from 'maplibre-gl';
 
 // @maplibre-yaml/core - Declarative web maps with YAML
 
@@ -585,6 +585,7 @@ var MapBlockSchema = z.object({
   className: z.string().optional().describe("CSS class name for container"),
   style: z.string().optional().describe("Inline CSS styles for container"),
   config: MapConfigSchema.describe("Map configuration"),
+  sources: z.record(z.string(), LayerSourceSchema).optional().describe("Map sources"),
   layers: z.array(LayerOrReferenceSchema).default([]).describe("Map layers"),
   controls: ControlsConfigSchema.optional().describe("Map controls"),
   legend: LegendConfigSchema.optional().describe("Legend configuration")
@@ -595,6 +596,7 @@ var MapFullPageBlockSchema = z.object({
   className: z.string().optional().describe("CSS class name for container"),
   style: z.string().optional().describe("Inline CSS styles for container"),
   config: MapConfigSchema.describe("Map configuration"),
+  sources: z.record(z.string(), LayerSourceSchema).optional().describe("Map sources"),
   layers: z.array(LayerOrReferenceSchema).default([]).describe("Map layers"),
   controls: ControlsConfigSchema.optional().describe("Map controls"),
   legend: LegendConfigSchema.optional().describe("Legend configuration")
@@ -3560,9 +3562,16 @@ var LayerManager = class {
     this.abortControllers = /* @__PURE__ */ new Map();
   }
   async addLayer(layer) {
-    const sourceId = `${layer.id}-source`;
+    const isSourceRef = typeof layer.source === "string";
+    const sourceId = isSourceRef ? layer.source : `${layer.id}-source`;
     this.layerToSource.set(layer.id, sourceId);
-    await this.addSource(sourceId, layer);
+    if (!isSourceRef) {
+      await this.addSource(sourceId, layer);
+    } else if (!this.map.getSource(sourceId)) {
+      throw new Error(
+        `Source '${sourceId}' referenced by layer '${layer.id}' not found. Ensure it is defined in the block-level 'sources' map.`
+      );
+    }
     const layerSpec = {
       id: layer.id,
       type: layer.type,
@@ -3590,12 +3599,6 @@ var LayerManager = class {
     }
   }
   async addSource(sourceId, layer) {
-    if (typeof layer.source === "string") {
-      if (!this.map.getSource(layer.source)) {
-        throw new Error(`Source reference '${layer.source}' not found`);
-      }
-      return;
-    }
     const source = layer.source;
     if (source.type === "geojson") {
       const geojsonSource = source;
@@ -3815,7 +3818,10 @@ var LayerManager = class {
     }
     if (this.map.getLayer(layerId)) this.map.removeLayer(layerId);
     const sourceId = this.layerToSource.get(layerId) || `${layerId}-source`;
-    if (this.map.getSource(sourceId)) this.map.removeSource(sourceId);
+    const isInlineSource = sourceId === `${layerId}-source`;
+    if (isInlineSource && this.map.getSource(sourceId)) {
+      this.map.removeSource(sourceId);
+    }
     this.sourceData.delete(sourceId);
     this.layerToSource.delete(layerId);
   }
@@ -4023,7 +4029,7 @@ var EventHandler = class {
   showPopup(content, feature, lngLat) {
     this.activePopup?.remove();
     const html = this.popupBuilder.build(content, feature.properties);
-    this.activePopup = new maplibregl2.Popup().setLngLat(lngLat).setHTML(html).addTo(this.map);
+    this.activePopup = new Popup().setLngLat(lngLat).setHTML(html).addTo(this.map);
   }
   /**
    * Detach events for a layer
@@ -4128,14 +4134,14 @@ var ControlsManager = class {
     if (config.navigation) {
       const options = typeof config.navigation === "object" ? config.navigation : {};
       const position = options.position || "top-right";
-      const control = new maplibregl2.NavigationControl();
+      const control = new NavigationControl();
       this.map.addControl(control, position);
       this.addedControls.push(control);
     }
     if (config.geolocate) {
       const options = typeof config.geolocate === "object" ? config.geolocate : {};
       const position = options.position || "top-right";
-      const control = new maplibregl2.GeolocateControl({
+      const control = new GeolocateControl({
         positionOptions: { enableHighAccuracy: true },
         trackUserLocation: true
       });
@@ -4145,14 +4151,14 @@ var ControlsManager = class {
     if (config.scale) {
       const options = typeof config.scale === "object" ? config.scale : {};
       const position = options.position || "bottom-left";
-      const control = new maplibregl2.ScaleControl();
+      const control = new ScaleControl();
       this.map.addControl(control, position);
       this.addedControls.push(control);
     }
     if (config.fullscreen) {
       const options = typeof config.fullscreen === "object" ? config.fullscreen : {};
       const position = options.position || "top-right";
-      const control = new maplibregl2.FullscreenControl();
+      const control = new FullscreenControl();
       this.map.addControl(control, position);
       this.addedControls.push(control);
     }
@@ -4177,10 +4183,10 @@ var MapRenderer = class {
   controlsManager;
   eventListeners;
   isLoaded;
-  constructor(container, config, layers = [], options = {}) {
+  constructor(container, config, layers = [], options = {}, sources) {
     this.eventListeners = /* @__PURE__ */ new Map();
     this.isLoaded = false;
-    this.map = new maplibregl2.Map({
+    this.map = new Map$1({
       ...config,
       container: typeof container === "string" ? container : container,
       style: config.mapStyle,
@@ -4205,6 +4211,13 @@ var MapRenderer = class {
     this.controlsManager = new ControlsManager(this.map);
     this.map.on("load", () => {
       this.isLoaded = true;
+      if (sources) {
+        for (const [id, sourceSpec] of Object.entries(sources)) {
+          if (!this.map.getSource(id)) {
+            this.map.addSource(id, sourceSpec);
+          }
+        }
+      }
       Promise.all(layers.map((layer) => this.addLayer(layer))).then(() => {
         this.emit("load", void 0);
         options.onLoad?.();