@arcgis/core 6.0.0-next.29 → 6.0.0-next.30

package/chunks/RibbonLine.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{sliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{RibbonVertexPosition as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{EvaluateAmbientOcclusion as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{forwardLocalUp as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/forwardLocalUp.glsl.js";import{mainLightIntensity as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{LineStipple as o,computePixelSize as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{PiUtils as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as u}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{readFragmentShadow as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readFragmentShadow.glsl.js";import{metersPerRenderUnit as f,screenPixelSizePerDistance as p,inverseProjectionMatrix as m,nearFar as h,viewport as ee,pixelRatio as te}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{ColorConversion as ne}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as g,NoPerspectiveRead as _}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{addProjViewLocalOrigin as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float4PassUniform as y}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as b}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as x,If as S}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{alphaCutoff as C}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{animatedAlpha as re}from"../views/3d/webgl-engine/shaders/animatedAlpha.glsl.js";import{groundMetersToScreenRatio as ie,planarDistanceToScreenRatio as w}from"../views/3d/webgl-engine/shaders/lineUniforms.js";import{outputColorHighlightOLID as T}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getTextureBackedBufferModule as E}from"../views/3d/webgl-engine/shaders/RibbonLineTextureBuffer.glsl.js";import{ShaderBuilder as D}from"../views/webgl/ShaderBuilder.js";const O=1;function k(O){let k=new D,{attributes:A,varyings:j,vertex:M,fragment:N}=k,{applyMarkerOffset:P,draped:F,shadingEnabled:I,output:L,capType:R,stippleEnabled:z,falloffEnabled:B,wireframe:V,innerColorEnabled:H,hasAnimation:U,hasScreenSizePerspective:W,worldSized:G,imagePattern:K,useFlatJoinVarying:q}=O,J=R===2,Y=z&&J,X=B||Y,ae=z||J,Z=O.usePerspectiveCorrectStipple,Q=E(O).createBuilder(k,O);M.inputs.add(`position`,()=>Q.getTextureAttribute(`position`)),O.hasVVSize?M.inputs.add(`sizeFeatureAttribute`,()=>Q.getTextureAttribute(`sizeFeatureAttribute`)):M.inputs.add(`size`,()=>Q.getTextureAttribute(`size`)),O.hasVVOpacity&&M.inputs.add(`opacityFeatureAttribute`,()=>Q.getTextureAttribute(`opacityFeatureAttribute`)),O.hasVVColor?M.inputs.add(`colorFeatureAttribute`,()=>Q.getTextureAttribute(`colorFeatureAttribute`)):M.inputs.add(`color`,()=>Q.getTextureAttribute(`color`)),N.include(l),k.include(t,O),k.include(o,O),L===11?(k.varyings.add(`objectAndLayerIdColorVarying`,`vec4`),M.code.add(x`
+import{sliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{RibbonVertexPosition as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{EvaluateAmbientOcclusion as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as ee}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{forwardLocalUp as te}from"../views/3d/webgl-engine/core/shaderLibrary/shading/forwardLocalUp.glsl.js";import{mainLightIntensity as ne}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{LineStipple as re,computePixelSize as ie}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as ae}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{PiUtils as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{readFragmentShadow as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readFragmentShadow.glsl.js";import{metersPerRenderUnit as o,screenPixelSizePerDistance as s,inverseProjectionMatrix as c,nearFar as l,viewport as u,pixelRatio as oe}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{ColorConversion as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as f,NoPerspectiveRead as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{getPackedUint32Field as m}from"../views/3d/webgl-engine/core/shaderLibrary/util/PackedUint32.glsl.js";import{addProjViewLocalOrigin as h}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float4PassUniform as g}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as _}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as v,If as y}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{ribbonLineVertexInfoPacking as b,ribbonVertexTypeSignBit as se,ribbonSubdivisionScale as ce,ribbonInsideJoinOffset as x}from"../views/3d/webgl-engine/lib/RibbonLineVertexInfo.js";import{alphaCutoff as S}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{animatedAlpha as C}from"../views/3d/webgl-engine/shaders/animatedAlpha.glsl.js";import{groundMetersToScreenRatio as w,planarDistanceToScreenRatio as T}from"../views/3d/webgl-engine/shaders/lineUniforms.js";import{outputColorHighlightOLID as E}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getTextureBackedBufferModule as D}from"../views/3d/webgl-engine/shaders/RibbonLineTextureBuffer.glsl.js";import{ShaderBuilder as O}from"../views/webgl/ShaderBuilder.js";const k=1;function A(k){let A=new O,{attributes:j,varyings:M,vertex:N,fragment:P}=A,{applyMarkerOffset:F,draped:I,shadingEnabled:L,output:R,capType:z,stippleEnabled:B,falloffEnabled:V,wireframe:H,innerColorEnabled:U,hasAnimation:W,hasScreenSizePerspective:G,worldSized:K,imagePattern:le,useFlatJoinVarying:q}=k,J=z===2,Y=B&&J,X=V||Y,ue=B||J,Z=B&&k.usePerspectiveCorrectStipple,Q=D(k).createBuilder(A,k);N.inputs.add(`position`,()=>Q.getTextureAttribute(`position`)),k.hasVVSize?N.inputs.add(`sizeFeatureAttribute`,()=>Q.getTextureAttribute(`sizeFeatureAttribute`)):N.inputs.add(`size`,()=>k.hasVertexSize?Q.getTextureAttribute(`size`):v`1.0`),k.hasVVOpacity&&N.inputs.add(`opacityFeatureAttribute`,()=>Q.getTextureAttribute(`opacityFeatureAttribute`)),k.hasVVColor?N.inputs.add(`colorFeatureAttribute`,()=>Q.getTextureAttribute(`colorFeatureAttribute`)):N.inputs.add(`color`,()=>k.hasVertexColor?Q.getTextureAttribute(`color`):v`vec4(1.0)`),P.include(r),A.include(t,k),A.include(re,k),R===11?(A.varyings.add(`objectAndLayerIdColorVarying`,`vec4`),N.code.add(v`
       vec4 getOlidColor() {
         return ${Q.getTextureAttribute(`olidColor`)};
       }
@@ -7,9 +7,9 @@ import{sliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.gls
       void forwardObjectAndLayerIdColor() {
         objectAndLayerIdColorVarying = getOlidColor();
       }
-    `),N.code.add(x`void outputObjectAndLayerIdColor() {
+    `),P.code.add(v`void outputObjectAndLayerIdColor() {
 fragColor = objectAndLayerIdColorVarying;
-}`)):(M.code.add(x`void forwardObjectAndLayerIdColor() {}`),N.code.add(x`void outputObjectAndLayerIdColor() {}`));let $=P&&!F;return $&&k.include(c,O),v(M,O),F&&(G||z)&&M.uniforms.add(G?ie:w),G&&!F&&M.uniforms.add(f,p),M.uniforms.add(m,h,ee,new b(`miterLimit`,e=>e.join===`miter`?e.miterLimit:0)),M.constants.add(`LARGE_HALF_FLOAT`,`float`,65500),M.constants.add(`EPS`,`float`,.001),M.constants.add(`NUM_JOIN_SUBDIVISIONS`,`float`,O.numJoinSubdivisions),A.add(`textureElementIndex`,`uint`),A.add(`lineParameters`,`vec2`),j.add(`vColor`,`vec4`),j.add(`vpos`,`vec3`,{invariant:!0}),j.add(`vLineDistance`,`float`),j.add(`vLineWidth`,`float`),q?j.add(`vIsInsideJoin`,`int`,{flat:!0}):j.add(`vIsInsideJoin`,`float`),j.add(`vStretchFactor`,`float`),j.add(`vJoinCenterLineSDFs`,`vec2`),j.add(`vSubdivisionFactor`,`float`),z&&j.add(`vLineSizeInv`,`float`),X&&j.add(`vLineDistanceNorm`,`float`),J&&(j.add(`vSegmentSDF`,`float`),j.add(`vReverseSegmentSDF`,`float`)),M.code.add(x`vec3 perpendicular(vec3 v) {
+}`)):(N.code.add(v`void forwardObjectAndLayerIdColor() {}`),P.code.add(v`void outputObjectAndLayerIdColor() {}`));let $=F&&!I;$&&A.include(ae,k),h(N,k),I&&(K||B)&&N.uniforms.add(K?w:T),K&&!I&&N.uniforms.add(o,s),N.uniforms.add(c,l,u,new _(`miterLimit`,e=>e.join===`miter`?e.miterLimit:0)),N.constants.add(`LARGE_HALF_FLOAT`,`float`,65500),N.constants.add(`EPS`,`float`,.001),N.constants.add(`NUM_JOIN_SUBDIVISIONS`,`float`,k.numJoinSubdivisions),j.add(`ribbonLineVertexInfo`,`uint`),M.add(`vColor`,`vec4`),M.add(`vpos`,`vec3`,{invariant:!0}),M.add(`vLineDistance`,`float`),M.add(`vLineWidth`,`float`),q?M.add(`vIsInsideJoin`,`int`,{flat:!0}):M.add(`vIsInsideJoin`,`float`),M.add(`vStretchFactor`,`float`),M.add(`vJoinCenterLineSDFs`,`vec2`),M.add(`vSubdivisionFactor`,`float`),B&&M.add(`vLineSizeInv`,`float`),X&&M.add(`vLineDistanceNorm`,`float`),J&&(M.add(`vSegmentSDF`,`float`),M.add(`vReverseSegmentSDF`,`float`)),N.code.add(v`vec3 perpendicular(vec3 v) {
 return vec3(v.y, -v.x, 0.0);
 }
 float nearPlaneInterpolationFactor(float nearPlaneDistance, vec4 start, vec4 end) {
@@ -20,17 +20,17 @@ float s = sin(a);
 float c = cos(a);
 mat2 m = mat2(c, -s, s, c);
 return vec3(m * v.xy, v.z);
-}`),M.code.add(x`vec4 projectAndScale(vec4 pos) {
+}`),N.code.add(v`vec4 projectAndScale(vec4 pos) {
 vec4 posNdc = proj * pos;
 posNdc.xy *= viewport.zw / posNdc.w;
 posNdc.z /= posNdc.w;
 return posNdc;
-}`),M.code.add(x`
+}`),N.code.add(v`
     void clip(
       inout vec4 pos,
       inout vec4 prev,
       inout vec4 next,
-      ${S(Z,x`inout float u0, inout float prevU0, inout float nextU0,`)}
+      ${y(Z,v`inout float u0, inout float prevU0, inout float nextU0,`)}
       bool isStartVertex
     ) {
       float adjustedNearPlaneDistance = nearFar[0] * 0.99;
@@ -41,7 +41,7 @@ return posNdc;
           if (prev.z < -nearFar[0]) {
             // Previous position in front of near plane
             float clipFactor = nearPlaneInterpolationFactor(adjustedNearPlaneDistance, prev, pos);
-            ${S(Z,x`u0 = mix(prevU0, u0, clipFactor); nextU0 = u0;`)}
+            ${y(Z,v`u0 = mix(prevU0, u0, clipFactor); nextU0 = u0;`)}
             pos = mix(prev, pos, clipFactor);
             next = pos;
           } else {
@@ -51,7 +51,7 @@ return posNdc;
           if (next.z < -nearFar[0]) {
             // Next position in front of near plane
             float clipFactor = nearPlaneInterpolationFactor(adjustedNearPlaneDistance, pos, next);
-            ${S(Z,x`u0 = mix(u0, nextU0, clipFactor); prevU0 = u0;`)}
+            ${y(Z,v`u0 = mix(u0, nextU0, clipFactor); prevU0 = u0;`)}
             pos = mix(pos, next, clipFactor);
             prev = pos;
           } else {
@@ -63,58 +63,61 @@ return posNdc;
         if (prev.z > -nearFar[0]) {
           // Previous position behind near plane
           float clipFactor = nearPlaneInterpolationFactor(adjustedNearPlaneDistance, pos, prev);
-          ${S(Z,x`prevU0 = mix(u0, prevU0, clipFactor);`)}
+          ${y(Z,v`prevU0 = mix(u0, prevU0, clipFactor);`)}
           prev = mix(pos, prev, clipFactor);
         }
 
         if (next.z > -nearFar[0]) {
           // Next position behind near plane
           float clipFactor = nearPlaneInterpolationFactor(adjustedNearPlaneDistance, next, pos);
-          ${S(Z,x`nextU0 = mix(nextU0, u0, clipFactor);`)}
+          ${y(Z,v`nextU0 = mix(nextU0, u0, clipFactor);`)}
           next = mix(next, pos, clipFactor);
         }
       }
     }
-  `),M.uniforms.add(te),M.constants.add(`aaWidth`,`float`,1),N.constants.add(`aaWidth`,`float`,1),M.main.add(x`
+  `),N.uniforms.add(oe),N.constants.add(`aaWidth`,`float`,1),P.constants.add(`aaWidth`,`float`,1);let de=b.getField(1);return N.main.add(v`
+    uint vertexTypeBits = ${m(b,1,v`ribbonLineVertexInfo`)};
+    // Sign-extend the packed type; casting its unsigned field to int does not extend the field's sign bit.
+    uint signExtendedVertexTypeBits = (vertexTypeBits & ${v.hexuint(se)}) != 0u ? (vertexTypeBits | ~${v.hexuint(de.max)}) : vertexTypeBits;
+    int signedVertexType = int(signExtendedVertexTypeBits);
+    float subdivisionFactor = float(${m(b,2,v`ribbonLineVertexInfo`)}) / ${v.float(ce)};
     vec3 position = ${Q.getTextureAttribute(`position`)};
-    float u0 = ${Q.getTextureAttribute(`u0`)};
-    ${S(G,x`
+    ${B?v`float u0 = ${Q.getTextureAttribute(`u0`)};`:``}
+    ${B&&K?v`
         float prevU0 = ${Q.getTextureAttribute(`u0`,-1)};
         float nextU0 = ${Q.getTextureAttribute(`u0`,1)};
-        ${S(!F,x`
+        ${y(!I,v`
             u0 *= metersPerRenderUnit;
             prevU0 *= metersPerRenderUnit;
             nextU0 *= metersPerRenderUnit;
           `)}
-      `)}
-
+      `:``}
     // unpack values from vertex type
-    float vertexType = abs(lineParameters.y);
-    ${S(!q,x`
-      bool isInsideJoin = vertexType > 8.0;
-      vertexType -= isInsideJoin ? 8.0 : 0.0;
+    int vertexType = abs(signedVertexType);
+    ${y(!q,v`
+      bool isInsideJoin = vertexType > ${v.int(x)};
+      vertexType -= isInsideJoin ? ${v.int(x)} : 0;
     `)}
-    float lineSide = sign(lineParameters.y);
-    bool isStartVertex = vertexType == 2.0 || vertexType == 4.0;
+    float lineSide = float(sign(signedVertexType));
+    bool isStartVertex = vertexType == 2 || vertexType == 3;
     vec3 prevPosition = ${Q.getTextureAttribute(`position`,-1)};
     vec3 nextPosition = ${Q.getTextureAttribute(`position`,1)};
 
-    // Check for special value of lineParameters.y which is used by the Renderer when graphics are removed before the
-    // VBO is recompacted. If this is the case, then we just project outside of clip space.
-    if (lineParameters.y == 0.0) {
-      gl_Position = ${u};
+    // Cleared geometry has a zero descriptor; a zero vertex type marks geometry to hide.
+    if (signedVertexType == 0) {
+      gl_Position = ${i};
     }
     else {
       vec4 pos  = view * vec4(position, 1.0);
       vec4 prev = view * vec4(prevPosition, 1.0);
       vec4 next = view * vec4(nextPosition, 1.0);
 
-      bool isJoin = vertexType < 3.0;
-  `),$&&M.main.add(x`vec4 other = isStartVertex ? next : prev;
+      bool isJoin = vertexType < 3;
+  `),$&&N.main.add(v`vec4 other = isStartVertex ? next : prev;
 bool markersHidden = areWorldMarkersHidden(pos.xyz, other.xyz);
 if (!isJoin && !markersHidden) {
 pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
-}`),k.include(g),M.code.add(x`
+}`),A.include(f),N.code.add(v`
     vec2 computeJoinAndCapDisplacement(
       bool isJoin,
       bool isStartVertex,
@@ -160,7 +163,7 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
         }
 
         // Compute stretch compensation for feathering.
-        ${S(q,x`
+        ${y(q,v`
           if (subdivisionFactor > 0.0) {
             vIsInsideJoin = 1;
           }
@@ -194,14 +197,14 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
         }
 
         if (isOutside && displacementLen > miterLimit * lineWidth) {
-          ${S(O.roundJoins,x`
+          ${y(k.roundJoins,v`
               vec3 startDir = perpendicular(leftLen < EPS ? right : left);
               vec3 endDir = perpendicular(rightLen < EPS ? left : right);
-              float factor = ${z?x`min(1.0, subdivisionFactor * ((NUM_JOIN_SUBDIVISIONS + 1.0) / NUM_JOIN_SUBDIVISIONS))`:x`subdivisionFactor`};
+              float factor = ${B?v`min(1.0, subdivisionFactor * ((NUM_JOIN_SUBDIVISIONS + 1.0) / NUM_JOIN_SUBDIVISIONS))`:v`subdivisionFactor`};
 
               float rotationAngle = acos(clamp(dot(startDir.xy, endDir.xy), -1.0, 1.0));
               joinDisplacementDir = rotateZ(startDir, -lineSide * factor * rotationAngle);
-            `,x`
+            `,v`
               /**
                * Convert to bevel join if miterLimit is exceeded.
                * Here vertices with a subdivisionFactor > 0 are either START vertices or
@@ -213,19 +216,19 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
               vec3 startDir = perpendicular(leftLen < EPS ? right : left);
               vec3 endDir = perpendicular(rightLen < EPS ? left : right);
 
-              ${S(z,x`joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? endDir : startDir;`,x`joinDisplacementDir = mix(startDir, endDir, subdivisionFactor);`)}
+              ${y(B,v`joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? endDir : startDir;`,v`joinDisplacementDir = mix(startDir, endDir, subdivisionFactor);`)}
             `)}
           displacementLen = lineWidth;
         }
       } else {
         joinDisplacementDir = perpendicular(isStartVertex ? right : left);
-        ${R===0?``:x`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`}
+        ${z===0?``:v`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`}
       }
 
       return (joinDisplacementDir.xy * lineSide + capDisplacementDir.xy) * displacementLen;
     }
-  `),M.main.add(x`
-      clip(pos, prev, next, ${S(Z,x`u0, prevU0, nextU0,`)} isStartVertex);
+  `),N.main.add(v`
+      clip(pos, prev, next, ${y(Z,v`u0, prevU0, nextU0,`)} isStartVertex);
 
       vec3 clippedPos = pos.xyz;
       vec3 clippedCenter = mix(pos.xyz, isStartVertex ? next.xyz : prev.xyz, 0.5);
@@ -237,29 +240,29 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
       vec3 left = (pos.xyz - prev.xyz);
       vec3 right = (next.xyz - pos.xyz);
 
-      float lineSize = getSize(${S(W,`clippedPos`)});
-      ${S(z&&W,`float patternLineSize = getSize(clippedCenter);`)}
-      ${S(z&&!W,`float patternLineSize = lineSize;`)}
+      float lineSize = getSize(${y(G,`clippedPos`)});
+      ${y(B&&G,`float patternLineSize = getSize(clippedCenter);`)}
+      ${y(B&&!G,`float patternLineSize = lineSize;`)}
 
-      ${S(G,x`
-          ${S(F,x`float lineSizeScreen = lineSize * groundMetersToScreenRatio;`,x`
+      ${y(K,v`
+          ${y(I,v`float lineSizeScreen = lineSize * groundMetersToScreenRatio;`,v`
               float metersPerScreenPixel = max(-clippedPos.z, nearFar[0]) * metersPerRenderUnit * screenPixelSizePerDistance;
               float lineSizeScreen = lineSize / metersPerScreenPixel;
             `)}
           float lineWidth = lineSizeScreen * pixelRatio + aaWidth;
-        `,x`
+        `,v`
           float lineWidth = lineSize * pixelRatio + aaWidth;
         `)}
 
       vLineWidth = noPerspectiveWrite(lineWidth, pos.w);
-      ${z?`vLineSizeInv = noPerspectiveWrite(1.0 / ${G?`lineSize`:`max(lineSize, 1.0)`}, pos.w);`:``}
-  `),ae&&M.main.add(x`
+      ${B?`vLineSizeInv = noPerspectiveWrite(1.0 / ${K?`lineSize`:`max(lineSize, 1.0)`}, pos.w);`:``}
+  `),ue&&N.main.add(v`
       float isEndVertex = float(!isStartVertex);
       vec3 segmentOrigin = mix(pos.xyz, prev.xyz, isEndVertex);
       vec3 segment = mix(right, left, isEndVertex);
       ${J?`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:``}
-    `),M.main.add(x`
-    vIsInsideJoin = ${q?x`0`:x`float(isInsideJoin)`};
+    `),N.main.add(v`
+    vIsInsideJoin = ${q?v`0`:v`float(isInsideJoin)`};
     vStretchFactor = 1.0;
     vSubdivisionFactor = 0.0;
     vJoinCenterLineSDFs = vec2(LARGE_HALF_FLOAT);
@@ -271,7 +274,7 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
       right,
       lineSide,
       lineWidth,
-      lineParameters.x,
+      subdivisionFactor,
       pos.w
     );
     vec3 segmentDirection = isStartVertex ? right : left;
@@ -288,10 +291,10 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
     float lineDistNorm = noPerspectiveWrite(lineSide, pos.w);
 
     vLineDistance = lineWidth * lineDistNorm;
-    ${X?x`vLineDistanceNorm = lineDistNorm;`:``}
+    ${X?v`vLineDistanceNorm = lineDistNorm;`:``}
 
     pos.xyz += displacement;
-  `),M.main.add(x`if (isJoin) {
+  `),N.main.add(v`if (isJoin) {
 vec2 joinCenterToVertex = displacementXY;
 vec2 leftCenterlineDir = left.xy;
 vec2 rightCenterlineDir = right.xy;
@@ -306,36 +309,36 @@ dot(vec2(leftCenterlineDir.y, -leftCenterlineDir.x), joinCenterToVertex)
 ),
 pos.w
 );
-}`),J&&M.main.add(x`vec2 segmentDir = normalize(segment.xy);
+}`),J&&N.main.add(v`vec2 segmentDir = normalize(segment.xy);
 vSegmentSDF = noPerspectiveWrite((isJoin && isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentOrigin.xy, segmentDir)), pos.w);
-vReverseSegmentSDF = noPerspectiveWrite((isJoin && !isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentEnd.xy, -segmentDir)), pos.w);`),z&&(F?M.main.add(`float stippleDistanceToScreenRatio = ${G?`groundMetersToScreenRatio`:`planarDistanceToScreenRatio`};`):M.main.add(x`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
-float stippleDistanceToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),M.main.add(x`
+vReverseSegmentSDF = noPerspectiveWrite((isJoin && !isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentEnd.xy, -segmentDir)), pos.w);`),B&&(I?N.main.add(`float stippleDistanceToScreenRatio = ${K?`groundMetersToScreenRatio`:`planarDistanceToScreenRatio`};`):N.main.add(v`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
+float stippleDistanceToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),N.main.add(v`
       float segmentLengthScreenDouble = length(segment.xy);
       float segmentLengthScreen = segmentLengthScreenDouble * 0.5;
       float discreteStippleDistanceToScreenRatio = discretizeStippleDistanceToScreenRatio(stippleDistanceToScreenRatio);
-      float segmentLengthRender = ${S(G,x`abs(mix(nextU0 - u0, u0 - prevU0, isEndVertex))`,x`length(mix(nextPosition - position, position - prevPosition, isEndVertex))`)};
+      float segmentLengthRender = ${y(K,v`abs(mix(nextU0 - u0, u0 - prevU0, isEndVertex))`,v`length(mix(nextPosition - position, position - prevPosition, isEndVertex))`)};
 
-      ${S(!F||G,x`
-          float segmentStartRender = ${S(G,x`mix(u0, prevU0, isEndVertex)`,x`mix(u0, u0 - segmentLengthRender, isEndVertex)`)};
+      ${y(!I||K,v`
+          float segmentStartRender = ${y(K,v`mix(u0, prevU0, isEndVertex)`,v`mix(u0, u0 - segmentLengthRender, isEndVertex)`)};
         `)}
 
       vStipplePatternStretch = stippleDistanceToScreenRatio / discreteStippleDistanceToScreenRatio;
-    `),F?M.main.add(x`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteStippleDistanceToScreenRatio / stippleDistanceToScreenRatio;
-float startPseudoScreen = u0 * discreteStippleDistanceToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):M.main.add(x`float startPseudoScreen = segmentStartRender * discreteStippleDistanceToScreenRatio;
-float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceToScreenRatio;`),M.uniforms.add(new b(`stipplePatternPixelSize`,e=>s(e))),M.main.add(x`
+    `),I?N.main.add(v`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteStippleDistanceToScreenRatio / stippleDistanceToScreenRatio;
+float startPseudoScreen = u0 * discreteStippleDistanceToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):N.main.add(v`float startPseudoScreen = segmentStartRender * discreteStippleDistanceToScreenRatio;
+float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceToScreenRatio;`),N.uniforms.add(new _(`stipplePatternPixelSize`,e=>ie(e))),N.main.add(v`
       float patternLength = patternLineSize * stipplePatternPixelSize;
       vec2 stippleDistanceLimits;
 
-      ${S(G,x`
+      ${y(K,v`
           stippleDistanceLimits = vec2(segmentStartRender, segmentStartRender + segmentLengthRender);
           vStipplePatternStretch = 1.0;
 
-          ${S(K,x`
+          ${y(le,v`
               // The v-coordinate used in case of an image pattern.
               bool isLeft = lineSide < 0.0;
               vStippleV = isLeft ? 0.0 : 1.0;
             `)}
-        `,x`
+        `,v`
           // Compute the coordinates at both start and end of the line segment, because we need both to clamp to in the
           // fragment shader
           stippleDistanceLimits = computeStippleDistanceLimits(startPseudoScreen, segmentLengthPseudoScreen, segmentLengthScreen, patternLength);
@@ -355,7 +358,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceT
         vStippleDistance += (stippleDisplacementFactor - isEndVertex) * (stippleDistanceLimits.y - stippleDistanceLimits.x);
       }
 
-      ${S(Z,x`
+      ${y(Z,v`
           float segmentStartInverseW = 1.0 / mix(pos.w, prev.w, isEndVertex);
           float segmentEndInverseW = 1.0 / mix(next.w, pos.w, isEndVertex);
           vStipplePerspective = noPerspectiveWrite(
@@ -371,7 +374,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceT
       // Disable stipple distance limits on caps
       vStippleLimitsAndCaps.zw = isJoin ? vec2(0.0) :
                isStartVertex ? vec2(1.0, 0.0) : vec2(0.0, 1.0);
-    `)),M.main.add(x`
+    `)),N.main.add(v`
       // Convert back into NDC
       pos.xy = (pos.xy / viewport.zw) * pos.w;
       pos.z = pos.z * pos.w;
@@ -379,13 +382,13 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceT
       vColor = getColor();
       vColor.a = noPerspectiveWrite(vColor.a, pos.w);
 
-      ${V&&!F?`pos.z -= EPS * pos.w;`:``}
+      ${H&&!I?`pos.z -= EPS * pos.w;`:``}
 
       // transform final position to camera space for slicing
       vpos = (inverseProjectionMatrix * pos).xyz;
       gl_Position = pos;
       forwardObjectAndLayerIdColor();
-    }`),k.include(T,O),k.include(_),N.include(ne),N.include(C),N.include(e,O),N.main.add(`discardBySlice(vpos);`),N.code.add(x`float lineFeatheringFactor(float lineWidth, float lineDistance) {
+    }`),A.include(E,k),A.include(p),P.include(d),P.include(S),P.include(e,k),P.main.add(`discardBySlice(vpos);`),P.code.add(v`float lineFeatheringFactor(float lineWidth, float lineDistance) {
 float stretchFactor = float(vIsInsideJoin) > 0.5 ? noPerspectiveRead(vStretchFactor) : 1.0;
 float featherWidth = 2.0;
 float featherStartDistance = lineWidth - featherWidth / stretchFactor;
@@ -398,12 +401,12 @@ float straightFeather = (joinCenterDistance - straightFeatherStartDistance) / (l
 feather = float(vIsInsideJoin) > 0.5 ? max(feather, straightFeather) : feather;
 float coverage = min(lineWidth - aaWidth, 1.0);
 return clamp(1.0 - feather, 0.0, coverage);
-}`),N.main.add(x`
+}`),P.main.add(v`
     float lineWidth = noPerspectiveRead(vLineWidth);
     float lineDistance = noPerspectiveRead(vLineDistance);
-    ${S(X,x`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
-  `),Y&&N.main.add(x`float nominalLineWidth = lineWidth - aaWidth;`),V?N.main.add(x`vec4 albedo = vec4(1.0, 0.0, 1.0, 1.0);
-vec4 finalColor = albedo;`):(J&&N.main.add(x`
+    ${y(X,v`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
+  `),Y&&P.main.add(v`float nominalLineWidth = lineWidth - aaWidth;`),H?P.main.add(v`vec4 albedo = vec4(1.0, 0.0, 1.0, 1.0);
+vec4 finalColor = albedo;`):(J&&P.main.add(v`
         float sdf = noPerspectiveRead(min(vSegmentSDF, vReverseSegmentSDF));
         vec2 fragmentPosition = vec2(min(sdf, 0.0), lineDistance);
 
@@ -414,7 +417,7 @@ vec4 finalColor = albedo;`):(J&&N.main.add(x`
         if (capCoverage < alphaCutoff) {
           discard;
         }
-      `),Y?N.main.add(x`vec2 stipplePosition = vec2(
+      `),Y?P.main.add(v`vec2 stipplePosition = vec2(
 min(getStippleCapDistance(), 0.0) * nominalLineWidth,
 lineDistance
 );
@@ -422,11 +425,11 @@ float stippleRadius = length(stipplePosition);
 float stippleCapSDF = (stippleRadius - nominalLineWidth) * 0.5;
 float stippleCoverage = clamp(0.5 - stippleCapSDF, 0.0, 1.0);
 float lineCoverage = min(lineFeatheringFactor(lineWidth, lineDistance), capCoverage);
-float stippleAlpha = lineCoverage > 0.0 ? min(stippleCoverage, lineCoverage) / lineCoverage : 0.0;`):N.main.add(x`float stippleAlpha = getStippleAlpha(lineWidth);`),L!==11&&N.main.add(x`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),N.uniforms.add(new y(`intrinsicColor`,e=>e.color)).main.add(x`vec4 color = intrinsicColor * vColor;
-color.a = noPerspectiveRead(color.a);`),H&&N.uniforms.add(new y(`innerColor`,e=>e.innerColor??e.color),new b(`innerWidth`,(e,t)=>e.innerWidth*t.camera.pixelRatio)).main.add(x`float distToInner = abs(lineDistance) - innerWidth;
+float stippleAlpha = lineCoverage > 0.0 ? min(stippleCoverage, lineCoverage) / lineCoverage : 0.0;`):P.main.add(v`float stippleAlpha = getStippleAlpha(lineWidth);`),R!==11&&P.main.add(v`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),P.uniforms.add(new g(`intrinsicColor`,e=>e.color)).main.add(v`vec4 color = intrinsicColor * vColor;
+color.a = noPerspectiveRead(color.a);`),U&&P.uniforms.add(new g(`innerColor`,e=>e.innerColor??e.color),new _(`innerWidth`,(e,t)=>e.innerWidth*t.camera.pixelRatio)).main.add(v`float distToInner = abs(lineDistance) - innerWidth;
 float innerAA = clamp(0.5 - distToInner, 0.0, 1.0);
 float innerAlpha = innerColor.a + color.a * (1.0 - innerColor.a);
-color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),N.main.add(`vec4 albedo = blendStipple(color, stippleAlpha);`),B&&(N.uniforms.add(new b(`falloff`,e=>e.falloff)),N.main.add(x`albedo.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),N.main.add(x`albedo.a *= ${Y?`lineCoverage`:`lineFeatheringFactor(lineWidth, lineDistance)`};`),U&&(M.main.add(`vec4 animatedAlphaTimeStamps = ${Q.getTextureAttribute(`timeStamps`)};`),k.include(re,O),N.main.add(`albedo.a *= animatedAlpha();`)),I?(k.include(i,O),M.main.add(x`forwardLocalUp(position, localOrigin);`),M.main.add(`forwardLinearDepthToReadShadow();`),k.include(d,O),N.include(r,O),N.include(n,O),N.uniforms.add(a).main.add(x`vec3 normal = normalize(upNormal);
+color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),P.main.add(`vec4 albedo = blendStipple(color, stippleAlpha);`),V&&(P.uniforms.add(new _(`falloff`,e=>e.falloff)),P.main.add(v`albedo.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),P.main.add(v`albedo.a *= ${Y?`lineCoverage`:`lineFeatheringFactor(lineWidth, lineDistance)`};`),W&&(N.main.add(`vec4 animatedAlphaTimeStamps = ${Q.getTextureAttribute(`timeStamps`)};`),A.include(C,k),P.main.add(`albedo.a *= animatedAlpha();`)),L?(A.include(te,k),N.main.add(v`forwardLocalUp(position, localOrigin);`),N.main.add(`forwardLinearDepthToReadShadow();`),A.include(a,k),P.include(ee,k),P.include(n,k),P.uniforms.add(ne).main.add(v`vec3 normal = normalize(upNormal);
 float additionalAmbientScale = additionalDirectedAmbientLight(normal);
 float shadow = readFragmentShadow(additionalAmbientScale);
 float ssao = evaluateAmbientOcclusionInverse();
@@ -435,4 +438,4 @@ vec3 viewDirection = normalize((inverseViewMatrix * vec4(vpos, 0.0)).xyz);
 vec4 finalColor = vec4(
 evaluateSceneLighting(normal, albedo.rgb, shadow, 1.0 - ssao, additionalLight,viewDirection, normal),
 albedo.a
-);`)):N.main.add(`vec4 finalColor = albedo;`)),N.main.add(x`outputColorHighlightOLID(applySlice(finalColor, vpos), albedo.rgb);`),k}const A=Object.freeze(Object.defineProperty({__proto__:null,build:k,numRoundJoinSubdivisions:1},Symbol.toStringTag,{value:`Module`}));export{A as R,k as b,O as n};
+);`)):P.main.add(`vec4 finalColor = albedo;`)),P.main.add(v`outputColorHighlightOLID(applySlice(finalColor, vpos), albedo.rgb);`),A}const j=Object.freeze(Object.defineProperty({__proto__:null,build:A,numRoundJoinSubdivisions:1},Symbol.toStringTag,{value:`Module`}));export{j as R,A as b,k as n};

package/config.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import"./core/has.js";import{deepMerge as e}from"./core/object.js";const t={apiKey:void 0,apiKeys:{scopes:[]},applicationName:``,applicationUrl:globalThis.location?.href,assetsPath:``,fontsUrl:`https://static.arcgis.com/fonts`,geometryServiceUrl:`https://utility.arcgisonline.com/arcgis/rest/services/Geometry/GeometryServer`,geoRSSServiceUrl:`https://utility.arcgis.com/sharing/rss`,kmlServiceUrl:`https://utility.arcgis.com/sharing/kml`,userPrivilegesApplied:!0,portalUrl:`https://www.arcgis.com`,respectPrefersReducedMotion:!0,routeServiceUrl:`https://route-api.arcgis.com/arcgis/rest/services/World/Route/NAServer/Route_World`,workers:{loaderConfig:{has:{},paths:{},map:{},packages:[]}},request:{crossOriginNoCorsDomains:null,httpsDomains:[`arcgis.com`,`arcgisonline.com`,`esrikr.com`,`premiumservices.blackbridge.com`,`esripremium.accuweather.com`,`gbm.digitalglobe.com`,`firstlook.digitalglobe.com`,`msi.digitalglobe.com`],interceptors:[],internalInterceptors:[],maxUrlLength:2e3,priority:`high`,proxyRules:[],proxyUrl:null,timeout:62e3,trustedServers:[],useIdentity:!0},log:{interceptors:[],level:null}};globalThis.esriConfig&&(e(t,globalThis.esriConfig,!0),delete t.has),t.assetsPath||(t.assetsPath=`https://cdn.jsdelivr.net/npm/@arcgis/core@6.0.0-next.29/assets`,t.defaultAssetsPath=t.assetsPath);export{t as default};
+import"./core/has.js";import{deepMerge as e}from"./core/object.js";const t={apiKey:void 0,apiKeys:{scopes:[]},applicationName:``,applicationUrl:globalThis.location?.href,assetsPath:``,fontsUrl:`https://static.arcgis.com/fonts`,geometryServiceUrl:`https://utility.arcgisonline.com/arcgis/rest/services/Geometry/GeometryServer`,geoRSSServiceUrl:`https://utility.arcgis.com/sharing/rss`,kmlServiceUrl:`https://utility.arcgis.com/sharing/kml`,userPrivilegesApplied:!0,portalUrl:`https://www.arcgis.com`,respectPrefersReducedMotion:!0,routeServiceUrl:`https://route-api.arcgis.com/arcgis/rest/services/World/Route/NAServer/Route_World`,workers:{loaderConfig:{has:{},paths:{},map:{},packages:[]}},request:{crossOriginNoCorsDomains:null,httpsDomains:[`arcgis.com`,`arcgisonline.com`,`esrikr.com`,`premiumservices.blackbridge.com`,`esripremium.accuweather.com`,`gbm.digitalglobe.com`,`firstlook.digitalglobe.com`,`msi.digitalglobe.com`],interceptors:[],internalInterceptors:[],maxUrlLength:2e3,priority:`high`,proxyRules:[],proxyUrl:null,timeout:62e3,trustedServers:[],useIdentity:!0},log:{interceptors:[],level:null}};globalThis.esriConfig&&(e(t,globalThis.esriConfig,!0),delete t.has),t.assetsPath||(t.assetsPath=`https://cdn.jsdelivr.net/npm/@arcgis/core@6.0.0-next.30/assets`,t.defaultAssetsPath=t.assetsPath);export{t as default};

package/core/workers/WorkerHandle.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{remove as e}from"../arrayUtils.js";import t from"../Handles.js";import{makeHandle as n}from"../handleUtils.js";import r from"../Logger.js";import{removeMaybe as i}from"../maybe.js";import{throwIfAborted as a,createAbortError as o}from"../promiseUtils.js";import{open as s}from"../workers.js";class c{constructor(e,t,n,i,a={}){this._mainMethod=t,this._transferLists=n,this._listeners=[],this._onClientConnectedHandle=null,this._destroyed=!1,this._promise=s(e,{...a,schedule:i}).then(e=>{this._thread==null&&!this._destroyed?(this._thread=e,this._promise=null,this._onClientConnectedHandle=this._thread.onClientConnected(e=>{a.hasInitialize&&e.invoke(`initialize`,{}).catch(()=>{});for(let t of this._listeners)this._connectListenerToClient(t,e);this._onClientConnected(e)})):e.close()}),this._promise.catch(t=>r.getLogger(`esri.core.workers.WorkerHandle`).error(`Failed to initialize ${e} worker: ${t}`))}on(t,r){let i=new l(t,r);return this._listeners.push(i),this._connectListener(i),n(()=>{e(this._listeners,i),i.destroy()})}[Symbol.dispose](){this.destroy()}destroy(){this._onClientConnectedHandle=i(this._onClientConnectedHandle),this._thread&&=(this._thread.close(),null),this._promise=null;for(let e of this._listeners)e.destroy();this._listeners.length=0,this._transferLists={},this._destroyed=!0}invoke(e,t,n){return this.invokeMethod(this._mainMethod,e,t,n)}invokeMethod(e,t,n,r){if(this._thread){let i=this._transferLists[e],a=i?i(t):[];return this._thread.invoke(e,t,{transferList:a,signal:n,jobPriority:r})}return this._promise?this._promise.then(()=>(a(n),this.invokeMethod(e,t,n))):Promise.reject(o())}broadcast(e,t){return this._thread?Promise.all(this._thread.broadcast(t,e)).then(u):this._promise?this._promise.then(()=>this.broadcast(e,t)):Promise.reject(o())}get promise(){return this._promise}_onClientConnected(e){}_connectListener(e){this._thread&&e.add(this._thread.on(e.eventName,e.callback))}_connectListenerToClient(e,t){e.add(t.on(e.eventName,e.callback))}}class l{constructor(e,n){this.eventName=e,this.callback=n,this._handles=new t}add(e){this._handles.add(e)}destroy(){this._handles.destroy()}}function u(){}export{c as WorkerHandle};
+import{remove as e}from"../arrayUtils.js";import t from"../Handles.js";import{makeHandle as n}from"../handleUtils.js";import r from"../Logger.js";import{removeMaybe as i}from"../maybe.js";import{throwIfAborted as a,createAbortError as o}from"../promiseUtils.js";import{open as s}from"../workers.js";class c{constructor(e,t,n,i,a={}){this._mainMethod=t,this._transferLists=n,this._listeners=[],this._onClientConnectedHandle=null,this._destroyed=!1,this._promise=s(e,{...a,schedule:i}).then(e=>{this._thread==null&&!this._destroyed?(this._thread=e,this._promise=null,this._onClientConnectedHandle=this._thread.onClientConnected(e=>{a.hasInitialize&&e.invoke(`initialize`,{}).catch(()=>{});for(let t of this._listeners)this._connectListenerToClient(t,e);this._onClientConnected(e)})):e.close()}),this._promise.catch(t=>r.getLogger(`esri.core.workers.WorkerHandle`).error(`Failed to initialize ${e} worker: ${t}`))}on(t,r){let i=new l(t,r);return this._listeners.push(i),this._connectListener(i),n(()=>{e(this._listeners,i),i.destroy()})}[Symbol.dispose](){this.destroy()}destroy(){this._onClientConnectedHandle=i(this._onClientConnectedHandle),this._thread&&=(this._thread.close(),null),this._promise=null;for(let e of this._listeners)e.destroy();this._listeners.length=0,this._transferLists={},this._destroyed=!0}invoke(e,t,n){return this.invokeMethod(this._mainMethod,e,t,n)}invokeMethod(e,t,n,r){return this._invokeMethod(e,[t],n,r)}invokeMethodWithArgs(e,t,n,r){return this._invokeMethod(e,t,n,r)}_invokeMethod(e,t,n,r){if(this._thread){let i=this._transferLists[e],a=i?i(...t):[];return this._thread.apply(e,t,{transferList:a,signal:n,jobPriority:r})}return this._promise?this._promise.then(()=>(a(n),this._invokeMethod(e,t,n,r))):Promise.reject(o())}broadcast(e,t){return this._thread?Promise.all(this._thread.broadcast(t,e)).then(u):this._promise?this._promise.then(()=>this.broadcast(e,t)):Promise.reject(o())}get promise(){return this._promise}_onClientConnected(e){}_connectListener(e){this._thread&&e.add(this._thread.on(e.eventName,e.callback))}_connectListenerToClient(e,t){e.add(t.on(e.eventName,e.callback))}}class l{constructor(e,n){this.eventName=e,this.callback=n,this._handles=new t}add(e){this._handles.add(e)}destroy(){this._handles.destroy()}}function u(){}export{c as WorkerHandle};

package/kernel.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import"./core/has.js";import{addQueryParameter as e}from"./core/urlUtils.js";Symbol.dispose??=Symbol(`Symbol.dispose`),Symbol.asyncDispose??=Symbol(`Symbol.asyncDispose`);const t=`5.2`;let n=`5.2`;n=`6.0.0-next.29`;let r;function i(e){r=e}function a(t){let n=r?.findCredential(t);return n?.token?e(t,`token`,n.token):t}globalThis.$arcgis||Object.defineProperty(globalThis,"$arcgis",{configurable:!1,enumerable:!0,writable:!1,value:{}});export{a as addTokenParameter,n as fullVersion,r as id,i as setId,t as version};
+import"./core/has.js";import{addQueryParameter as e}from"./core/urlUtils.js";Symbol.dispose??=Symbol(`Symbol.dispose`),Symbol.asyncDispose??=Symbol(`Symbol.asyncDispose`);const t=`5.2`;let n=`5.2`;n=`6.0.0-next.30`;let r;function i(e){r=e}function a(t){let n=r?.findCredential(t);return n?.token?e(t,`token`,n.token):t}globalThis.$arcgis||Object.defineProperty(globalThis,"$arcgis",{configurable:!1,enumerable:!0,writable:!1,value:{}});export{a as addTokenParameter,n as fullVersion,r as id,i as setId,t as version};

package/layers/WMTSLayer.d.ts

@@ -97,7 +97,7 @@ export default class WMTSLayer extends WMTSLayerSuperclass {
    * @returns Resolves to an image element with the tile data.
    * @since 4.27
    */
-  fetchTile(level: number, row: number, col: number, options?: AbortOptions): Promise<HTMLImageElement>;
+  fetchTile(level: number, row: number, col: number, options?: AbortOptions & { tileMatrixSetId?: string; }): Promise<HTMLImageElement>;
   /**
    * Returns a [WMTSSublayer](https://developers.arcgis.com/javascript/latest/references/core/layers/support/WMTSSublayer/) based on the given sublayer id.
    *

package/layers/WMTSLayer.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{__decorate as e}from"tslib";import t from"../request.js";import{isSome as n}from"../core/arrayUtils.js";import r from"../core/Collection.js";import i from"../core/Error.js";import{clone as a}from"../core/lang.js";import{MultiOriginJSONSupportMixin as o}from"../core/MultiOriginJSONSupport.js";import{throwIfAbortError as s}from"../core/promiseUtils.js";import{watch as c,sync as l,on as u}from"../core/reactiveUtils.js";import{urlToObject as d,objectToQuery as f}from"../core/urlUtils.js";import{property as p,subclass as m}from"../core/accessorSupport/decorators.js";import h from"../geometry/Extent.js";import g from"./Layer.js";import _ from"./WebTileLayer.js";import{BlendLayer as v}from"./mixins/BlendLayer.js";import{OperationalLayer as y}from"./mixins/OperationalLayer.js";import{PortalLayer as b}from"./mixins/PortalLayer.js";import{RefreshableLayer as x}from"./mixins/RefreshableLayer.js";import{ScaleRangeLayer as S}from"./mixins/ScaleRangeLayer.js";import{createTileBitmap as C}from"./support/imageBitmapUtils.js";import w from"./support/TileInfo.js";import T from"./support/TileInfoTilemapCache.js";import{WMTSLayerInfo as E}from"./support/WMTSLayerInfo.js";import D from"./support/WMTSSublayer.js";import{getTileUrlFromResourceUrls as O,getTileUrlTemplateFromResourceUrls as k,parseResourceInfo as A,parseText as j,validateCapabilities as M,parseCapabilities as N}from"./support/wmtsUtils.js";import{reader as P}from"../core/accessorSupport/decorators/reader.js";import{writer as F}from"../core/accessorSupport/decorators/writer.js";var I;const L={"image/png":`.png`,"image/png8":`.png`,"image/png24":`.png`,"image/png32":`.png`,"image/jpg":`.jpg`,"image/jpeg":`.jpeg`,"image/gif":`.gif`,"image/bmp":`.bmp`,"image/tiff":`.tif`,"image/jpgpng":``,"image/jpegpng":``,"image/unknown":``},R=new Set([`version`,`service`,`request`,`layer`,`style`,`format`,`tilematrixset`,`tilematrix`,`tilerow`,`tilecol`]);let z=I=class extends v(x(S(y(b(o(g)))))){constructor(...e){super(...e),this.activeLayer=null,this.copyright=``,this.customParameters=null,this.customLayerParameters=null,this.fullExtent=null,this.operationalLayerType=`WebTiledLayer`,this.resourceInfo=null,this.serviceMode=`RESTful`,this.sublayers=null,this.type=`wmts`,this.version=`1.0.0`,this.addHandles([c(()=>this.activeLayer,(e,t)=>{t&&!this.sublayers?.includes(t)&&(t.layer=null,t.parent=null),e&&(e.layer=this,e.parent=this)},l),u(()=>this.sublayers,`after-add`,({item:e})=>{e.layer=this,e.parent=this},l),u(()=>this.sublayers,`after-remove`,({item:e})=>{e.layer=null,e.parent=null},l),c(()=>this.sublayers,(e,t)=>{if(t)for(let e of t)e.layer=null,e.parent=null;if(e)for(let t of e)t.layer=this,t.parent=this},l)])}normalizeCtorArgs(e,t){return typeof e==`string`?{url:e,...t}:e}load(e){return this.addResolvingPromise(this.loadFromPortal({supportedTypes:[`WMTS`]},e).catch(s).then(()=>this._fetchService(e)).catch(e=>{throw s(e),new i(`wmtslayer:unsupported-service-data`,`Invalid response from the WMTS service.`,{error:e})})),Promise.resolve(this)}readActiveLayerFromService(e,t,n){this.activeLayer||=new D;let r=t.layers.find(e=>e.id===this.activeLayer.id);return r||=t.layers[0],this.activeLayer.read(r,n),this.activeLayer}readActiveLayerFromItemOrWebDoc(e,t){let{templateUrl:n,wmtsInfo:r}=t,i=n?this._getLowerCasedUrlParams(n):null,a=r?.layerIdentifier,o=null,s=r?.tileMatrixSet;s&&(Array.isArray(s)?s.length&&(o=s[0]):o=s);let c=i?.format,l=i?.style;return new D({id:a,imageFormat:c,styleId:l,tileMatrixSetId:o})}writeActiveLayer(e,t,n,r){let{activeLayer:i,loaded:a}=this,{id:o,tileMatrixSet:s,tileMatrixSetId:c,imageFormat:l,styleId:u}=i;t.templateUrl=a?this.getUrlTemplate(o,c,l,u):void 0,t.tileInfo=a?s?.tileInfo?.toJSON(r)??null:void 0,t.wmtsInfo={...t.wmtsInfo,layerIdentifier:o,tileMatrixSet:c}}readCustomParameters(e,t){let n=t.wmtsInfo;return n?this._mergeParams(n.customParameters,n.url):null}get fullExtents(){return this.activeLayer.fullExtents}readServiceMode(e,t){return t.templateUrl.includes(`?`)?`KVP`:`RESTful`}readSublayersFromService(e,t,n){return B(t.layers,n)}get supportedSpatialReferences(){return this.activeLayer.tileMatrixSets?.map(e=>e.tileInfo?.spatialReference).toArray().filter(n)??[]}get tilemapCache(){let e=this.activeLayer?.tileMatrixSet?.tileInfo;return e?new T(e):void 0}get title(){return this.activeLayer?.title??`Layer`}set title(e){this._overrideIfSome(`title`,e)}get url(){return this._get(`url`)}set url(e){e&&e.endsWith(`/`)?this._set(`url`,e.slice(0,-1)):this._set(`url`,e)}createWebTileLayer(e){let t=this.getUrlTemplate(this.activeLayer.id,this.activeLayer.tileMatrixSetId,this.activeLayer.imageFormat,this.activeLayer.styleId),n=this._getTileMatrixSetById(e.tileMatrixSetId)?.tileInfo,r=e.fullExtent,i=new E({layerIdentifier:e.id,tileMatrixSet:e.tileMatrixSetId,url:this.url});return this.customLayerParameters&&(i.customLayerParameters=this.customLayerParameters),this.customParameters&&(i.customParameters=this.customParameters),new _({fullExtent:r,urlTemplate:t,tileInfo:n,wmtsInfo:i})}async fetchTile(e,n,r,i={}){let{signal:a}=i,o=this.getTileUrl(e,n,r),{data:s}=await t(o,{responseType:`image`,signal:a});return s}async fetchImageBitmapTile(e,n,r,i={}){let{signal:a}=i;if(this.fetchTile!==I.prototype.fetchTile){let t=await this.fetchTile(e,n,r,i);return C(t,e,n,r,i)}let o=this.getTileUrl(e,n,r),{data:s}=await t(o,{responseType:`blob`,signal:a});return C(s,e,n,r,i)}findSublayerById(e){return this.sublayers?.find(t=>t.id===e)}getTileUrl(e,t,n){let r=this._getTileMatrixSetById(this.activeLayer.tileMatrixSetId)?.tileInfo?.lods[e],i=r?r.levelValue||`${r.level}`:`${e}`,a=this.resourceInfo?``:O({dimensionMap:this.dimensionMap,layerMap:this.layerMap},this.activeLayer.id,this.activeLayer.tileMatrixSetId,this.activeLayer.imageFormat,this.activeLayer.styleId,i,t,n);return a||=this.getUrlTemplate(this.activeLayer.id,this.activeLayer.tileMatrixSetId,this.activeLayer.imageFormat,this.activeLayer.styleId).replaceAll(/\{level\}/gi,i).replaceAll(/\{row\}/gi,`${t}`).replaceAll(/\{col\}/gi,`${n}`),a=this._appendCustomLayerParameters(a),a}getUrlTemplate(e,t,n,r){if(!this.resourceInfo){let n=k({dimensionMap:this.dimensionMap,layerMap:this.layerMap},e,t,r);if(n)return n}if(this.serviceMode===`KVP`)return this.url+`?SERVICE=WMTS&VERSION=`+this.version+`&REQUEST=GetTile&LAYER=`+e+`&STYLE=`+r+`&FORMAT=`+n+`&TILEMATRIXSET=`+t+`&TILEMATRIX={level}&TILEROW={row}&TILECOL={col}`;if(this.serviceMode===`RESTful`){let i=``,a=n.toLowerCase();return L[a]&&(i=L[a]),this.url+e+`/`+r+`/`+t+`/{level}/{row}/{col}`+i}return``}async _fetchService(e){if(this.resourceInfo){this.resourceInfo.serviceMode===`KVP`&&!this.url.includes(`?`)&&(this.url+=`?`),A(this.resourceInfo),this.read(this.resourceInfo,{origin:`service`});return}let t=null;try{let{data:n}=await this._getCapabilities(this.serviceMode,e);t=j(n),M(t)}catch{let n=this.serviceMode===`KVP`?`RESTful`:`KVP`;try{let{data:r}=await this._getCapabilities(n,e);t=j(r),M(t),this.serviceMode=n}catch(e){throw new i(`wmtslayer:unsupported-service-data`,`Services does not support RESTful or KVP service modes.`,{error:e})}}let{serviceMode:n,url:r}=this,a=N(t,{serviceMode:n,url:r});this.read(a,{origin:`service`})}async _getCapabilities(e,n){let r=this._getCapabilitiesUrl(e);return await t(r,{...n,responseType:`text`})}_getTileMatrixSetById(e){return this.findSublayerById(this.activeLayer.id)?.tileMatrixSets?.find(({id:t})=>t===e)}_appendCustomParameters(e){return this._appendParameters(e,this.customParameters)}_appendCustomLayerParameters(e){return this._appendParameters(e,{...a(this.customParameters),...this.customLayerParameters})}_appendParameters(e,t){let n=d(e),r={...n.query,...t},i=f(r);return i===``?n.path:`${n.path}?${i}`}_getCapabilitiesUrl(e){this.url=d(this.url).path;let t=this.url;switch(e){case`KVP`:t+=`?request=GetCapabilities&service=WMTS&version=${this.version}`;break;case`RESTful`:{let e=`/${this.version}/WMTSCapabilities.xml`,n=new RegExp(e,`i`);t=t.replace(n,``),t+=e;break}}return this._appendCustomParameters(t)}_getLowerCasedUrlParams(e){if(!e)return null;let t=d(e).query;if(!t)return null;let n={};return Object.keys(t).forEach(e=>{n[e.toLowerCase()]=t[e]}),n}_mergeParams(e,t){let n=this._getLowerCasedUrlParams(t);if(n){let t=Object.keys(n);t.length&&(e=e?a(e):{},t.forEach(t=>{!e.hasOwnProperty(t)&&!R.has(t)&&(e[t]=n[t])}))}return e}};e([p()],z.prototype,`dimensionMap`,void 0),e([p()],z.prototype,`layerMap`,void 0),e([p({type:D,json:{origins:{"web-document":{write:{ignoreOrigin:!0}}}}})],z.prototype,`activeLayer`,void 0),e([P(`service`,`activeLayer`,[`layers`])],z.prototype,`readActiveLayerFromService`,null),e([P([`web-document`,`portal-item`],`activeLayer`,[`wmtsInfo`])],z.prototype,`readActiveLayerFromItemOrWebDoc`,null),e([F([`web-document`,`portal-item`],`activeLayer`,{templateUrl:{type:String},tileInfo:{type:w},"wmtsInfo.layerIdentifier":{type:String},"wmtsInfo.tileMatrixSet":{type:String}})],z.prototype,`writeActiveLayer`,null),e([p({type:String,value:``,json:{write:!0}})],z.prototype,`copyright`,void 0),e([p({type:[`show`,`hide`]})],z.prototype,`listMode`,void 0),e([p({json:{read:!0,write:!0}})],z.prototype,`blendMode`,void 0),e([p({json:{origins:{"web-document":{read:{source:[`wmtsInfo.customParameters`,`wmtsInfo.url`]},write:{target:`wmtsInfo.customParameters`}},"portal-item":{read:{source:[`wmtsInfo.customParameters`,`wmtsInfo.url`]},write:{target:`wmtsInfo.customParameters`}}}}})],z.prototype,`customParameters`,void 0),e([P([`portal-item`,`web-document`],`customParameters`)],z.prototype,`readCustomParameters`,null),e([p({json:{origins:{"web-document":{read:{source:`wmtsInfo.customLayerParameters`},write:{target:`wmtsInfo.customLayerParameters`}},"portal-item":{read:{source:`wmtsInfo.customLayerParameters`},write:{target:`wmtsInfo.customLayerParameters`}}}}})],z.prototype,`customLayerParameters`,void 0),e([p({type:h,json:{write:{ignoreOrigin:!0},origins:{"web-document":{read:{source:`fullExtent`}},"portal-item":{read:{source:`fullExtent`}}}}})],z.prototype,`fullExtent`,void 0),e([p({readOnly:!0})],z.prototype,`fullExtents`,null),e([p({type:[`WebTiledLayer`]})],z.prototype,`operationalLayerType`,void 0),e([p()],z.prototype,`resourceInfo`,void 0),e([p()],z.prototype,`serviceMode`,void 0),e([P([`portal-item`,`web-document`],`serviceMode`,[`templateUrl`])],z.prototype,`readServiceMode`,null),e([p({type:r.ofType(D)})],z.prototype,`sublayers`,void 0),e([P(`service`,`sublayers`,[`layers`])],z.prototype,`readSublayersFromService`,null),e([p({readOnly:!0})],z.prototype,`supportedSpatialReferences`,null),e([p({readOnly:!0})],z.prototype,`tilemapCache`,null),e([p({json:{read:{source:`title`}}})],z.prototype,`title`,null),e([p({json:{read:!1},readOnly:!0,value:`wmts`})],z.prototype,`type`,void 0),e([p({json:{origins:{service:{read:{source:`tileUrl`}},"web-document":{read:{source:`wmtsInfo.url`},write:{target:`wmtsInfo.url`}},"portal-item":{read:{source:`wmtsInfo.url`},write:{target:`wmtsInfo.url`}}}}})],z.prototype,`url`,null),e([p()],z.prototype,`version`,void 0),z=I=e([m(`esri.layers.WMTSLayer`)],z);function B(e,t){return e.map(e=>{let n=new D;return n.read(e,t),n})}const V=z;export{V as default};
+import{__decorate as e}from"tslib";import t from"../request.js";import{isSome as n}from"../core/arrayUtils.js";import r from"../core/Collection.js";import i from"../core/Error.js";import{clone as a}from"../core/lang.js";import{MultiOriginJSONSupportMixin as o}from"../core/MultiOriginJSONSupport.js";import{throwIfAbortError as s}from"../core/promiseUtils.js";import{watch as c,sync as l,on as u}from"../core/reactiveUtils.js";import{urlToObject as d,objectToQuery as f}from"../core/urlUtils.js";import{property as p,subclass as m}from"../core/accessorSupport/decorators.js";import h from"../geometry/Extent.js";import g from"./Layer.js";import _ from"./WebTileLayer.js";import{BlendLayer as v}from"./mixins/BlendLayer.js";import{OperationalLayer as y}from"./mixins/OperationalLayer.js";import{PortalLayer as b}from"./mixins/PortalLayer.js";import{RefreshableLayer as x}from"./mixins/RefreshableLayer.js";import{ScaleRangeLayer as S}from"./mixins/ScaleRangeLayer.js";import{createTileBitmap as C}from"./support/imageBitmapUtils.js";import w from"./support/TileInfo.js";import T from"./support/TileInfoTilemapCache.js";import{WMTSLayerInfo as E}from"./support/WMTSLayerInfo.js";import D from"./support/WMTSSublayer.js";import{getTileUrlFromResourceUrls as O,getTileUrlTemplateFromResourceUrls as k,parseResourceInfo as A,parseText as j,validateCapabilities as M,parseCapabilities as N}from"./support/wmtsUtils.js";import{reader as P}from"../core/accessorSupport/decorators/reader.js";import{writer as F}from"../core/accessorSupport/decorators/writer.js";var I;const L={"image/png":`.png`,"image/png8":`.png`,"image/png24":`.png`,"image/png32":`.png`,"image/jpg":`.jpg`,"image/jpeg":`.jpeg`,"image/gif":`.gif`,"image/bmp":`.bmp`,"image/tiff":`.tif`,"image/jpgpng":``,"image/jpegpng":``,"image/unknown":``},R=new Set([`version`,`service`,`request`,`layer`,`style`,`format`,`tilematrixset`,`tilematrix`,`tilerow`,`tilecol`]);let z=I=class extends v(x(S(y(b(o(g)))))){constructor(...e){super(...e),this.activeLayer=null,this.copyright=``,this.customParameters=null,this.customLayerParameters=null,this.operationalLayerType=`WebTiledLayer`,this.resourceInfo=null,this.serviceMode=`RESTful`,this.sublayers=null,this.type=`wmts`,this.version=`1.0.0`,this.addHandles([c(()=>this.activeLayer,(e,t)=>{t&&!this.sublayers?.includes(t)&&(t.layer=null,t.parent=null),e&&(e.layer=this,e.parent=this)},l),u(()=>this.sublayers,`after-add`,({item:e})=>{e.layer=this,e.parent=this},l),u(()=>this.sublayers,`after-remove`,({item:e})=>{e.layer=null,e.parent=null},l),c(()=>this.sublayers,(e,t)=>{if(t)for(let e of t)e.layer=null,e.parent=null;if(e)for(let t of e)t.layer=this,t.parent=this},l)])}normalizeCtorArgs(e,t){return typeof e==`string`?{url:e,...t}:e}load(e){return this.addResolvingPromise(this.loadFromPortal({supportedTypes:[`WMTS`]},e).catch(s).then(()=>this._fetchService(e)).catch(e=>{throw s(e),new i(`wmtslayer:unsupported-service-data`,`Invalid response from the WMTS service.`,{error:e})})),Promise.resolve(this)}readActiveLayerFromService(e,t,n){this.activeLayer||=new D;let r=t.layers.find(e=>e.id===this.activeLayer.id);return r||=t.layers[0],this.activeLayer.read(r,n),this.activeLayer}readActiveLayerFromItemOrWebDoc(e,t){let{templateUrl:n,wmtsInfo:r}=t,i=n?this._getLowerCasedUrlParams(n):null,a=r?.layerIdentifier,o=null,s=r?.tileMatrixSet;s&&(Array.isArray(s)?s.length&&(o=s[0]):o=s);let c=i?.format,l=i?.style;return new D({id:a,imageFormat:c,styleId:l,tileMatrixSetId:o})}writeActiveLayer(e,t,n,r){let{activeLayer:i,loaded:a}=this,{id:o,tileMatrixSet:s,tileMatrixSetId:c,imageFormat:l,styleId:u}=i;t.templateUrl=a?this.getUrlTemplate(o,c,l,u):void 0,t.tileInfo=a?s?.tileInfo?.toJSON(r)??null:void 0,t.wmtsInfo={...t.wmtsInfo,layerIdentifier:o,tileMatrixSet:c}}readCustomParameters(e,t){let n=t.wmtsInfo;return n?this._mergeParams(n.customParameters,n.url):null}get fullExtent(){return this.fullExtents?.[0]}set fullExtent(e){this._override(`fullExtent`,e)}get fullExtents(){return this.activeLayer?.fullExtents}readServiceMode(e,t){return t.templateUrl.includes(`?`)?`KVP`:`RESTful`}readSublayersFromService(e,t,n){return B(t.layers,n)}get supportedSpatialReferences(){return this.activeLayer.tileMatrixSets?.map(e=>e.tileInfo?.spatialReference).toArray().filter(n)??[]}get tilemapCache(){let e=this.activeLayer?.tileMatrixSet?.tileInfo;return e?new T(e):void 0}get title(){return this.activeLayer?.title??`Layer`}set title(e){this._overrideIfSome(`title`,e)}get url(){return this._get(`url`)}set url(e){e&&e.endsWith(`/`)?this._set(`url`,e.slice(0,-1)):this._set(`url`,e)}createWebTileLayer(e){let t=this.getUrlTemplate(this.activeLayer.id,this.activeLayer.tileMatrixSetId,this.activeLayer.imageFormat,this.activeLayer.styleId),n=this._getTileMatrixSetById(e.tileMatrixSetId)?.tileInfo,r=e.fullExtent,i=new E({layerIdentifier:e.id,tileMatrixSet:e.tileMatrixSetId,url:this.url});return this.customLayerParameters&&(i.customLayerParameters=this.customLayerParameters),this.customParameters&&(i.customParameters=this.customParameters),new _({fullExtent:r,urlTemplate:t,tileInfo:n,wmtsInfo:i})}async fetchTile(e,n,r,i={}){let{signal:a}=i,o=this.getTileUrl(e,n,r,i.tileMatrixSetId),{data:s}=await t(o,{responseType:`image`,signal:a});return s}async fetchImageBitmapTile(e,n,r,i={}){let{signal:a}=i;if(this.fetchTile!==I.prototype.fetchTile){let t=await this.fetchTile(e,n,r,i);return C(t,e,n,r,i)}let o=this.getTileUrl(e,n,r,i.tileMatrixSetId),{data:s}=await t(o,{responseType:`blob`,signal:a});return C(s,e,n,r,i)}findSublayerById(e){return this.sublayers?.find(t=>t.id===e)}getTileUrl(e,t,n,r=this.activeLayer.tileMatrixSetId){let i=this._getTileMatrixSetById(r)?.tileInfo?.lods[e],a=i?i.levelValue||`${i.level}`:`${e}`,o=this.resourceInfo?``:O({dimensionMap:this.dimensionMap,layerMap:this.layerMap},this.activeLayer.id,r,this.activeLayer.imageFormat,this.activeLayer.styleId,a,t,n);return o||=this.getUrlTemplate(this.activeLayer.id,r,this.activeLayer.imageFormat,this.activeLayer.styleId).replaceAll(/\{level\}/gi,a).replaceAll(/\{row\}/gi,`${t}`).replaceAll(/\{col\}/gi,`${n}`),o=this._appendCustomLayerParameters(o),o}updateFrom(e){let{tileMatrixSet:t}=e;t&&(this.activeLayer.tileMatrixSetId=t.id,this.fullExtent=t.fullExtent?.clone()??null)}getUrlTemplate(e,t,n,r){if(!this.resourceInfo){let n=k({dimensionMap:this.dimensionMap,layerMap:this.layerMap},e,t,r);if(n)return n}if(this.serviceMode===`KVP`)return this.url+`?SERVICE=WMTS&VERSION=`+this.version+`&REQUEST=GetTile&LAYER=`+e+`&STYLE=`+r+`&FORMAT=`+n+`&TILEMATRIXSET=`+t+`&TILEMATRIX={level}&TILEROW={row}&TILECOL={col}`;if(this.serviceMode===`RESTful`){let i=``,a=n.toLowerCase();return L[a]&&(i=L[a]),this.url+e+`/`+r+`/`+t+`/{level}/{row}/{col}`+i}return``}async _fetchService(e){if(this.resourceInfo){this.resourceInfo.serviceMode===`KVP`&&!this.url.includes(`?`)&&(this.url+=`?`),A(this.resourceInfo),this.read(this.resourceInfo,{origin:`service`});return}let t=null;try{let{data:n}=await this._getCapabilities(this.serviceMode,e);t=j(n),M(t)}catch{let n=this.serviceMode===`KVP`?`RESTful`:`KVP`;try{let{data:r}=await this._getCapabilities(n,e);t=j(r),M(t),this.serviceMode=n}catch(e){throw new i(`wmtslayer:unsupported-service-data`,`Services does not support RESTful or KVP service modes.`,{error:e})}}let{serviceMode:n,url:r}=this,a=N(t,{serviceMode:n,url:r});this.read(a,{origin:`service`})}async _getCapabilities(e,n){let r=this._getCapabilitiesUrl(e);return await t(r,{...n,responseType:`text`})}_getTileMatrixSetById(e){return this.findSublayerById(this.activeLayer.id)?.tileMatrixSets?.find(({id:t})=>t===e)}_appendCustomParameters(e){return this._appendParameters(e,this.customParameters)}_appendCustomLayerParameters(e){return this._appendParameters(e,{...a(this.customParameters),...this.customLayerParameters})}_appendParameters(e,t){let n=d(e),r={...n.query,...t},i=f(r);return i===``?n.path:`${n.path}?${i}`}_getCapabilitiesUrl(e){this.url=d(this.url).path;let t=this.url;switch(e){case`KVP`:t+=`?request=GetCapabilities&service=WMTS&version=${this.version}`;break;case`RESTful`:{let e=`/${this.version}/WMTSCapabilities.xml`,n=new RegExp(e,`i`);t=t.replace(n,``),t+=e;break}}return this._appendCustomParameters(t)}_getLowerCasedUrlParams(e){if(!e)return null;let t=d(e).query;if(!t)return null;let n={};return Object.keys(t).forEach(e=>{n[e.toLowerCase()]=t[e]}),n}_mergeParams(e,t){let n=this._getLowerCasedUrlParams(t);if(n){let t=Object.keys(n);t.length&&(e=e?a(e):{},t.forEach(t=>{!e.hasOwnProperty(t)&&!R.has(t)&&(e[t]=n[t])}))}return e}};e([p()],z.prototype,`dimensionMap`,void 0),e([p()],z.prototype,`layerMap`,void 0),e([p({type:D,json:{origins:{"web-document":{write:{ignoreOrigin:!0}}}}})],z.prototype,`activeLayer`,void 0),e([P(`service`,`activeLayer`,[`layers`])],z.prototype,`readActiveLayerFromService`,null),e([P([`web-document`,`portal-item`],`activeLayer`,[`wmtsInfo`])],z.prototype,`readActiveLayerFromItemOrWebDoc`,null),e([F([`web-document`,`portal-item`],`activeLayer`,{templateUrl:{type:String},tileInfo:{type:w},"wmtsInfo.layerIdentifier":{type:String},"wmtsInfo.tileMatrixSet":{type:String}})],z.prototype,`writeActiveLayer`,null),e([p({type:String,value:``,json:{write:!0}})],z.prototype,`copyright`,void 0),e([p({type:[`show`,`hide`]})],z.prototype,`listMode`,void 0),e([p({json:{read:!0,write:!0}})],z.prototype,`blendMode`,void 0),e([p({json:{origins:{"web-document":{read:{source:[`wmtsInfo.customParameters`,`wmtsInfo.url`]},write:{target:`wmtsInfo.customParameters`}},"portal-item":{read:{source:[`wmtsInfo.customParameters`,`wmtsInfo.url`]},write:{target:`wmtsInfo.customParameters`}}}}})],z.prototype,`customParameters`,void 0),e([P([`portal-item`,`web-document`],`customParameters`)],z.prototype,`readCustomParameters`,null),e([p({json:{origins:{"web-document":{read:{source:`wmtsInfo.customLayerParameters`},write:{target:`wmtsInfo.customLayerParameters`}},"portal-item":{read:{source:`wmtsInfo.customLayerParameters`},write:{target:`wmtsInfo.customLayerParameters`}}}}})],z.prototype,`customLayerParameters`,void 0),e([p({type:h,json:{write:{ignoreOrigin:!0},origins:{"web-document":{read:{source:`fullExtent`}},"portal-item":{read:{source:`fullExtent`}}}}})],z.prototype,`fullExtent`,null),e([p({readOnly:!0})],z.prototype,`fullExtents`,null),e([p({type:[`WebTiledLayer`]})],z.prototype,`operationalLayerType`,void 0),e([p()],z.prototype,`resourceInfo`,void 0),e([p()],z.prototype,`serviceMode`,void 0),e([P([`portal-item`,`web-document`],`serviceMode`,[`templateUrl`])],z.prototype,`readServiceMode`,null),e([p({type:r.ofType(D)})],z.prototype,`sublayers`,void 0),e([P(`service`,`sublayers`,[`layers`])],z.prototype,`readSublayersFromService`,null),e([p({readOnly:!0})],z.prototype,`supportedSpatialReferences`,null),e([p({readOnly:!0})],z.prototype,`tilemapCache`,null),e([p({json:{read:{source:`title`}}})],z.prototype,`title`,null),e([p({json:{read:!1},readOnly:!0,value:`wmts`})],z.prototype,`type`,void 0),e([p({json:{origins:{service:{read:{source:`tileUrl`}},"web-document":{read:{source:`wmtsInfo.url`},write:{target:`wmtsInfo.url`}},"portal-item":{read:{source:`wmtsInfo.url`},write:{target:`wmtsInfo.url`}}}}})],z.prototype,`url`,null),e([p()],z.prototype,`version`,void 0),z=I=e([m(`esri.layers.WMTSLayer`)],z);function B(e,t){return e.map(e=>{let n=new D;return n.read(e,t),n})}const V=z;export{V as default};

package/layers/mixins/TiledImagery.d.ts

@@ -4,6 +4,7 @@ import type SpatialReference from "../../geometry/SpatialReference.js";
 import type DimensionalDefinition from "../support/DimensionalDefinition.js";
 import type MultidimensionalSubset from "../support/MultidimensionalSubset.js";
 import type RasterInfo from "../support/RasterInfo.js";
+import type TimeInfo from "../support/TimeInfo.js";
 import type ImageSampleParameters from "../../rest/support/ImageSampleParameters.js";
 import type ImageSampleResult from "../../rest/support/ImageSampleResult.js";
 import type TimeExtent from "../../time/TimeExtent.js";
@@ -272,6 +273,12 @@ export abstract class TiledImagery {
    * });
    */
   abstract accessor timeExtent: TimeExtent | null | undefined;
+  /**
+   * TimeInfo provides information such as date fields that store [start](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#startField)
+   * and [end](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#endField) time for each feature and the [TimeInfo.fullTimeExtent](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TimeInfo/#fullTimeExtent)
+   * for the layer.
+   */
+  abstract accessor timeInfo: TimeInfo | null | undefined;
   /**
    * A temporary offset of the time data based on a certain [TimeInterval](https://developers.arcgis.com/javascript/latest/references/core/time/TimeInterval/). This allows
    * users to overlay features from two or more time-aware layers with different time extents.

package/layers/support/WMTSSublayer.d.ts

@@ -64,15 +64,15 @@ export default class WMTSSublayer extends JSONSupport {
   get styles(): Collection<WMTSStyle> | null | undefined;
   set styles(value: ReadonlyArrayOrCollection<WMTSStyleProperties> | null | undefined);
   /**
-   * The [TileMatrixSet](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TileMatrixSet/) to request.
-   * Defaults to the first item in [tileMatrixSets](https://developers.arcgis.com/javascript/latest/references/core/layers/support/WMTSSublayer/#tileMatrixSet) that matches the spatialReference of the view.
-   * Must be one of the supported [tileMatrixSets](https://developers.arcgis.com/javascript/latest/references/core/layers/support/WMTSSublayer/#tileMatrixSet).
+   * The [TileMatrixSet](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TileMatrixSet/) identified by [tileMatrixSetId](https://developers.arcgis.com/javascript/latest/references/core/layers/support/WMTSSublayer/#tileMatrixSetId).
+   * A layer view may select a compatible tile matrix set without modifying this property.
    */
   get tileMatrixSet(): TileMatrixSet | null | undefined;
   /**
    * The id of the [TileMatrixSet](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TileMatrixSet/) to request.
-   * Defaults to the id of the first item in [tileMatrixSets](https://developers.arcgis.com/javascript/latest/references/core/layers/support/WMTSSublayer/#tileMatrixSet) that matches the spatialReference of the view.
-   * Must be one of the supported [tileMatrixSets](https://developers.arcgis.com/javascript/latest/references/core/layers/support/WMTSSublayer/#tileMatrixSet).
+   * Must be one of the supported [tileMatrixSets](https://developers.arcgis.com/javascript/latest/references/core/layers/support/WMTSSublayer/#tileMatrixSets).
+   * If not specified, each view selects a compatible tile matrix set without modifying this property.
+   * Use [WebMap.updateFrom()](https://developers.arcgis.com/javascript/latest/references/core/WebMap/#updateFrom) or [WebScene.updateFrom()](https://developers.arcgis.com/javascript/latest/references/core/WebScene/#updateFrom) to persist the view's selection.
    */
   accessor tileMatrixSetId: string;
   /** A collection of supported [TileMatrixSets](https://developers.arcgis.com/javascript/latest/references/core/layers/support/TileMatrixSet/). */