@deck.gl/carto 9.0.0-beta.4 → 9.0.0-beta.6

package/dist/index.cjs

@@ -243,7 +243,7 @@ function scaleIdentity() {
 }
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION = true ? "9.0.0-beta.3" : "latest";
+var VERSION = true ? "9.0.0-beta.5" : "latest";
 var id = "cartoRasterTile";
 var DEFAULT_OPTIONS = {
   cartoRasterTile: {
@@ -515,7 +515,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION2 = true ? "9.0.0-beta.3" : "latest";
+var VERSION2 = true ? "9.0.0-beta.5" : "latest";
 var id2 = "cartoSpatialTile";
 var DEFAULT_OPTIONS2 = {
   cartoSpatialTile: {
@@ -1005,24 +1005,18 @@ var QuadbinTileLayer = _QuadbinTileLayer;
 var import_core9 = require("@deck.gl/core");
 
 // dist/layers/raster-layer.js
-var import_constants = require("@luma.gl/constants");
 var import_core8 = require("@deck.gl/core");
 var import_layers2 = require("@deck.gl/layers");
 
 // dist/layers/raster-layer-vertex.glsl.js
 var raster_layer_vertex_glsl_default = `#version 300 es
 #define SHADER_NAME raster-layer-vertex-shader
-
 in vec3 positions;
 in vec3 normals;
-
 in float instanceElevations;
 in vec4 instanceFillColors;
 in vec4 instanceLineColors;
-
 in vec3 instancePickingColors;
-
-// Custom uniforms
 uniform float opacity;
 uniform bool extruded;
 uniform bool stroked;
@@ -1031,80 +1025,55 @@ uniform float coverage;
 uniform float elevationScale;
 uniform float widthScale;
 uniform vec3 offset;
-
-// Result
 out vec4 vColor;
 #ifdef FLAT_SHADING
 out vec4 position_commonspace;
 #endif
-
 void main(void) {
-  // Rather than positioning using attribute, layout pixel grid using gl_InstanceID
-  vec2 common_position = offset.xy;
-  float scale = offset.z;
-
-  int yIndex = - (gl_InstanceID / BLOCK_WIDTH);
-  int xIndex = gl_InstanceID + (yIndex * BLOCK_WIDTH);
-  common_position += scale * vec2(float(xIndex), float(yIndex));
-
-  vec4 color = isStroke ? instanceLineColors : instanceFillColors;
-
-  // if alpha == 0.0 or z < 0.0, do not render element
-  float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);
-  float cellWidth = coverage * scale;
-
-  // Get position directly from quadbin, rather than projecting
-  // Important to set geometry.position before using project_ methods below
-  // as geometry.worldPosition is not set (we don't know our lat/long)
-  geometry.position = vec4(common_position, 0.0, 1.0);
-  if (project_uProjectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
-    geometry.position.xyz -= project_uCommonOrigin;
-  }
-
-  // calculate elevation, if 3d not enabled set to 0
-  // cylindar geometry height are between -1.0 to 1.0, transform it to between 0, 1
-  float elevation = 0.0;
-  // calculate stroke offset
-  float strokeOffsetRatio = 1.0;
-
-  if (extruded) {
-    elevation = instanceElevations * (positions.z + 1.0) / 2.0 * elevationScale;
-  } else if (stroked) {
-    float halfOffset = project_pixel_size(widthScale) / cellWidth;
-    if (isStroke) {
-      strokeOffsetRatio -= sign(positions.z) * halfOffset;
-    } else {
-      strokeOffsetRatio -= halfOffset;
-    }
-  }
-
-  geometry.pickingColor = instancePickingColors;
-
-  // project center of column
-  vec2 offset = (vec2(0.5) + positions.xy * strokeOffsetRatio) * cellWidth * shouldRender;
-  vec3 pos = vec3(offset, project_size(elevation));
-  DECKGL_FILTER_SIZE(pos, geometry);
-
-  geometry.position.xyz += pos;
-  gl_Position = project_common_position_to_clipspace(geometry.position);
-
-  geometry.normal = project_normal(normals);
-  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
-
-  // Light calculations
-  if (extruded && !isStroke) {
+vec2 common_position = offset.xy;
+float scale = offset.z;
+int yIndex = - (gl_InstanceID / BLOCK_WIDTH);
+int xIndex = gl_InstanceID + (yIndex * BLOCK_WIDTH);
+common_position += scale * vec2(float(xIndex), float(yIndex));
+vec4 color = isStroke ? instanceLineColors : instanceFillColors;
+float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);
+float cellWidth = coverage * scale;
+geometry.position = vec4(common_position, 0.0, 1.0);
+if (project_uProjectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
+geometry.position.xyz -= project_uCommonOrigin;
+}
+float elevation = 0.0;
+float strokeOffsetRatio = 1.0;
+if (extruded) {
+elevation = instanceElevations * (positions.z + 1.0) / 2.0 * elevationScale;
+} else if (stroked) {
+float halfOffset = project_pixel_size(widthScale) / cellWidth;
+if (isStroke) {
+strokeOffsetRatio -= sign(positions.z) * halfOffset;
+} else {
+strokeOffsetRatio -= halfOffset;
+}
+}
+geometry.pickingColor = instancePickingColors;
+vec2 offset = (vec2(0.5) + positions.xy * strokeOffsetRatio) * cellWidth * shouldRender;
+vec3 pos = vec3(offset, project_size(elevation));
+DECKGL_FILTER_SIZE(pos, geometry);
+geometry.position.xyz += pos;
+gl_Position = project_common_position_to_clipspace(geometry.position);
+geometry.normal = project_normal(normals);
+DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
+if (extruded && !isStroke) {
 #ifdef FLAT_SHADING
-    position_commonspace = geometry.position;
-    vColor = vec4(color.rgb, color.a * opacity);
+position_commonspace = geometry.position;
+vColor = vec4(color.rgb, color.a * opacity);
 #else
-    vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, geometry.normal);
-    vColor = vec4(lightColor, color.a * opacity);
+vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, geometry.normal);
+vColor = vec4(lightColor, color.a * opacity);
 #endif
-  } else {
-    vColor = vec4(color.rgb, color.a * opacity);
-  }
-
-  DECKGL_FILTER_COLOR(vColor, geometry);
+} else {
+vColor = vec4(color.rgb, color.a * opacity);
+}
+DECKGL_FILTER_COLOR(vColor, geometry);
 }
 `;
 
@@ -1137,16 +1106,14 @@ var _RasterColumnLayer = class extends import_layers2.ColumnLayer {
       },
       instanceFillColors: {
         size: this.props.colorFormat.length,
-        type: import_constants.GL.UNSIGNED_BYTE,
-        normalized: true,
+        type: "unorm8",
         transition: true,
         accessor: "getFillColor",
         defaultValue: [0, 0, 0, 255]
       },
       instanceLineColors: {
         size: this.props.colorFormat.length,
-        type: import_constants.GL.UNSIGNED_BYTE,
-        normalized: true,
+        type: "unorm8",
         transition: true,
         accessor: "getLineColor",
         defaultValue: [255, 255, 255, 255]
@@ -1288,7 +1255,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
 
 // dist/layers/schema/carto-vector-tile-loader.js
 var import_earcut = __toESM(require("earcut"), 1);
-var VERSION3 = true ? "9.0.0-beta.3" : "latest";
+var VERSION3 = true ? "9.0.0-beta.5" : "latest";
 var id3 = "cartoVectorTile";
 var DEFAULT_OPTIONS3 = {
   cartoVectorTile: {
@@ -1609,7 +1576,6 @@ var DEFAULT_CLIENT = "deck-gl-carto";
 var V3_MINOR_VERSION = "3.3";
 var MAX_GET_LENGTH = 8192;
 var DEFAULT_PARAMETERS = {
-  client: DEFAULT_CLIENT,
   v: V3_MINOR_VERSION
 };
 var DEFAULT_HEADERS = {
@@ -1702,17 +1668,18 @@ async function baseSource(endpoint, options, urlParameters) {
     }
   }
   const baseUrl2 = buildSourceUrl(mergedOptions);
-  const { format } = mergedOptions;
+  const { clientId, format } = mergedOptions;
   const headers = { Authorization: `Bearer ${options.accessToken}`, ...options.headers };
+  const parameters = { client: clientId, ...urlParameters };
   const errorContext = {
     requestType: "Map instantiation",
     connection: options.connectionName,
     type: endpoint,
-    source: JSON.stringify(urlParameters, void 0, 2)
+    source: JSON.stringify(parameters, void 0, 2)
   };
   const mapInstantiation = await requestWithParameters({
     baseUrl: baseUrl2,
-    parameters: urlParameters,
+    parameters,
     headers,
     errorContext
   });
@@ -1903,7 +1870,7 @@ var vectorTilesetSource = async function(options) {
 };
 
 // dist/api/parse-map.js
-var import_constants2 = require("@luma.gl/constants");
+var import_constants = require("@luma.gl/constants");
 var import_core11 = require("@deck.gl/core");
 
 // dist/api/layer-map.js
@@ -2303,11 +2270,11 @@ function parseMap(json) {
 }
 function createParametersProp(layerBlending, parameters) {
   if (layerBlending === "additive") {
-    parameters.blendFunc = [import_constants2.GL.SRC_ALPHA, import_constants2.GL.DST_ALPHA];
-    parameters.blendEquation = import_constants2.GL.FUNC_ADD;
+    parameters.blendFunc = [770, 772];
+    parameters.blendEquation = 32774;
   } else if (layerBlending === "subtractive") {
-    parameters.blendFunc = [import_constants2.GL.ONE, import_constants2.GL.ONE_MINUS_DST_COLOR, import_constants2.GL.SRC_ALPHA, import_constants2.GL.DST_ALPHA];
-    parameters.blendEquation = [import_constants2.GL.FUNC_SUBTRACT, import_constants2.GL.FUNC_ADD];
+    parameters.blendFunc = [1, 775, 770, 772];
+    parameters.blendEquation = [32778, 32774];
   }
   return Object.keys(parameters).length ? { parameters } : {};
 }
@@ -2562,8 +2529,12 @@ async function _fetchTilestats(attribute, dataset, accessToken, apiBaseUrl) {
     throw new CartoAPIError(new Error(`Invalid dataset for tilestats: ${id4}`), errorContext);
   }
   const baseUrl2 = buildStatsUrl({ attribute, apiBaseUrl, ...dataset });
+  const client = new URLSearchParams(data.tiles[0]).get("client");
   const headers = { Authorization: `Bearer ${accessToken}` };
   const parameters = {};
+  if (client) {
+    parameters.client = client;
+  }
   if (type === "query") {
     parameters.q = source;
     if (queryParameters) {