maplibre-gl-raster 0.2.2 → 0.2.4

package/dist/{RasterControl-BxGg08KC.js → RasterControl-BAv4x6Eg.js}

@@ -6578,9 +6578,9 @@ var SourceMemory = class SourceMemory {
 //#endregion
 //#region node_modules/@developmentseed/geotiff/dist/crs.js
 var PROJJSON_SCHEMA = "https://proj.org/schemas/v0.7/projjson.schema.json";
-var MODEL_TYPE_PROJECTED = 1;
+var MODEL_TYPE_PROJECTED$1 = 1;
 var MODEL_TYPE_GEOGRAPHIC = 2;
-var USER_DEFINED = 32767;
+var USER_DEFINED$1 = 32767;
 var CT_TRANSVERSE_MERCATOR = 1;
 var CT_TRANSVERSE_MERCATOR_SOUTH = 2;
 var CT_OBLIQUE_MERCATOR = 3;
@@ -6633,31 +6633,31 @@ var LINEAR_UNIT = {
 */
 function crsFromGeoKeys(gkd) {
 	const modelType = gkd.modelType;
-	if (modelType === MODEL_TYPE_PROJECTED) return _projectedCrs(gkd);
+	if (modelType === MODEL_TYPE_PROJECTED$1) return _projectedCrs(gkd);
 	if (modelType === MODEL_TYPE_GEOGRAPHIC) return _geographicCrs(gkd);
 	throw new Error(`Unsupported GeoTIFF model type: ${modelType}`);
 }
 function _geographicCrs(gkd) {
 	const epsg = gkd.geodeticCRS;
-	if (epsg !== null && epsg !== USER_DEFINED) return epsg;
+	if (epsg !== null && epsg !== USER_DEFINED$1) return epsg;
 	return _buildGeographicCrs(gkd, PROJJSON_SCHEMA);
 }
 function _projectedCrs(gkd) {
 	const epsg = gkd.projectedCRS;
-	if (epsg !== null && epsg !== USER_DEFINED) return epsg;
+	if (epsg !== null && epsg !== USER_DEFINED$1) return epsg;
 	return _buildProjectedCrs(gkd);
 }
 function _buildGeographicCrs(gkd, schema) {
 	const ellipsoid = _buildEllipsoid(gkd);
 	let pmName = "Greenwich";
 	let pmLongitude = 0;
-	if (gkd.primeMeridian !== null && gkd.primeMeridian !== USER_DEFINED) pmName = `EPSG:${gkd.primeMeridian}`;
+	if (gkd.primeMeridian !== null && gkd.primeMeridian !== USER_DEFINED$1) pmName = `EPSG:${gkd.primeMeridian}`;
 	else if (gkd.primeMeridianLongitude !== null) {
 		pmLongitude = gkd.primeMeridianLongitude;
 		pmName = "User-defined";
 	}
 	let datum;
-	if (gkd.geodeticDatum !== null && gkd.geodeticDatum !== USER_DEFINED) datum = {
+	if (gkd.geodeticDatum !== null && gkd.geodeticDatum !== USER_DEFINED$1) datum = {
 		type: "GeodeticReferenceFrame",
 		name: `Unknown datum based upon EPSG ${gkd.geodeticDatum} ellipsoid`
 	};
@@ -6693,7 +6693,7 @@ function _buildProjectedCrs(gkd) {
 	};
 }
 function _buildEllipsoid(gkd) {
-	if (gkd.ellipsoid !== null && gkd.ellipsoid !== USER_DEFINED) {
+	if (gkd.ellipsoid !== null && gkd.ellipsoid !== USER_DEFINED$1) {
 		const ellipsoid = { name: `EPSG ellipsoid ${gkd.ellipsoid}` };
 		if (gkd.ellipsoidSemiMajorAxis !== null) ellipsoid.semi_major_axis = gkd.ellipsoidSemiMajorAxis;
 		if (gkd.ellipsoidInvFlattening !== null) ellipsoid.inverse_flattening = gkd.ellipsoidInvFlattening;
@@ -16337,40 +16337,59 @@ var COLORMAP_OPTIONS = COLORMAP_NAMES.map((name) => ({
 }));
 //#endregion
 //#region src/lib/raster/repair-geokeys.ts
-/**
-* Repair GeoTIFFs whose projected CRS is tagged with a "user-defined" model
-* type so {@link import('@developmentseed/geotiff').Overview.crs} can build it.
-*
-* `crsFromGeoKeys` only accepts `GTModelTypeGeoKey` of 1 (projected) or 2
-* (geographic) and throws `Unsupported GeoTIFF model type: 32767` for anything
-* else. Some exporters (notably ArcGIS, which writes an ESRI PE string for the
-* `WGS_1984_Web_Mercator` / "Popular Visualisation CRS" auxiliary-sphere
-* Mercator) emit a fully specified projected CRS via the projection geo keys
-* but leave `GTModelTypeGeoKey` and `ProjectedCSTypeGeoKey` as user-defined
-* (32767). COGLayer then fails to resolve the CRS and the raster never draws,
-* even though the projection is completely described by the keys already
-* present. See GeoLibre issue #393.
-*
-* When a projection coordinate-transformation method is present
-* (`ProjMethodGeoKey`, exposed as `gkd.projMethod`), the CRS is unambiguously
-* projected, so we set `modelType` to projected. `crsFromGeoKeys` then takes
-* the projected path and builds a PROJJSON CRS from the projection keys (or
-* returns the EPSG code when `ProjectedCSTypeGeoKey` carries one). Files with a
-* valid model type, or user-defined geographic CRSes with no projection method,
-* are left untouched.
-*
-* Must run before any `Overview.crs` access, which caches its result; callers
-* invoke it immediately after opening the GeoTIFF and before handing it to
-* COGLayer.
+var MODEL_TYPE_PROJECTED = 1;
+var USER_DEFINED = 32767;
+var EPSG_WEB_MERCATOR = 3857;
+var WEB_MERCATOR_ALIASES = new Set([
+	3785,
+	900913,
+	102100,
+	102113
+]);
+var WEB_MERCATOR_CITATION = /web[ _]?mercator|pseudo[ _-]?mercator|popular[ _]?vis|auxiliary[ _]?sphere/i;
+function citationText(gkd) {
+	return [
+		gkd.citation,
+		gkd.projectedCitation,
+		gkd.geodeticCitation
+	].filter((value) => typeof value === "string").join(" ");
+}
+/**
+* Repair GeoTIFF CRS geo keys so {@link import('@developmentseed/geotiff').Overview.crs}
+* resolves them to the right projection, in place. Two problems are fixed:
+*
+* 1. **User-defined model type for a projected CRS.** `crsFromGeoKeys` only
+*    accepts `GTModelTypeGeoKey` 1 (projected) or 2 (geographic) and throws
+*    `Unsupported GeoTIFF model type: 32767` otherwise, so the raster never
+*    draws. ArcGIS exports the ESRI Web Mercator with a fully specified
+*    projection but leaves `GTModelTypeGeoKey` (and `ProjectedCSTypeGeoKey`)
+*    user-defined. When a projection method is present (`ProjMethodGeoKey`, i.e.
+*    `gkd.projMethod`) the CRS is unambiguously projected, so the model type is
+*    set to projected and the CRS is built from the keys (or the EPSG code in
+*    `ProjectedCSTypeGeoKey`). This is projection-agnostic.
+*
+* 2. **Spherical Web Mercator written as an ellipsoidal CRS.** ESRI's "Web
+*    Mercator Auxiliary Sphere" (a.k.a. Popular Visualisation CRS, EPSG:3857)
+*    projects on a sphere of radius 6378137, but the geo keys can only declare
+*    the WGS84 ellipsoid (the sphere lives only in the citation). Building the
+*    CRS from those keys yields an *ellipsoidal* Mercator, which misplaces the
+*    raster by kilometres in latitude. When the projected CRS is a Web Mercator
+*    alias code, or is user-defined with a Web-Mercator citation, it is replaced
+*    with EPSG:3857 so proj4's correct spherical definition is used.
+*
+* Files with a valid model type and a non-Web-Mercator EPSG/projection are left
+* untouched. Must run before any `Overview.crs` access (which caches its
+* result), so callers invoke it immediately after opening the GeoTIFF.
 *
 * @param tiff - The opened GeoTIFF to repair in place.
 */
 function repairUserDefinedProjectedCrs(tiff) {
-	const MODEL_TYPE_PROJECTED = 1;
-	const MODEL_TYPE_USER_DEFINED = 32767;
 	for (const overview of tiff.overviews) {
 		const gkd = overview.gkd;
-		if ((gkd.modelType === null || gkd.modelType === MODEL_TYPE_USER_DEFINED) && gkd.projMethod !== null) gkd.modelType = MODEL_TYPE_PROJECTED;
+		const projectedIsUserDefined = gkd.projectedCRS === null || gkd.projectedCRS === USER_DEFINED;
+		if (gkd.projectedCRS !== null && WEB_MERCATOR_ALIASES.has(gkd.projectedCRS)) gkd.projectedCRS = EPSG_WEB_MERCATOR;
+		else if (projectedIsUserDefined && gkd.projMethod !== null && WEB_MERCATOR_CITATION.test(citationText(gkd))) gkd.projectedCRS = EPSG_WEB_MERCATOR;
+		if ((gkd.modelType === null || gkd.modelType === USER_DEFINED) && gkd.projMethod !== null) gkd.modelType = MODEL_TYPE_PROJECTED;
 	}
 }
 //#endregion
@@ -17663,6 +17682,26 @@ var LayerManager = class {
 		});
 	}
 	/**
+	* Sets the MapLibre layer a raster draws beneath (interleaved mode).
+	*
+	* In interleaved rendering, @deck.gl/mapbox groups raster layers by their
+	* `beforeId`: a layer with no `beforeId` is drawn on top of the whole style,
+	* so a host that interleaves rasters with its own vector layers calls this to
+	* place a raster below a given vector layer. A no-op when the id is unchanged.
+	*
+	* @param id - The layer id
+	* @param beforeId - The MapLibre style layer id to draw beneath, or null/empty
+	*   to draw the raster on top.
+	*/
+	setBeforeId(id, beforeId) {
+		const layer = this.getLayer(id);
+		if (!layer) return;
+		const normalized = beforeId?.trim() || null;
+		if (layer.beforeId === normalized) return;
+		layer.beforeId = normalized;
+		this._rebuild();
+	}
+	/**
 	* Registers an event handler.
 	*
 	* @param event - Event type
@@ -19559,6 +19598,17 @@ var RasterControl = class {
 	reorderRaster(id, toIndex) {
 		this._layerManager?.reorder(id, toIndex);
 	}
+	/**
+	* Sets the MapLibre layer a raster draws beneath (interleaved mode), so a host
+	* can interleave rasters with its own vector layers. Pass null to draw the
+	* raster on top. See {@link import('../state/LayerManager').LayerManager.setBeforeId}.
+	*
+	* @param id - The layer id
+	* @param beforeId - The MapLibre style layer id to draw beneath, or null
+	*/
+	setRasterBeforeId(id, beforeId) {
+		this._layerManager?.setBeforeId(id, beforeId);
+	}
 	/** Re-emits LayerManager events through the control's event system. */
 	_forwardLayerManagerEvents(manager) {
 		for (const type of [
@@ -19725,4 +19775,4 @@ var RasterControl = class {
 //#endregion
 export { colormaps_default as _, debounce as a, throttle as c, percentileFromHistogram as d, readBandNames as f, COLORMAP_ROW_COUNT as g, COLORMAP_OPTIONS as h, classNames as i, MAX_SAMPLE_TILES as l, COLORMAP_NAMES as m, PALETTE_COLORMAP as n, formatNumericValue as o, loadGeoTIFF as p, clamp as r, generateId as s, RasterControl as t, computeAutoStats as u, createResilientEpsgResolver as v };
 
-//# sourceMappingURL=RasterControl-BxGg08KC.js.map
+//# sourceMappingURL=RasterControl-BAv4x6Eg.js.map