@deck.gl/carto 9.3.7 → 9.4.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cartoPropertiesTile-worker.js +1 -1
- package/dist/cartoRasterTile-worker.js +1 -1
- package/dist/cartoSpatialTile-worker.js +1 -1
- package/dist/cartoVectorTile-worker.js +1 -1
- package/dist/dist.dev.js +1 -3
- package/dist/index.cjs +5 -6
- package/dist/index.cjs.map +2 -2
- package/dist/layers/raster-layer-vertex.glsl.d.ts +1 -1
- package/dist/layers/raster-layer-vertex.glsl.d.ts.map +1 -1
- package/dist/layers/raster-layer-vertex.glsl.js +1 -2
- package/dist/layers/raster-layer-vertex.glsl.js.map +1 -1
- package/dist/layers/schema/carto-properties-tile-loader.js +1 -1
- package/dist/layers/schema/carto-properties-tile-loader.js.map +1 -1
- package/dist/layers/schema/carto-raster-tile-loader.js +1 -1
- package/dist/layers/schema/carto-raster-tile-loader.js.map +1 -1
- package/dist/layers/schema/carto-spatial-tile-loader.js +1 -1
- package/dist/layers/schema/carto-spatial-tile-loader.js.map +1 -1
- package/dist/layers/schema/carto-vector-tile-loader.js +1 -1
- package/dist/layers/schema/carto-vector-tile-loader.js.map +1 -1
- package/dist.min.js +3 -4
- package/package.json +7 -7
- package/src/layers/raster-layer-vertex.glsl.ts +1 -3
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
declare const _default: "#version 300 es\n#define SHADER_NAME raster-layer-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\n\nin float instanceElevations;\nin vec4 instanceFillColors;\nin vec4 instanceLineColors;\n\
|
|
1
|
+
declare const _default: "#version 300 es\n#define SHADER_NAME raster-layer-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\n\nin float instanceElevations;\nin vec4 instanceFillColors;\nin vec4 instanceLineColors;\n\n// Result\nout vec4 vColor;\n#ifdef FLAT_SHADING\nout vec4 position_commonspace;\n#endif\n\nvoid main(void) {\n // Rather than positioning using attribute, layout pixel grid using gl_InstanceID\n vec2 tileOrigin = column.offset.xy;\n float scale = column.widthScale; // Re-use widthScale prop to pass cell scale\n\n int yIndex = - (gl_InstanceID / BLOCK_WIDTH);\n int xIndex = gl_InstanceID + (yIndex * BLOCK_WIDTH);\n\n // Avoid precision issues by applying 0.5 offset here, rather than when laying out vertices\n vec2 cellCenter = scale * vec2(float(xIndex) + 0.5, float(yIndex) - 0.5);\n\n vec4 color = column.isStroke ? instanceLineColors : instanceFillColors;\n\n // if alpha == 0.0 or z < 0.0, do not render element\n float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);\n float cellWidth = column.coverage * scale;\n\n // Get position directly from quadbin, rather than projecting\n // Important to set geometry.position before using project_ methods below\n // as geometry.worldPosition is not set (we don't know our lat/long)\n geometry.position = vec4(tileOrigin, 0.0, 1.0);\n if (project.projectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {\n geometry.position.xyz -= project.commonOrigin;\n }\n\n // Important to apply after tileOrigin & commonOrigin as they are large values which often\n // cancel and thus cellCenter precision is lost if applied first.\n geometry.position.xy += cellCenter;\n\n // calculate elevation, if 3d not enabled set to 0\n // cylindar geometry height are between -1.0 to 1.0, transform it to between 0, 1\n float elevation = 0.0;\n // calculate stroke offset\n float strokeOffsetRatio = 1.0;\n\n if (column.extruded) {\n elevation = instanceElevations * (positions.z + 1.0) / 2.0 * column.elevationScale;\n } else if (column.stroked) {\n float halfOffset = project_pixel_size(column.widthScale) / cellWidth;\n if (column.isStroke) {\n strokeOffsetRatio -= sign(positions.z) * halfOffset;\n } else {\n strokeOffsetRatio -= halfOffset;\n }\n }\n\n geometry.pickingColor = picking_getPickingColorFromInstanceID();\n\n // Cell coordinates centered on origin\n vec2 base = positions.xy * scale * strokeOffsetRatio * column.coverage * shouldRender;\n vec3 cell = vec3(base, project_size(elevation));\n DECKGL_FILTER_SIZE(cell, geometry);\n\n geometry.position.xyz += cell;\n gl_Position = project_common_position_to_clipspace(geometry.position);\n\n geometry.normal = project_normal(normals);\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n // Light calculations\n if (column.extruded && !column.isStroke) {\n#ifdef FLAT_SHADING\n position_commonspace = geometry.position;\n vColor = vec4(color.rgb, color.a * layer.opacity);\n#else\n vec3 lightColor = lighting_getLightColor(color.rgb, project.cameraPosition, geometry.position.xyz, geometry.normal);\n vColor = vec4(lightColor, color.a * layer.opacity);\n#endif\n } else {\n vColor = vec4(color.rgb, color.a * layer.opacity);\n }\n\n DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
|
|
2
2
|
export default _default;
|
|
3
3
|
//# sourceMappingURL=raster-layer-vertex.glsl.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raster-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/layers/raster-layer-vertex.glsl.ts"],"names":[],"mappings":";AAIA,
|
|
1
|
+
{"version":3,"file":"raster-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/layers/raster-layer-vertex.glsl.ts"],"names":[],"mappings":";AAIA,wBA2FE"}
|
|
@@ -9,7 +9,6 @@ in vec3 normals;
|
|
|
9
9
|
in float instanceElevations;
|
|
10
10
|
in vec4 instanceFillColors;
|
|
11
11
|
in vec4 instanceLineColors;
|
|
12
|
-
in vec3 instancePickingColors;
|
|
13
12
|
out vec4 vColor;
|
|
14
13
|
#ifdef FLAT_SHADING
|
|
15
14
|
out vec4 position_commonspace;
|
|
@@ -40,7 +39,7 @@ strokeOffsetRatio -= sign(positions.z) * halfOffset;
|
|
|
40
39
|
strokeOffsetRatio -= halfOffset;
|
|
41
40
|
}
|
|
42
41
|
}
|
|
43
|
-
geometry.pickingColor =
|
|
42
|
+
geometry.pickingColor = picking_getPickingColorFromInstanceID();
|
|
44
43
|
vec2 base = positions.xy * scale * strokeOffsetRatio * column.coverage * shouldRender;
|
|
45
44
|
vec3 cell = vec3(base, project_size(elevation));
|
|
46
45
|
DECKGL_FILTER_SIZE(cell, geometry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raster-layer-vertex.glsl.js","sourceRoot":"","sources":["../../src/layers/raster-layer-vertex.glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC
|
|
1
|
+
{"version":3,"file":"raster-layer-vertex.glsl.js","sourceRoot":"","sources":["../../src/layers/raster-layer-vertex.glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2FE"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { TileReader } from "./carto-properties-tile.js";
|
|
5
5
|
import { parsePbf } from "./tile-loader-utils.js";
|
|
6
6
|
import { getWorkerUrl } from "../../utils.js";
|
|
7
|
-
const VERSION = typeof "9.
|
|
7
|
+
const VERSION = typeof "9.4.0-alpha.1" !== 'undefined' ? "9.4.0-alpha.1" : 'latest';
|
|
8
8
|
const id = 'cartoPropertiesTile';
|
|
9
9
|
const DEFAULT_OPTIONS = {
|
|
10
10
|
cartoPropertiesTile: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"carto-properties-tile-loader.js","sourceRoot":"","sources":["../../../src/layers/schema/carto-properties-tile-loader.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAO,UAAU,EAAC,mCAAgC;AACzD,OAAO,EAAC,QAAQ,EAAC,+BAA4B;AAC7C,OAAO,EAAC,YAAY,EAAC,uBAAoB;AAEzC,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"carto-properties-tile-loader.js","sourceRoot":"","sources":["../../../src/layers/schema/carto-properties-tile-loader.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAO,UAAU,EAAC,mCAAgC;AACzD,OAAO,EAAC,QAAQ,EAAC,+BAA4B;AAC7C,OAAO,EAAC,YAAY,EAAC,uBAAoB;AAEzC,MAAM,OAAO,GAAG,sBAAkB,KAAK,WAAW,CAAC,CAAC,iBAAa,CAAC,CAAC,QAAQ,CAAC;AAC5E,MAAM,EAAE,GAAG,qBAAqB,CAAC;AAQjC,MAAM,eAAe,GAAqC;IACxD,mBAAmB,EAAE;QACnB,SAAS,EAAE,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC;KACrC;CACF,CAAC;AAEF,MAAM,yBAAyB,GAAqB;IAClD,IAAI,EAAE,uBAAuB;IAC7B,OAAO,EAAE,OAAO;IAChB,EAAE;IACF,MAAM,EAAE,OAAO;IACf,UAAU,EAAE,CAAC,KAAK,CAAC;IACnB,SAAS,EAAE,CAAC,uCAAuC,CAAC;IACpD,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC,wBAAwB,CAAC,WAAW,EAAE,OAAO,CAAC;IACrF,SAAS,EAAE,wBAAwB;IACnC,OAAO,EAAE,eAAsC;CAChD,CAAC;AAEF,SAAS,wBAAwB,CAAC,WAAwB,EAAE,OAAuB;IACjF,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC;IAC9B,OAAO,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;AAC3C,CAAC;AAED,eAAe,yBAAyB,CAAC"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { TileReader } from "./carto-raster-tile.js";
|
|
5
5
|
import { parsePbf } from "./tile-loader-utils.js";
|
|
6
6
|
import { getWorkerUrl } from "../../utils.js";
|
|
7
|
-
const VERSION = typeof "9.
|
|
7
|
+
const VERSION = typeof "9.4.0-alpha.1" !== 'undefined' ? "9.4.0-alpha.1" : 'latest';
|
|
8
8
|
const id = 'cartoRasterTile';
|
|
9
9
|
const DEFAULT_OPTIONS = {
|
|
10
10
|
cartoRasterTile: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"carto-raster-tile-loader.js","sourceRoot":"","sources":["../../../src/layers/schema/carto-raster-tile-loader.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAKpC,OAAO,EAAC,UAAU,EAAC,+BAA4B;AAC/C,OAAO,EAAC,QAAQ,EAAC,+BAA4B;AAC7C,OAAO,EAAC,YAAY,EAAC,uBAAoB;AAGzC,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"carto-raster-tile-loader.js","sourceRoot":"","sources":["../../../src/layers/schema/carto-raster-tile-loader.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAKpC,OAAO,EAAC,UAAU,EAAC,+BAA4B;AAC/C,OAAO,EAAC,QAAQ,EAAC,+BAA4B;AAC7C,OAAO,EAAC,YAAY,EAAC,uBAAoB;AAGzC,MAAM,OAAO,GAAG,sBAAkB,KAAK,WAAW,CAAC,CAAC,iBAAa,CAAC,CAAC,QAAQ,CAAC;AAC5E,MAAM,EAAE,GAAG,iBAAiB,CAAC;AAS7B,MAAM,eAAe,GAAG;IACtB,eAAe,EAAE;QACf,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC;KACrC;CAC8C,CAAC;AAElD,MAAM,qBAAqB,GAAqB;IAC9C,IAAI,EAAE,mBAAmB;IACzB,OAAO,EAAE,OAAO;IAChB,EAAE;IACF,MAAM,EAAE,OAAO;IACf,UAAU,EAAE,CAAC,KAAK,CAAC;IACnB,SAAS,EAAE,CAAC,mCAAmC,CAAC;IAChD,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,OAAsC,EAAE,EAAE,CACnE,oBAAoB,CAAC,WAAW,EAAE,OAAO,CAAC;IAC5C,SAAS,EAAE,oBAAoB;IAC/B,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,eAAe;CACzB,CAAC;AAWF,SAAS,oBAAoB,CAC3B,WAAwB,EACxB,OAAsC;IAEtC,MAAM,QAAQ,GAAG,OAAO,EAAE,eAAe,EAAE,QAAQ,CAAC;IACpD,IAAI,CAAC,WAAW,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3C,qDAAqD;IACrD,UAAU,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;IAC9C,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC9C,MAAM,EAAC,KAAK,EAAE,SAAS,EAAC,GAAG,GAAG,CAAC;IAE/B,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,EAAC,IAAI,EAAE,IAAI,EAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,YAAY,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC5B,CAAC;IACD,OAAO,EAAC,SAAS,EAAE,KAAK,EAAE,EAAC,YAAY,EAAE,UAAU,EAAE,EAAE,EAAC,EAAC,CAAC;AAC5D,CAAC;AAED,eAAe,qBAAqB,CAAC"}
|
|
@@ -5,7 +5,7 @@ import { TileReader } from "./carto-spatial-tile.js";
|
|
|
5
5
|
import { parsePbf } from "./tile-loader-utils.js";
|
|
6
6
|
import { getWorkerUrl } from "../../utils.js";
|
|
7
7
|
import { binaryToSpatialjson } from "./spatialjson-utils.js";
|
|
8
|
-
const VERSION = typeof "9.
|
|
8
|
+
const VERSION = typeof "9.4.0-alpha.1" !== 'undefined' ? "9.4.0-alpha.1" : 'latest';
|
|
9
9
|
const id = 'cartoSpatialTile';
|
|
10
10
|
const DEFAULT_OPTIONS = {
|
|
11
11
|
cartoSpatialTile: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"carto-spatial-tile-loader.js","sourceRoot":"","sources":["../../../src/layers/schema/carto-spatial-tile-loader.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAO,UAAU,EAAC,gCAA6B;AACtD,OAAO,EAAC,QAAQ,EAAC,+BAA4B;AAC7C,OAAO,EAAC,YAAY,EAAC,uBAAoB;AACzC,OAAO,EAAc,mBAAmB,EAAc,+BAA4B;AAElF,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"carto-spatial-tile-loader.js","sourceRoot":"","sources":["../../../src/layers/schema/carto-spatial-tile-loader.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAO,UAAU,EAAC,gCAA6B;AACtD,OAAO,EAAC,QAAQ,EAAC,+BAA4B;AAC7C,OAAO,EAAC,YAAY,EAAC,uBAAoB;AACzC,OAAO,EAAc,mBAAmB,EAAc,+BAA4B;AAElF,MAAM,OAAO,GAAG,sBAAkB,KAAK,WAAW,CAAC,CAAC,iBAAa,CAAC,CAAC,QAAQ,CAAC;AAC5E,MAAM,EAAE,GAAG,kBAAkB,CAAC;AAS9B,MAAM,eAAe,GAAkC;IACrD,gBAAgB,EAAE;QAChB,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC;KACrC;CACF,CAAC;AAEF,MAAM,sBAAsB,GAAqB;IAC/C,IAAI,EAAE,oBAAoB;IAC1B,OAAO,EAAE,OAAO;IAChB,EAAE;IACF,MAAM,EAAE,OAAO;IACf,UAAU,EAAE,CAAC,KAAK,CAAC;IACnB,SAAS,EAAE,CAAC,oCAAoC,CAAC;IACjD,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,OAAuC,EAAE,EAAE,CACpE,qBAAqB,CAAC,WAAW,EAAE,OAAO,CAAC;IAC7C,SAAS,EAAE,qBAAqB;IAChC,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,eAAsC;CAChD,CAAC;AAEF,SAAS,qBAAqB,CAC5B,WAAwB,EACxB,OAAuC;IAEvC,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC;IAC9B,MAAM,IAAI,GAAS,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAErD,MAAM,EAAC,KAAK,EAAC,GAAG,IAAI,CAAC;IACrB,MAAM,MAAM,GAAG,OAAO,EAAE,gBAAgB,EAAE,MAAM,CAAC;IACjD,MAAM,IAAI,GAAG,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC;IAE7B,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAED,eAAe,sBAAsB,CAAC"}
|
|
@@ -5,7 +5,7 @@ import earcut from 'earcut';
|
|
|
5
5
|
import { TileReader } from "./carto-tile.js";
|
|
6
6
|
import { parsePbf } from "./tile-loader-utils.js";
|
|
7
7
|
import { getWorkerUrl } from "../../utils.js";
|
|
8
|
-
const VERSION = typeof "9.
|
|
8
|
+
const VERSION = typeof "9.4.0-alpha.1" !== 'undefined' ? "9.4.0-alpha.1" : 'latest';
|
|
9
9
|
const id = 'cartoVectorTile';
|
|
10
10
|
const DEFAULT_OPTIONS = {
|
|
11
11
|
cartoVectorTile: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"carto-vector-tile-loader.js","sourceRoot":"","sources":["../../../src/layers/schema/carto-vector-tile-loader.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAI5B,OAAO,EAAC,UAAU,EAAC,wBAAqB;AACxC,OAAO,EAAC,QAAQ,EAAC,+BAA4B;AAC7C,OAAO,EAAC,YAAY,EAAC,uBAAoB;AAEzC,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"carto-vector-tile-loader.js","sourceRoot":"","sources":["../../../src/layers/schema/carto-vector-tile-loader.ts"],"names":[],"mappings":"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"}
|