@arcgis/core 6.0.0-next.35 → 6.0.0-next.36

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 ee}from"../views/3d/webgl-engine/core/shaderLibrary/shading/forwardLocalUp.glsl.js";import{mainLightIntensity as te}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{LineStipple as ne,computePixelSize as re}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as ie}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{PiUtils as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{readFragmentShadow as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readFragmentShadow.glsl.js";import{metersPerRenderUnit as s,screenPixelSizePerDistance as c,inverseProjectionMatrix as l,nearFar as u,viewport as d,pixelRatio as f}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{ColorConversion as ae}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as p,NoPerspectiveRead as m}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{getPackedUint32Field as h}from"../views/3d/webgl-engine/core/shaderLibrary/util/PackedUint32.glsl.js";import{addProjViewLocalOrigin as g}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float4PassUniform as _}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as v}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as y,If as b}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{ribbonLineVertexInfoPacking as x,ribbonLineVertexTypePacking as S,ribbonSubdivisionScale as oe}from"../views/3d/webgl-engine/lib/RibbonLineVertexInfo.js";import{alphaCutoff as se}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:ce,useFlatJoinVarying:q}=k,J=z===2,Y=B&&J,X=V||Y,le=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`):y`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`):y`vec4(1.0)`),P.include(i),A.include(t,k),A.include(ne,k),R===11?(A.varyings.add(`objectAndLayerIdColorVarying`,`vec4`),N.code.add(y`
+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 ee}from"../views/3d/webgl-engine/core/shaderLibrary/shading/forwardLocalUp.glsl.js";import{mainLightIntensity as te}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{LineStipple as ne,computePixelSize as re}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as ie}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{PiUtils as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{readFragmentShadow as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readFragmentShadow.glsl.js";import{metersPerRenderUnit as s,screenPixelSizePerDistance as c,inverseProjectionMatrix as l,nearFar as u,viewport as d,pixelRatio as f}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{ColorConversion as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as ae,NoPerspectiveRead as m}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{getPackedUint32Field as h}from"../views/3d/webgl-engine/core/shaderLibrary/util/PackedUint32.glsl.js";import{addProjViewLocalOrigin as g}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float4PassUniform as _}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as v}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as y,If as b}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{ribbonLineVertexInfoPacking as x,ribbonLineVertexTypePacking as S,ribbonSubdivisionScale as oe}from"../views/3d/webgl-engine/lib/RibbonLineVertexInfo.js";import{alphaCutoff as se}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{animatedAlpha as ce}from"../views/3d/webgl-engine/shaders/animatedAlpha.glsl.js";import{groundMetersToScreenRatio as C,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:le,useFlatJoinVarying:K}=O,q=R===2,J=z&&q,Y=B||J,ue=z||q,X=z&&O.usePerspectiveCorrectStipple,Z=G&&!F,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`,()=>O.hasVertexSize?Q.getTextureAttribute(`size`):y`1.0`),O.hasVVOpacity&&M.inputs.add(`opacityFeatureAttribute`,()=>Q.getTextureAttribute(`opacityFeatureAttribute`)),O.hasVVColor?M.inputs.add(`colorFeatureAttribute`,()=>Q.getTextureAttribute(`colorFeatureAttribute`)):M.inputs.add(`color`,()=>O.hasVertexColor?Q.getTextureAttribute(`color`):y`vec4(1.0)`),N.include(i),k.include(t,O),k.include(ne,O),L===11?(k.varyings.add(`objectAndLayerIdColorVarying`,`vec4`),M.code.add(y`
       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();
       }
-    `),P.code.add(y`void outputObjectAndLayerIdColor() {
+    `),N.code.add(y`void outputObjectAndLayerIdColor() {
 fragColor = objectAndLayerIdColorVarying;
-}`)):(N.code.add(y`void forwardObjectAndLayerIdColor() {}`),P.code.add(y`void outputObjectAndLayerIdColor() {}`));let $=F&&!I;return $&&A.include(ie,k),g(N,k),I&&(K||B)&&N.uniforms.add(K?w:T),K&&!I&&N.uniforms.add(s,c),N.uniforms.add(l,u,d,new v(`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(`vPointTag`,`vec2`),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(y`vec3 perpendicular(vec3 v) {
+}`)):(M.code.add(y`void forwardObjectAndLayerIdColor() {}`),N.code.add(y`void outputObjectAndLayerIdColor() {}`));let $=P&&!F;return $&&k.include(ie,O),g(M,O),F&&(G||z)&&M.uniforms.add(G?C:w),Z&&M.uniforms.add(s,c),M.uniforms.add(l,u,d,new v(`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(`ribbonLineVertexInfo`,`uint`),j.add(`vColor`,`vec4`),j.add(`vpos`,`vec3`,{invariant:!0}),j.add(`vLineDistance`,`float`),j.add(`vLineWidth`,`float`),K?j.add(`vIsInsideJoin`,`int`,{flat:!0}):j.add(`vPointTag`,`vec2`),j.add(`vStretchFactor`,`float`),j.add(`vJoinCenterLineSDFs`,`vec2`),Z&&j.add(`vJoinLineWidths`,`vec2`),j.add(`vSubdivisionFactor`,`float`),z&&j.add(`vLineSizeInv`,`float`),Y&&j.add(`vLineDistanceNorm`,`float`),q&&(j.add(`vSegmentSDF`,`float`),j.add(`vReverseSegmentSDF`,`float`)),M.code.add(y`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);
-}`),N.code.add(y`vec4 projectAndScale(vec4 pos) {
+}`),M.code.add(y`vec4 projectAndScale(vec4 pos) {
 vec4 posNdc = proj * pos;
 posNdc.xy *= viewport.zw / posNdc.w;
 posNdc.z /= posNdc.w;
 return posNdc;
-}`),N.code.add(y`
+}`),M.code.add(y`
     void clip(
       inout vec4 pos,
       inout vec4 prev,
       inout vec4 next,
-      ${b(Z,y`inout float u0, inout float prevU0, inout float nextU0,`)}
+      ${b(X,y`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);
-            ${b(Z,y`u0 = mix(prevU0, u0, clipFactor); nextU0 = u0;`)}
+            ${b(X,y`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);
-            ${b(Z,y`u0 = mix(u0, nextU0, clipFactor); prevU0 = u0;`)}
+            ${b(X,y`u0 = mix(u0, nextU0, clipFactor); prevU0 = u0;`)}
             pos = mix(pos, next, clipFactor);
             prev = pos;
           } else {
@@ -63,36 +63,36 @@ return posNdc;
         if (prev.z > -nearFar[0]) {
           // Previous position behind near plane
           float clipFactor = nearPlaneInterpolationFactor(adjustedNearPlaneDistance, pos, prev);
-          ${b(Z,y`prevU0 = mix(u0, prevU0, clipFactor);`)}
+          ${b(X,y`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);
-          ${b(Z,y`nextU0 = mix(nextU0, u0, clipFactor);`)}
+          ${b(X,y`nextU0 = mix(nextU0, u0, clipFactor);`)}
           next = mix(next, pos, clipFactor);
         }
       }
     }
-  `),N.uniforms.add(f),N.constants.add(`aaWidth`,`float`,1),P.constants.add(`aaWidth`,`float`,1),N.main.add(y`
+  `),M.uniforms.add(f),M.constants.add(`aaWidth`,`float`,1),N.constants.add(`aaWidth`,`float`,1),M.main.add(y`
     uint vertexType = ${h(x,1,y`ribbonLineVertexInfo`)};
     bool isJoin = ${h(S,0,y`vertexType`)} == 0u;
     float lineSide = ${h(S,1,y`vertexType`)} == 0u ? 1.0 : -1.0;
     bool isStartVertex = ${h(S,2,y`vertexType`)} != 0u;
     float subdivisionFactor = float(${h(x,2,y`ribbonLineVertexInfo`)}) / ${y.float(oe)};
     vec3 position = ${Q.getTextureAttribute(`position`)};
-    ${B?y`float u0 = ${Q.getTextureAttribute(`u0`)};`:``}
-    ${B&&K?y`
+    ${z?y`float u0 = ${Q.getTextureAttribute(`u0`)};`:``}
+    ${z&&G?y`
         float prevU0 = ${Q.getTextureAttribute(`u0`,-1)};
         float nextU0 = ${Q.getTextureAttribute(`u0`,1)};
-        ${b(!I,y`
+        ${b(!F,y`
             u0 *= metersPerRenderUnit;
             prevU0 *= metersPerRenderUnit;
             nextU0 *= metersPerRenderUnit;
           `)}
       `:``}
-    ${b(!q,y`
+    ${b(!K,y`
       float textureIndexParity = float(${h(x,0,y`ribbonLineVertexInfo`)} % 2u);
       vPointTag = vec2(textureIndexParity, 1.0 - textureIndexParity);
     `)}
@@ -107,11 +107,47 @@ return posNdc;
       vec4 pos  = view * vec4(position, 1.0);
       vec4 prev = view * vec4(prevPosition, 1.0);
       vec4 next = view * vec4(nextPosition, 1.0);
-  `),$&&N.main.add(y`vec4 other = isStartVertex ? next : prev;
+  `),$&&M.main.add(y`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;
-}`),A.include(p),N.code.add(y`
+}`),k.include(ae),Z&&M.code.add(y`vec2 computePerspectiveInnerJoin(
+vec2 leftDirection,
+vec2 rightDirection,
+float leftLength,
+float rightLength,
+float previousWidth,
+float currentWidth,
+float nextWidth,
+float lineSide,
+bool isStartVertex
+) {
+vec2 leftNormal = vec2(leftDirection.y, -leftDirection.x) * lineSide;
+vec2 rightNormal = vec2(rightDirection.y, -rightDirection.x) * lineSide;
+vec2 segmentOffset = (isStartVertex ? rightNormal : leftNormal) * currentWidth;
+if (min(leftLength, rightLength) <= EPS) {
+return segmentOffset;
+}
+vec2 leftEdge = leftDirection + leftNormal * ((currentWidth - previousWidth) / leftLength);
+vec2 rightEdge = rightDirection + rightNormal * ((nextWidth - currentWidth) / rightLength);
+vec2 offset = (rightNormal - leftNormal) * currentWidth;
+float determinant = leftEdge.x * rightEdge.y - leftEdge.y * rightEdge.x;
+float determinantScale = length(leftEdge) * length(rightEdge);
+const float parallelTolerance = EPS * EPS;
+if (!(abs(determinant) > parallelTolerance * determinantScale)) {
+return segmentOffset;
+}
+float leftDistance = (offset.x * rightEdge.y - offset.y * rightEdge.x) / determinant;
+float rightDistance = (offset.x * leftEdge.y - offset.y * leftEdge.x) / determinant;
+if (!(leftDistance >= -leftLength && leftDistance <= 0.0 &&
+rightDistance >= 0.0 && rightDistance <= rightLength)) {
+return segmentOffset;
+}
+return leftNormal * currentWidth + leftDistance * leftEdge;
+}`),Z&&M.code.add(y`float perspectiveWidthAtOffset(vec2 offset, vec2 segment, float widthAtOrigin, float widthChange) {
+float segmentFraction = dot(offset, segment) / max(dot(segment, segment), EPS * EPS);
+return widthAtOrigin + segmentFraction * widthChange;
+}`),M.code.add(y`
     vec2 computeJoinAndCapDisplacement(
       bool isJoin,
       bool isStartVertex,
@@ -119,11 +155,12 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
       inout vec3 right,
       float lineSide,
       float lineWidth,
+      ${b(Z,`vec2 neighborWidths,`)}
       float subdivisionFactor,
       float perspectiveDivisor
     ) {
-      float leftLen = length(left);
-      float rightLen = length(right);
+      float leftLen = length(${b(Z,y`left.xy`,y`left`)});
+      float rightLen = length(${b(Z,y`right.xy`,y`right`)});
       left = leftLen > EPS ? left / leftLen : vec3(0.0);
       right = rightLen > EPS ? right / rightLen : vec3(0.0);
 
@@ -133,31 +170,50 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
       float miterDisplacementLen = lineWidth;
       float innerDisplacementLen = lineWidth;
       bool isOutside = false;
+      ${b(Z,`vec2 innerDisplacement = vec2(0.0);`)}
 
       if (isJoin) {
         // Determine if the vertex is on the outside or inside of the join.
         isOutside = (left.x * right.y - left.y * right.x) * lineSide > 0.0;
 
         // Compute the miter join position first.
-        vec3 joinDirection = normalize(left + right);
-        joinDisplacementDir = perpendicular(joinDirection);
-
-        // Compute the miter stretch.
-        if (leftLen > EPS && rightLen > EPS) {
-          float nDotSeg = dot(joinDisplacementDir, left);
-          displacementLen /= length(nDotSeg * left - joinDisplacementDir);
-          miterDisplacementLen = displacementLen;
-
-          innerDisplacementLen = min(displacementLen, min(leftLen, rightLen) / abs(nDotSeg));
-
-          // Limit displacement of inner vertices.
-          if (!isOutside) {
-            displacementLen = innerDisplacementLen;
-          }
-        }
+        ${b(Z,y`
+            vec2 bisector = left.xy + right.xy;
+            vec2 segmentDirection = isStartVertex ? right.xy : left.xy;
+            vec3 joinDirection = vec3(length(bisector) > EPS ? normalize(bisector) : segmentDirection, 0.0);
+            joinDisplacementDir = perpendicular(joinDirection);
+
+            if (leftLen > EPS && rightLen > EPS) {
+              float nDotSeg = dot(joinDisplacementDir, left);
+              displacementLen /= length(nDotSeg * left.xy - joinDisplacementDir.xy);
+              miterDisplacementLen = displacementLen;
+            }
+
+            innerDisplacement = computePerspectiveInnerJoin(
+              left.xy, right.xy, leftLen, rightLen,
+              neighborWidths.x, lineWidth, neighborWidths.y,
+              isOutside ? -lineSide : lineSide, isStartVertex
+            );
+            innerDisplacementLen = length(innerDisplacement);
+          `,y`
+            vec3 joinDirection = normalize(left + right);
+            joinDisplacementDir = perpendicular(joinDirection);
+
+            if (leftLen > EPS && rightLen > EPS) {
+              float nDotSeg = dot(joinDisplacementDir, left);
+              displacementLen /= length(nDotSeg * left - joinDisplacementDir);
+              miterDisplacementLen = displacementLen;
+              innerDisplacementLen = min(displacementLen, min(leftLen, rightLen) / abs(nDotSeg));
+
+              // Limit displacement of inner vertices.
+              if (!isOutside) {
+                displacementLen = innerDisplacementLen;
+              }
+            }
+          `)}
 
         // Compute stretch compensation for feathering.
-        ${b(q,y`
+        ${b(K,y`
           if (subdivisionFactor > 0.0) {
             vIsInsideJoin = 1;
           }
@@ -191,10 +247,10 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
         }
 
         if (isOutside && displacementLen > miterLimit * lineWidth) {
-          ${b(k.roundJoins,y`
+          ${b(O.roundJoins,y`
               vec3 startDir = perpendicular(leftLen < EPS ? right : left);
               vec3 endDir = perpendicular(rightLen < EPS ? left : right);
-              float factor = ${B?y`min(1.0, subdivisionFactor * ((NUM_JOIN_SUBDIVISIONS + 1.0) / NUM_JOIN_SUBDIVISIONS))`:y`subdivisionFactor`};
+              float factor = ${z?y`min(1.0, subdivisionFactor * ((NUM_JOIN_SUBDIVISIONS + 1.0) / NUM_JOIN_SUBDIVISIONS))`:y`subdivisionFactor`};
 
               float rotationAngle = acos(clamp(dot(startDir.xy, endDir.xy), -1.0, 1.0));
               joinDisplacementDir = rotateZ(startDir, -lineSide * factor * rotationAngle);
@@ -210,19 +266,24 @@ 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);
 
-              ${b(B,y`joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? endDir : startDir;`,y`joinDisplacementDir = mix(startDir, endDir, subdivisionFactor);`)}
+              ${b(z,y`joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? endDir : startDir;`,y`joinDisplacementDir = mix(startDir, endDir, subdivisionFactor);`)}
             `)}
           displacementLen = lineWidth;
         }
       } else {
         joinDisplacementDir = perpendicular(isStartVertex ? right : left);
-        ${z===0?``:y`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`}
+        ${R===0?``:y`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`}
       }
 
+      ${b(Z,y`
+        if (isJoin && !isOutside) {
+          return innerDisplacement;
+        }
+      `)}
       return (joinDisplacementDir.xy * lineSide + capDisplacementDir.xy) * displacementLen;
     }
-  `),N.main.add(y`
-      clip(pos, prev, next, ${b(Z,y`u0, prevU0, nextU0,`)} isStartVertex);
+  `),M.main.add(y`
+      clip(pos, prev, next, ${b(X,y`u0, prevU0, nextU0,`)} isStartVertex);
 
       vec3 clippedPos = pos.xyz;
       vec3 clippedCenter = mix(pos.xyz, isStartVertex ? next.xyz : prev.xyz, 0.5);
@@ -234,14 +295,14 @@ 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(${b(G,`clippedPos`)});
-      ${b(B&&G,`float patternLineSize = getSize(clippedCenter);`)}
-      ${b(B&&!G,`float patternLineSize = lineSize;`)}
+      float lineSize = getSize(${b(W,`clippedPos`)});
+      ${b(z&&W,`float patternLineSize = getSize(clippedCenter);`)}
+      ${b(z&&!W,`float patternLineSize = lineSize;`)}
 
-      ${b(K,y`
-          ${b(I,y`float lineSizeScreen = lineSize * groundMetersToScreenRatio;`,y`
-              float metersPerScreenPixel = max(-clippedPos.z, nearFar[0]) * metersPerRenderUnit * screenPixelSizePerDistance;
-              float lineSizeScreen = lineSize / metersPerScreenPixel;
+      ${b(G,y`
+          ${b(F,y`float lineSizeScreen = lineSize * groundMetersToScreenRatio;`,y`
+              float widthPerInverseDepth = lineSize / (metersPerRenderUnit * screenPixelSizePerDistance);
+              float lineSizeScreen = widthPerInverseDepth / max(-clippedPos.z, nearFar[0]);
             `)}
           float lineWidth = lineSizeScreen * pixelRatio + aaWidth;
         `,y`
@@ -249,18 +310,22 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
         `)}
 
       vLineWidth = noPerspectiveWrite(lineWidth, pos.w);
-      ${B?`vLineSizeInv = noPerspectiveWrite(1.0 / ${K?`lineSize`:`max(lineSize, 1.0)`}, pos.w);`:``}
-  `),le&&N.main.add(y`
+      ${z?`vLineSizeInv = noPerspectiveWrite(1.0 / ${G?`lineSize`:`max(lineSize, 1.0)`}, pos.w);`:``}
+  `),ue&&M.main.add(y`
       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);`:``}
-    `),N.main.add(y`
-    ${b(q,y`vIsInsideJoin = 0;`)}
+      ${q?`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:``}
+    `),M.main.add(y`
+    ${b(K,y`vIsInsideJoin = 0;`)}
     vStretchFactor = 1.0;
     vSubdivisionFactor = 0.0;
     vJoinCenterLineSDFs = vec2(LARGE_HALF_FLOAT);
 
+    ${b(Z,y`
+        vec2 neighborWidths = widthPerInverseDepth / max(vec2(prev.w, next.w), vec2(nearFar[0])) * pixelRatio + aaWidth;
+      `)}
+
     vec2 displacementXY = computeJoinAndCapDisplacement(
       isJoin,
       isStartVertex,
@@ -268,9 +333,17 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
       right,
       lineSide,
       lineWidth,
+      ${b(Z,`neighborWidths,`)}
       subdivisionFactor,
       pos.w
     );
+    ${b(Z,y`
+        // Feathering must use each strip's width at the displaced vertex, not at the original join.
+        float leftWidth = perspectiveWidthAtOffset(displacementXY, pos.xy - prev.xy, lineWidth, lineWidth - neighborWidths.x);
+        float rightWidth = perspectiveWidthAtOffset(displacementXY, next.xy - pos.xy, lineWidth, neighborWidths.y - lineWidth);
+        // Match vJoinCenterLineSDFs: right first, selected when vSubdivisionFactor > 0.5.
+        vJoinLineWidths = noPerspectiveWrite(vec2(rightWidth, leftWidth), pos.w);
+      `)}
     vec3 segmentDirection = isStartVertex ? right : left;
 
     /**
@@ -285,10 +358,10 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
     float lineDistNorm = noPerspectiveWrite(lineSide, pos.w);
 
     vLineDistance = lineWidth * lineDistNorm;
-    ${X?y`vLineDistanceNorm = lineDistNorm;`:``}
+    ${Y?y`vLineDistanceNorm = lineDistNorm;`:``}
 
     pos.xyz += displacement;
-  `),N.main.add(y`if (isJoin) {
+  `),M.main.add(y`if (isJoin) {
 vec2 joinCenterToVertex = displacementXY;
 vec2 leftCenterlineDir = left.xy;
 vec2 rightCenterlineDir = right.xy;
@@ -303,31 +376,31 @@ dot(vec2(leftCenterlineDir.y, -leftCenterlineDir.x), joinCenterToVertex)
 ),
 pos.w
 );
-}`),J&&N.main.add(y`vec2 segmentDir = normalize(segment.xy);
+}`),q&&M.main.add(y`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);`),B&&(I?N.main.add(`float stippleDistanceToScreenRatio = ${K?`groundMetersToScreenRatio`:`planarDistanceToScreenRatio`};`):N.main.add(y`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
-float stippleDistanceToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),N.main.add(y`
+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(y`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
+float stippleDistanceToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),M.main.add(y`
       float segmentLengthScreenDouble = length(segment.xy);
       float segmentLengthScreen = segmentLengthScreenDouble * 0.5;
       float discreteStippleDistanceToScreenRatio = discretizeStippleDistanceToScreenRatio(stippleDistanceToScreenRatio);
-      float segmentLengthRender = ${b(K,y`abs(mix(nextU0 - u0, u0 - prevU0, isEndVertex))`,y`length(mix(nextPosition - position, position - prevPosition, isEndVertex))`)};
+      float segmentLengthRender = ${b(G,y`abs(mix(nextU0 - u0, u0 - prevU0, isEndVertex))`,y`length(mix(nextPosition - position, position - prevPosition, isEndVertex))`)};
 
-      ${b(!I||K,y`
-          float segmentStartRender = ${b(K,y`mix(u0, prevU0, isEndVertex)`,y`mix(u0, u0 - segmentLengthRender, isEndVertex)`)};
+      ${b(!F||G,y`
+          float segmentStartRender = ${b(G,y`mix(u0, prevU0, isEndVertex)`,y`mix(u0, u0 - segmentLengthRender, isEndVertex)`)};
         `)}
 
       vStipplePatternStretch = stippleDistanceToScreenRatio / discreteStippleDistanceToScreenRatio;
-    `),I?N.main.add(y`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteStippleDistanceToScreenRatio / stippleDistanceToScreenRatio;
-float startPseudoScreen = u0 * discreteStippleDistanceToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):N.main.add(y`float startPseudoScreen = segmentStartRender * discreteStippleDistanceToScreenRatio;
-float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceToScreenRatio;`),N.uniforms.add(new v(`stipplePatternPixelSize`,e=>re(e))),N.main.add(y`
+    `),F?M.main.add(y`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteStippleDistanceToScreenRatio / stippleDistanceToScreenRatio;
+float startPseudoScreen = u0 * discreteStippleDistanceToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):M.main.add(y`float startPseudoScreen = segmentStartRender * discreteStippleDistanceToScreenRatio;
+float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceToScreenRatio;`),M.uniforms.add(new v(`stipplePatternPixelSize`,e=>re(e))),M.main.add(y`
       float patternLength = patternLineSize * stipplePatternPixelSize;
       vec2 stippleDistanceLimits;
 
-      ${b(K,y`
+      ${b(G,y`
           stippleDistanceLimits = vec2(segmentStartRender, segmentStartRender + segmentLengthRender);
           vStipplePatternStretch = 1.0;
 
-          ${b(ce,y`
+          ${b(le,y`
               // The v-coordinate used in case of an image pattern.
               bool isLeft = lineSide < 0.0;
               vStippleV = isLeft ? 0.0 : 1.0;
@@ -352,7 +425,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceT
         vStippleDistance += (stippleDisplacementFactor - isEndVertex) * (stippleDistanceLimits.y - stippleDistanceLimits.x);
       }
 
-      ${b(Z,y`
+      ${b(X,y`
           float segmentStartInverseW = 1.0 / mix(pos.w, prev.w, isEndVertex);
           float segmentEndInverseW = 1.0 / mix(next.w, pos.w, isEndVertex);
           vStipplePerspective = noPerspectiveWrite(
@@ -368,7 +441,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);
-    `)),N.main.add(y`
+    `)),M.main.add(y`
       // Convert back into NDC
       pos.xy = (pos.xy / viewport.zw) * pos.w;
       pos.z = pos.z * pos.w;
@@ -376,50 +449,51 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceT
       vColor = getColor();
       vColor.a = noPerspectiveWrite(vColor.a, pos.w);
 
-      ${H&&!I?`pos.z -= EPS * pos.w;`:``}
+      ${V&&!F?`pos.z -= EPS * pos.w;`:``}
 
       // transform final position to camera space for slicing
       vpos = (inverseProjectionMatrix * pos).xyz;
       gl_Position = pos;
       forwardObjectAndLayerIdColor();
-    }`),A.include(E,k),A.include(m),P.include(ae),P.include(se),P.include(e,k),P.main.add(`discardBySlice(vpos);`),P.code.add(y`
+    }`),k.include(T,O),k.include(m),N.include(p),N.include(se),N.include(e,O),N.main.add(`discardBySlice(vpos);`),N.code.add(y`
     float lineFeatheringFactor(float lineWidth, float lineDistance) {
       /**
        * Determine whether we are inside the feathering region or not, under
        * consideration of triangle stretch and the distance to the centerline.
        */
-      bool isInsideJoin = ${q?y`vIsInsideJoin == 1`:y`any(equal(vPointTag, vec2(0.0)))`};
+      bool isInsideJoin = ${K?y`vIsInsideJoin == 1`:y`any(equal(vPointTag, vec2(0.0)))`};
       float stretchFactor = isInsideJoin ? noPerspectiveRead(vStretchFactor) : 1.0;
       float featherWidth = 2.0;
       // Keep the filter in render-target pixels, including when its two sides overlap on a subpixel stroke.
       float featherStartDistance = lineWidth - featherWidth / stretchFactor;
-      float straightFeatherStartDistance = lineWidth - featherWidth;
+      float straightLineWidth = ${Z?y`noPerspectiveRead(vSubdivisionFactor > 0.5 ? vJoinLineWidths.x : vJoinLineWidths.y)`:`lineWidth`};
+      float straightFeatherStartDistance = straightLineWidth - featherWidth;
       float value = abs(lineDistance);
       float feather = (value - featherStartDistance) / (lineWidth - featherStartDistance);
       vec2 joinCenterSDFs = noPerspectiveRead(vJoinCenterLineSDFs);
       float joinCenterDistance = abs(vSubdivisionFactor > 0.5 ? joinCenterSDFs.x : joinCenterSDFs.y);
-      float straightFeather = (joinCenterDistance - straightFeatherStartDistance) / (lineWidth - straightFeatherStartDistance);
+      float straightFeather = (joinCenterDistance - straightFeatherStartDistance) / featherWidth;
       feather = isInsideJoin ? max(feather, straightFeather) : feather;
       float coverage = min(lineWidth - aaWidth, 1.0);
       return clamp(1.0 - feather, 0.0, coverage);
     }
-  `),P.main.add(y`
+  `),N.main.add(y`
     float lineWidth = noPerspectiveRead(vLineWidth);
     float lineDistance = noPerspectiveRead(vLineDistance);
-    ${b(X,y`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
-  `),Y&&P.main.add(y`float nominalLineWidth = lineWidth - aaWidth;`),H?P.main.add(y`vec4 albedo = vec4(1.0, 0.0, 1.0, 1.0);
-vec4 finalColor = albedo;`):(J&&P.main.add(y`
+    ${b(Y,y`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
+  `),J&&N.main.add(y`float nominalLineWidth = lineWidth - aaWidth;`),V?N.main.add(y`vec4 albedo = vec4(1.0, 0.0, 1.0, 1.0);
+vec4 finalColor = albedo;`):(q&&N.main.add(y`
         float sdf = noPerspectiveRead(min(vSegmentSDF, vReverseSegmentSDF));
         vec2 fragmentPosition = vec2(min(sdf, 0.0), lineDistance);
 
         float fragmentRadius = length(fragmentPosition);
-        float fragmentCapSDF = (fragmentRadius - ${Y?`nominalLineWidth`:`lineWidth`}) * 0.5; // Divide by 2 to transform from double pixel scale
+        float fragmentCapSDF = (fragmentRadius - ${J?`nominalLineWidth`:`lineWidth`}) * 0.5; // Divide by 2 to transform from double pixel scale
         float capCoverage = clamp(0.5 - fragmentCapSDF, 0.0, 1.0);
 
         if (capCoverage < alphaCutoff) {
           discard;
         }
-      `),Y?P.main.add(y`vec2 stipplePosition = vec2(
+      `),J?N.main.add(y`vec2 stipplePosition = vec2(
 min(getStippleCapDistance(), 0.0) * nominalLineWidth,
 lineDistance
 );
@@ -427,11 +501,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;`):P.main.add(y`float stippleAlpha = getStippleAlpha(lineWidth);`),R!==11&&P.main.add(y`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),P.uniforms.add(new _(`intrinsicColor`,e=>e.color)).main.add(y`vec4 color = intrinsicColor * vColor;
-color.a = noPerspectiveRead(color.a);`),U&&P.uniforms.add(new _(`innerColor`,e=>e.innerColor??e.color),new v(`innerWidth`,(e,t)=>e.innerWidth*t.camera.pixelRatio)).main.add(y`float distToInner = abs(lineDistance) - innerWidth;
+float stippleAlpha = lineCoverage > 0.0 ? min(stippleCoverage, lineCoverage) / lineCoverage : 0.0;`):N.main.add(y`float stippleAlpha = getStippleAlpha(lineWidth);`),L!==11&&N.main.add(y`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),N.uniforms.add(new _(`intrinsicColor`,e=>e.color)).main.add(y`vec4 color = intrinsicColor * vColor;
+color.a = noPerspectiveRead(color.a);`),H&&N.uniforms.add(new _(`innerColor`,e=>e.innerColor??e.color),new v(`innerWidth`,(e,t)=>e.innerWidth*t.camera.pixelRatio)).main.add(y`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);`),P.main.add(`vec4 albedo = blendStipple(color, stippleAlpha);`),V&&(P.uniforms.add(new v(`falloff`,e=>e.falloff)),P.main.add(y`albedo.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),P.main.add(y`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(ee,k),N.main.add(y`forwardLocalUp(position, localOrigin);`),N.main.add(`forwardLinearDepthToReadShadow();`),A.include(o,k),P.include(r,k),P.include(n,k),P.uniforms.add(te).main.add(y`vec3 normal = normalize(upNormal);
+color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),N.main.add(`vec4 albedo = blendStipple(color, stippleAlpha);`),B&&(N.uniforms.add(new v(`falloff`,e=>e.falloff)),N.main.add(y`albedo.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),N.main.add(y`albedo.a *= ${J?`lineCoverage`:`lineFeatheringFactor(lineWidth, lineDistance)`};`),U&&(M.main.add(`vec4 animatedAlphaTimeStamps = ${Q.getTextureAttribute(`timeStamps`)};`),k.include(ce,O),N.main.add(`albedo.a *= animatedAlpha();`)),I?(k.include(ee,O),M.main.add(y`forwardLocalUp(position, localOrigin);`),M.main.add(`forwardLinearDepthToReadShadow();`),k.include(o,O),N.include(r,O),N.include(n,O),N.uniforms.add(te).main.add(y`vec3 normal = normalize(upNormal);
 float additionalAmbientScale = additionalDirectedAmbientLight(normal);
 float shadow = readFragmentShadow(additionalAmbientScale);
 float ssao = evaluateAmbientOcclusionInverse();
@@ -440,4 +514,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
-);`)):P.main.add(`vec4 finalColor = albedo;`)),P.main.add(y`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};
+);`)):N.main.add(`vec4 finalColor = albedo;`)),N.main.add(y`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};

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.35/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.36/assets`,t.defaultAssetsPath=t.assetsPath);export{t as default};

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=`6.0`;let n=`6.0`;n=`6.0.0-next.35`;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=`6.0`;let n=`6.0`;n=`6.0.0-next.36`;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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcgis/core",
-  "version": "6.0.0-next.35",
+  "version": "6.0.0-next.36",
   "description": "ArcGIS Maps SDK for JavaScript: A complete 2D and 3D mapping and data visualization API",
   "keywords": [
     "ArcGIS",
@@ -20,7 +20,7 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
     "@amcharts/amcharts5": "~5.21.5",
-    "@arcgis/toolkit": "6.0.0-next.35",
+    "@arcgis/toolkit": "6.0.0-next.36",
     "@esri/arcgis-html-sanitizer": "~4.2.0",
     "@esri/calcite-components": "^5.2.1",
     "@vaadin/grid": "~25.3.5",

package/support/timeUtils.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{isSome as e}from"../core/arrayUtils.js";import{clone as t}from"../core/lang.js";import{offsetDate as n}from"../core/timeUtils.js";import r from"../rest/support/StatisticDefinition.js";import i from"../time/TimeExtent.js";import{isWebMap as a}from"../webmap/utils.js";import{isWebScene as o}from"../webscene/utils.js";function s(e){return e.timeInfo!==void 0}async function c(t,n){if(!t.timeInfo||!t.timeInfo.startField&&!t.timeInfo.endField)return null;let{startField:a,endField:o}=t.timeInfo,s=t.createQuery();s.outStatistics=[],a&&s.outStatistics.push(new r({onStatisticField:a,outStatisticFieldName:`minStart`,statisticType:`min`}),new r({onStatisticField:a,outStatisticFieldName:`maxStart`,statisticType:`max`})),o&&s.outStatistics.push(new r({onStatisticField:o,outStatisticFieldName:`minEnd`,statisticType:`min`}),new r({onStatisticField:o,outStatisticFieldName:`maxEnd`,statisticType:`max`}));let{features:c}=await t.queryFeatures(s,{signal:n}),l=c.at(0),u=[l?.getAttribute(`minStart`),l?.getAttribute(`maxStart`),l?.getAttribute(`minEnd`),l?.getAttribute(`maxEnd`)].filter(e).map(e=>typeof e==`string`?Date.parse(e):e);if(!u.length)return null;let d=new Date(Math.min(...u)),f=new Date(Math.max(...u)),p=new i({start:d,end:f}),{visibilityTimeExtent:m}=t;return p?.intersection(m)??m}async function l(e,t){return e.widgets?.timeSlider?.fullTimeExtent??f(e.allLayers,t)}function u(e){let t=e.numThumbs??2,n=e.currentTimeExtent;if(n){let{start:e,end:r}=n;return e!=null&&r!=null&&e.getTime()===r.getTime()?`instant`:t===2?`time-window`:e==null||e.getTime()===0?`cumulative-from-start`:`cumulative-from-end`}return t===2?`time-window`:`cumulative-from-start`}function d(e){let{numStops:n,stopInterval:r,stops:i}=e;return i?{dates:t(i)}:r?{interval:r.clone()}:{count:n??5}}async function f(t,n){if(t.length===0)return i.allTime;await Promise.all(t.map(e=>e.load({signal:n})));let r=t.filter(s),a=t.filter(e=>!s(e)&&e.visibilityTimeExtent!=null);if(r.length===0&&a.length===0)return i.allTime;let o=[],l=[],u=[];for(let e of r)e.type===`feature`&&h(e)?o.push(e):(e.type===`feature`||e.type===`map-image`)&&e.timeInfo?.hasLiveData?l.push(e):u.push(e);let d=e=>e==null||e.isAllTime,f=[...u.map(e=>{let t=e.timeInfo?.fullTimeExtent,{visibilityTimeExtent:n}=e;return t?.intersection(n)??n}),...a.map(e=>e.visibilityTimeExtent)];if(f.some(d))return i.allTime;let p=l.map(async e=>{let t=(await e.fetchRecomputedExtents({signal:n}))?.timeExtent??e.timeInfo?.fullTimeExtent,{visibilityTimeExtent:r}=e;return t?.intersection(r)??r}),m=(await Promise.allSettled(p)).map(e=>e.status===`fulfilled`?e.value:null);if(m.some(d))return i.allTime;let g=o.map(e=>c(e,n)),_=(await Promise.allSettled(g)).filter(e=>e.status===`fulfilled`).map(e=>e.value),v=[...m,...f,..._].filter(e);return v.length===0?i.allTime:v.reduce((e,t)=>e.union(t))}function p(e,t){let n=e.currentTimeExtent;if(!n)return null;let{start:r,end:a}=n,o=r??a??null;switch(t){case`time-window`:return new i({start:r,end:a});case`cumulative-from-start`:return new i({start:null,end:o});case`cumulative-from-end`:return new i({start:o,end:null});case`instant`:return new i({start:o,end:o})}}async function m(e,t){if(!(a(e)||o(e)))return null;await e.load({signal:t});let n=e?.widgets?.timeSlider;if(!n)return null;let r=await l(e,t),{loop:i}=n,s=u(n);return{fullTimeExtent:r,loop:i,mode:s,playRate:n.stopDelay??2e3,stops:d(n),timeExtent:p(n,s)}}function h(e){if(!e.url)return!1;let t=e.timeInfo,n=e.getAtOrigin(`timeInfo`,`service`);return n?!(!t||t===n||(t.startField===n.startField||!t.startField&&!n.startField)&&(t.endField===n.endField||!t.endField&&!n.endField)):!!t}function g(e){if(!e)return e;let{start:t,end:r}=e;return new i({start:t==null?t:n(t,-t.getTimezoneOffset(),`minutes`),end:r==null?r:n(r,-r.getTimezoneOffset(),`minutes`)})}function _(e){if(!e)return e;let{start:t,end:r}=e;return new i({start:t==null?t:n(t,t.getTimezoneOffset(),`minutes`),end:r==null?r:n(r,r.getTimezoneOffset(),`minutes`)})}export{c as fetchTimeExtent,f as getTimeExtentFromLayers,m as getTimeSliderSettingsFromWebDocument,h as requireFetchTimeExtent,_ as toLocalTimeExtent,g as toUTCTimeExtent};
+import{isSome as e}from"../core/arrayUtils.js";import{clone as t}from"../core/lang.js";import{offsetDate as n}from"../core/timeUtils.js";import r from"../rest/support/StatisticDefinition.js";import i from"../time/TimeExtent.js";import{isWebMap as a}from"../webmap/utils.js";import{isWebScene as o}from"../webscene/utils.js";function s(e){return e.timeInfo!==void 0}async function c(t,n){if(!t.timeInfo||!t.timeInfo.startField&&!t.timeInfo.endField)return null;let{startField:a,endField:o}=t.timeInfo,s=t.createQuery();s.outStatistics=[],a&&s.outStatistics.push(new r({onStatisticField:a,outStatisticFieldName:`minStart`,statisticType:`min`}),new r({onStatisticField:a,outStatisticFieldName:`maxStart`,statisticType:`max`})),o&&s.outStatistics.push(new r({onStatisticField:o,outStatisticFieldName:`minEnd`,statisticType:`min`}),new r({onStatisticField:o,outStatisticFieldName:`maxEnd`,statisticType:`max`}));let{features:c}=await t.queryFeatures(s,{signal:n}),l=c.at(0),u=[l?.getAttribute(`minStart`),l?.getAttribute(`maxStart`),l?.getAttribute(`minEnd`),l?.getAttribute(`maxEnd`)].filter(e).map(e=>typeof e==`string`?Date.parse(e):e);if(!u.length)return null;let d=new Date(Math.min(...u)),f=new Date(Math.max(...u)),p=new i({start:d,end:f}),{visibilityTimeExtent:m}=t;return p?.intersection(m)??m}async function l(e,t){return e.widgets?.timeSlider?.fullTimeExtent??f(e.allLayers,t)}function u(e){let t=e.numThumbs??2,n=e.currentTimeExtent;if(n){let{start:e,end:r}=n;return e!=null&&r!=null&&e.getTime()===r.getTime()?`instant`:t===2?`time-window`:e==null||e.getTime()===0?`cumulative-from-start`:`cumulative-from-end`}return t===2?`time-window`:`cumulative-from-start`}function d(e){let{numStops:n,stopInterval:r,stops:i}=e;return i?{dates:t(i)}:r?{interval:r.clone()}:{count:n??5}}async function f(t,n){if(t.length===0)return i.allTime;await Promise.all(t.map(e=>e.load({signal:n})));let r=t.filter(s),a=t.filter(e=>!s(e)&&e.visibilityTimeExtent!=null);if(r.length===0&&a.length===0)return i.allTime;let o=[],l=[],u=[];for(let e of r)(e.type===`feature`||e.type===`scene`)&&h(e)?o.push(e):(e.type===`feature`||e.type===`map-image`)&&e.timeInfo?.hasLiveData?l.push(e):u.push(e);let d=e=>e==null||e.isAllTime,f=[...u.map(e=>{let t=e.timeInfo?.fullTimeExtent,{visibilityTimeExtent:n}=e;return t?.intersection(n)??n}),...a.map(e=>e.visibilityTimeExtent)];if(f.some(d))return i.allTime;let p=l.map(async e=>{let t=(await e.fetchRecomputedExtents({signal:n}))?.timeExtent??e.timeInfo?.fullTimeExtent,{visibilityTimeExtent:r}=e;return t?.intersection(r)??r}),m=(await Promise.allSettled(p)).map(e=>e.status===`fulfilled`?e.value:null);if(m.some(d))return i.allTime;let g=o.map(e=>c(e,n)),_=(await Promise.allSettled(g)).filter(e=>e.status===`fulfilled`).map(e=>e.value),v=[...m,...f,..._].filter(e);return v.length===0?i.allTime:v.reduce((e,t)=>e.union(t))}function p(e,t){let n=e.currentTimeExtent;if(!n)return null;let{start:r,end:a}=n,o=r??a??null;switch(t){case`time-window`:return new i({start:r,end:a});case`cumulative-from-start`:return new i({start:null,end:o});case`cumulative-from-end`:return new i({start:o,end:null});case`instant`:return new i({start:o,end:o})}}async function m(e,t){if(!(a(e)||o(e)))return null;await e.load({signal:t});let n=e?.widgets?.timeSlider;if(!n)return null;let r=await l(e,t),{loop:i}=n,s=u(n);return{fullTimeExtent:r,loop:i,mode:s,playRate:n.stopDelay??2e3,stops:d(n),timeExtent:p(n,s)}}function h(e){if(!e.url)return!1;let t=e.timeInfo,n=e.getAtOrigin(`timeInfo`,`service`);return n?!(!t||t===n||(t.startField===n.startField||!t.startField&&!n.startField)&&(t.endField===n.endField||!t.endField&&!n.endField)):!!t}function g(e){if(!e)return e;let{start:t,end:r}=e;return new i({start:t==null?t:n(t,-t.getTimezoneOffset(),`minutes`),end:r==null?r:n(r,-r.getTimezoneOffset(),`minutes`)})}function _(e){if(!e)return e;let{start:t,end:r}=e;return new i({start:t==null?t:n(t,t.getTimezoneOffset(),`minutes`),end:r==null?r:n(r,r.getTimezoneOffset(),`minutes`)})}export{c as fetchTimeExtent,f as getTimeExtentFromLayers,m as getTimeSliderSettingsFromWebDocument,h as requireFetchTimeExtent,_ as toLocalTimeExtent,g as toUTCTimeExtent};