@arcgis/core 4.31.0-next.20240821 → 4.31.0-next.20240822
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/esri/core/workers/RemoteClient.js +1 -1
- package/assets/esri/core/workers/chunks/{9443b9ec03f25c723c2c.js → 06d328c8aad32c52de97.js} +1 -1
- package/assets/esri/core/workers/chunks/203afe6dd0461d4bd774.js +278 -0
- package/assets/esri/core/workers/chunks/{cd9f48dcee2a1fc261ed.js → c5214a47690c594903d1.js} +25 -25
- package/assets/esri/themes/base/widgets/_Grid.scss +0 -8
- package/assets/esri/themes/base/widgets/_Print.scss +13 -15
- package/assets/esri/themes/dark/main.css +1 -1
- package/assets/esri/themes/light/main.css +1 -1
- package/assets/esri/themes/light/view.css +1 -1
- package/assets/esri/widgets/Print/t9n/Print.json +1 -1
- package/assets/esri/widgets/Print/t9n/Print_en.json +1 -1
- package/chunks/ComponentShader.glsl.js +29 -29
- package/chunks/DefaultMaterial.glsl.js +1 -1
- package/chunks/Path.glsl.js +22 -17
- package/exports/csv.js +1 -1
- package/interfaces.d.ts +37 -9
- package/package.json +1 -1
- package/support/revision.js +1 -1
- package/views/2d/support/highlightGroupUtils.js +1 -1
- package/views/3d/terrain/TerrainRenderer.js +1 -1
- package/views/3d/webgl-engine/collections/Component/Material/ComponentTechnique.js +1 -1
- package/views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js +1 -1
- package/views/3d/webgl-engine/core/shaderLibrary/output/Emissions.glsl.js +2 -2
- package/views/3d/webgl-engine/core/shaderLibrary/shading/ReadBaseColorTexture.glsl.js +3 -3
- package/views/3d/webgl-engine/lib/OrderIndependentTransparency.js +1 -1
- package/views/3d/webgl-engine/lib/Renderer.js +1 -1
- package/views/3d/webgl-engine/materials/DefaultMaterial.js +1 -1
- package/views/3d/webgl-engine/materials/PathMaterial.js +1 -1
- package/views/3d/webgl-engine/materials/PathTechnique.js +1 -1
- package/views/3d/webgl-engine/shaders/DefaultMaterialTechnique.js +1 -1
- package/views/3d/webgl-engine/shaders/OutputColorHighlightOID.glsl.js +8 -8
- package/views/3d/webgl-engine/shaders/Path.glsl.js +1 -1
- package/widgets/Feature/FeatureMedia.js +1 -1
- package/widgets/FeatureTable/FeatureTableViewModel.js +1 -1
- package/widgets/FeatureTable/Grid/Column.js +1 -1
- package/widgets/FeatureTable.js +1 -1
- package/widgets/OrientedImageryViewer/OrientedImageryViewerViewModel.js +1 -1
- package/widgets/PanoramicViewer/PanoramicViewerViewModel.js +1 -1
- package/widgets/Print/CustomTemplate.js +1 -1
- package/widgets/Print/PrintViewModel.js +1 -1
- package/widgets/Print/TemplateOptions.js +1 -1
- package/widgets/Print/utils.js +5 -0
- package/widgets/Print.js +1 -1
- package/widgets/support/exportUtils.js +1 -1
- package/assets/esri/core/workers/chunks/e5474bcde5b8fa037b56.js +0 -278
|
@@ -1 +1 @@
|
|
|
1
|
-
{"widgetLabel":"Print","title":"Title","fileName":"File name","titlePlaceHolder":"Title of file","fileNamePlaceHolder":"File name","formatDefaultOption":"Select format","fileFormatTitle":"File format","layoutTitle":"Page setup","layoutDefaultOption":"Select page setup","scale":"Set scale","scaleLabel":"scale","reset":"reset","author":"Author","copyright":"Copyright","legend":"Include legend","lock":"lock","swap":"swap","panelToggle":"Panel toggle","advancedOptions":"Advanced options","width":"Width","height":"Height","dpi":"DPI","attribution":"Include attribution","northArrow":"Include north arrow","layoutTab":"Layout","mapOnlyTab":"Map only","printPreview":"Show print area","untitled":"untitled","pending":"Exporting","ready":"Open this","linkReady":"Open in new window.","errorMessage":"Select this to remove it.","exportWebMapError":"An error occurred while exporting the web map.","exportWebMapCIMError":"CIMSymbol is not supported by a print service published from ArcMap.","sceneViewError":"Printing is not supported in SceneView.","serviceError":"There seems to have been an error.","export":"Export","exportDescription":"Export. Exported files will appear below.","noExportedFiles":"No exported files","exportsTab":"Exports","selectTemplate":"Select template","selectTemplateDescription":"Using a template will apply its values","exportHint":"When you export a file, it will be shown here. Exports are only stored for a short period of time. Download your export to ensure continued access.","template":"Template","a3-landscape":"A3 landscape","a3-portrait":"A3 portrait","a4-landscape":"A4 landscape","a4-portrait":"A4 portrait","letter-ansi-a-landscape":"Letter ANSI A landscape","letter-ansi-a-portrait":"Letter ANSI A portrait","tabloid-ansi-b-landscape":"Tabloid ANSI B landscape","tabloid-ansi-b-portrait":"Tabloid ANSI B portrait","defaultTemplates":"Default templates","organizationTemplates":"Organization templates","chooseTemplate":"Choose template","generatingExport":"Generating export","beta":"Beta","templatesNoLongerAvailable":"Templates are no longer available","templatesNoLongerAvailableDescription":"One or more of your custom templates are no longer available.","myTemplates":"My templates","unsupportedEffects":"Unsupported effects","unsupportedEffectsDescription":"The map contains layers or effects that can't be printed."}
|
|
1
|
+
{"widgetLabel":"Print","title":"Title","fileName":"File name","titlePlaceHolder":"Title of file","fileNamePlaceHolder":"File name","formatDefaultOption":"Select format","fileFormatTitle":"File format","layoutTitle":"Page setup","layoutDefaultOption":"Select page setup","scale":"Set scale","scaleLabel":"scale","reset":"reset","author":"Author","copyright":"Copyright","legend":"Include legend","lock":"lock","swap":"swap","panelToggle":"Panel toggle","advancedOptions":"Advanced options","width":"Width","height":"Height","dpi":"DPI","attribution":"Include attribution","northArrow":"Include north arrow","scaleBar":"Include scale bar","outSpatialReference":"Output spatial reference (WKID)","layoutTab":"Layout","mapOnlyTab":"Map only","printPreview":"Show print area","browseTemplates":"Browse templates","untitled":"untitled","pending":"Exporting","ready":"Open this","linkReady":"Open in new window.","errorMessage":"Select this to remove it.","exportWebMapError":"An error occurred while exporting the web map.","exportWebMapCIMError":"CIMSymbol is not supported by a print service published from ArcMap.","sceneViewError":"Printing is not supported in SceneView.","serviceError":"There seems to have been an error.","export":"Export","exportDescription":"Export. Exported files will appear below.","noExportedFiles":"No exported files","exportsTab":"Exports","selectTemplate":"Select template","selectTemplateDescription":"Using a template will apply its values","exportHint":"When you export a file, it will be shown here. Exports are only stored for a short period of time. Download your export to ensure continued access.","template":"Template","a3-landscape":"A3 landscape","a3-portrait":"A3 portrait","a4-landscape":"A4 landscape","a4-portrait":"A4 portrait","letter-ansi-a-landscape":"Letter ANSI A landscape","letter-ansi-a-portrait":"Letter ANSI A portrait","tabloid-ansi-b-landscape":"Tabloid ANSI B landscape","tabloid-ansi-b-portrait":"Tabloid ANSI B portrait","defaultTemplates":"Default templates","organizationTemplates":"Organization templates","chooseTemplate":"Choose template","generatingExport":"Generating export","beta":"Beta","templatesNoLongerAvailable":"Templates are no longer available","templatesNoLongerAvailableDescription":"One or more of your custom templates are no longer available.","myTemplates":"My templates","unsupportedEffects":"Unsupported effects","unsupportedEffectsDescription":"The map contains layers or effects that can't be printed."}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"widgetLabel":"Print","title":"Title","fileName":"File name","titlePlaceHolder":"Title of file","fileNamePlaceHolder":"File name","formatDefaultOption":"Select format","fileFormatTitle":"File format","layoutTitle":"Page setup","layoutDefaultOption":"Select page setup","scale":"Set scale","scaleLabel":"scale","reset":"reset","author":"Author","copyright":"Copyright","legend":"Include legend","lock":"lock","swap":"swap","panelToggle":"Panel toggle","advancedOptions":"Advanced options","width":"Width","height":"Height","dpi":"DPI","attribution":"Include attribution","northArrow":"Include north arrow","layoutTab":"Layout","mapOnlyTab":"Map only","printPreview":"Show print area","untitled":"untitled","pending":"Exporting","ready":"Open this","linkReady":"Open in new window.","errorMessage":"Select this to remove it.","exportWebMapError":"An error occurred while exporting the web map.","exportWebMapCIMError":"CIMSymbol is not supported by a print service published from ArcMap.","sceneViewError":"Printing is not supported in SceneView.","serviceError":"There seems to have been an error.","export":"Export","exportDescription":"Export. Exported files will appear below.","noExportedFiles":"No exported files","exportsTab":"Exports","selectTemplate":"Select template","selectTemplateDescription":"Using a template will apply its values","exportHint":"When you export a file, it will be shown here. Exports are only stored for a short period of time. Download your export to ensure continued access.","template":"Template","a3-landscape":"A3 landscape","a3-portrait":"A3 portrait","a4-landscape":"A4 landscape","a4-portrait":"A4 portrait","letter-ansi-a-landscape":"Letter ANSI A landscape","letter-ansi-a-portrait":"Letter ANSI A portrait","tabloid-ansi-b-landscape":"Tabloid ANSI B landscape","tabloid-ansi-b-portrait":"Tabloid ANSI B portrait","defaultTemplates":"Default templates","organizationTemplates":"Organization templates","chooseTemplate":"Choose template","generatingExport":"Generating export","beta":"Beta","templatesNoLongerAvailable":"Templates are no longer available","templatesNoLongerAvailableDescription":"One or more of your custom templates are no longer available.","myTemplates":"My templates","unsupportedEffects":"Unsupported effects","unsupportedEffectsDescription":"The map contains layers or effects that can't be printed."}
|
|
1
|
+
{"widgetLabel":"Print","title":"Title","fileName":"File name","titlePlaceHolder":"Title of file","fileNamePlaceHolder":"File name","formatDefaultOption":"Select format","fileFormatTitle":"File format","layoutTitle":"Page setup","layoutDefaultOption":"Select page setup","scale":"Set scale","scaleLabel":"scale","reset":"reset","author":"Author","copyright":"Copyright","legend":"Include legend","lock":"lock","swap":"swap","panelToggle":"Panel toggle","advancedOptions":"Advanced options","width":"Width","height":"Height","dpi":"DPI","attribution":"Include attribution","northArrow":"Include north arrow","scaleBar":"Include scale bar","outSpatialReference":"Output spatial reference (WKID)","layoutTab":"Layout","mapOnlyTab":"Map only","printPreview":"Show print area","browseTemplates":"Browse templates","untitled":"untitled","pending":"Exporting","ready":"Open this","linkReady":"Open in new window.","errorMessage":"Select this to remove it.","exportWebMapError":"An error occurred while exporting the web map.","exportWebMapCIMError":"CIMSymbol is not supported by a print service published from ArcMap.","sceneViewError":"Printing is not supported in SceneView.","serviceError":"There seems to have been an error.","export":"Export","exportDescription":"Export. Exported files will appear below.","noExportedFiles":"No exported files","exportsTab":"Exports","selectTemplate":"Select template","selectTemplateDescription":"Using a template will apply its values","exportHint":"When you export a file, it will be shown here. Exports are only stored for a short period of time. Download your export to ensure continued access.","template":"Template","a3-landscape":"A3 landscape","a3-portrait":"A3 portrait","a4-landscape":"A4 landscape","a4-portrait":"A4 portrait","letter-ansi-a-landscape":"Letter ANSI A landscape","letter-ansi-a-portrait":"Letter ANSI A portrait","tabloid-ansi-b-landscape":"Tabloid ANSI B landscape","tabloid-ansi-b-portrait":"Tabloid ANSI B portrait","defaultTemplates":"Default templates","organizationTemplates":"Organization templates","chooseTemplate":"Choose template","generatingExport":"Generating export","beta":"Beta","templatesNoLongerAvailable":"Templates are no longer available","templatesNoLongerAvailableDescription":"One or more of your custom templates are no longer available.","myTemplates":"My templates","unsupportedEffects":"Unsupported effects","unsupportedEffectsDescription":"The map contains layers or effects that can't be printed."}
|
|
@@ -2,16 +2,16 @@
|
|
|
2
2
|
All material copyright ESRI, All Rights Reserved, unless otherwise specified.
|
|
3
3
|
See https://js.arcgis.com/4.31/esri/copyright.txt for details.
|
|
4
4
|
*/
|
|
5
|
-
import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";import{OverlayContent as a}from"../views/3d/terrain/OverlayContent.js";import{IntegratedMeshMode as i}from"../views/3d/webgl-engine/collections/Component/Material/ComponentTechniqueConfiguration.js";import{ComponentData as l,ComponentDataType as t}from"../views/3d/webgl-engine/collections/Component/Material/shader/ComponentData.glsl.js";import{VertexDiscardByOpacity as n}from"../views/3d/webgl-engine/collections/Component/Material/shader/VertexDiscardByOpacity.glsl.js";import{ForwardLinearDepth as s}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{ShaderOutput as d}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{SlicePass as
|
|
5
|
+
import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";import{OverlayContent as a}from"../views/3d/terrain/OverlayContent.js";import{IntegratedMeshMode as i}from"../views/3d/webgl-engine/collections/Component/Material/ComponentTechniqueConfiguration.js";import{ComponentData as l,ComponentDataType as t}from"../views/3d/webgl-engine/collections/Component/Material/shader/ComponentData.glsl.js";import{VertexDiscardByOpacity as n}from"../views/3d/webgl-engine/collections/Component/Material/shader/VertexDiscardByOpacity.glsl.js";import{ForwardLinearDepth as s}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{ShaderOutput as d,isColorOrColorEmission as g}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{SlicePass as m}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{NormalType as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{TextureCoordinateAttribute as v}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as u}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VertexNormal as h}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VertexPosition as w}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexPosition.glsl.js";import{OutputDepth as p}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as b}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{ReadLinearDepth as C}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadDepth.glsl.js";import{ComputeMaterialColor as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeMaterialColor.glsl.js";import{ComputeNormalTexture as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{ComputeShadingNormal as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeShadingNormal.glsl.js";import{EvaluateSceneLighting as L,addLightingGlobalFactor as j}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{addMainLightIntensity as O}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{multipassTerrainTest as N}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{PBRMode as M,PhysicallyBasedRenderingParameters as S}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadBaseColorTexture as T}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadBaseColorTexture.glsl.js";import{ReadShadowMapPass as W}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{OverlayIM as $,getIMColorTexture as A}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Overlay.glsl.js";import{alphaCutoff as P}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaCutoff.js";import{DiscardOrAdjustAlphaDraw as D}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{EllipsoidMode as B}from"../views/3d/webgl-engine/core/shaderLibrary/util/EllipsoidMode.js";import{If as R,glsl as z}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as I}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DPassUniform as V}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{outputColorHighlightOID as E}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOID.glsl.js";function H(H){const _=new I;_.include(w,H),_.include(h,H),_.include(u,H),_.include(v,H),_.include(s,H),_.include(l,H),_.include(D,H),_.include(m,H),_.include(T,H),_.include(n,H);const{vertex:F,fragment:G}=_,{output:k,pbrMode:q,hasNormalTexture:U,snowCover:J,receiveShadows:K,spherical:Q,ellipsoidMode:X}=H,Y=q===M.Normal||q===M.Schematic;Y&&(_.include(S,H),U&&_.include(y,H));const Z=k===d.Shadow||k===d.ShadowHighlight||k===d.ShadowExcludeHighlight,ee=Z&&H.componentData===t.Varying;F.code.add(`#define discardShadows(castShadows) { ${R(ee,"if(!castShadows) { gl_Position = vec4(vec3(1e38), 1.0); return; }")} }`);const re=H.integratedMeshMode===i.ColorOverlay||H.integratedMeshMode===i.ColorOverlayWithWater;if(re){_.include(L,H),_.include($,H);const a=X===B.Earth,i=X===B.Earth,l=a?e.radius:i?r.radius:o.radius;F.code.add(`\n ${R(Q,`const float invRadius = ${z.float(1/l)};`)}\n vec2 projectOverlay(vec3 pos) { return pos.xy ${R(Q,"/ (1.0 + invRadius * pos.z);")}; }`)}const oe=re&&g(k)&&q===M.WaterOnIntegratedMesh;if(oe&&(_.varyings.add("tbnTangent","vec3"),_.varyings.add("tbnBiTangent","vec3"),_.varyings.add("groundNormal","vec3")),F.main.add(z`
|
|
6
6
|
bool castShadows;
|
|
7
7
|
vec4 externalColor = forwardExternalColor(castShadows);
|
|
8
8
|
discardShadows(castShadows);
|
|
9
9
|
|
|
10
10
|
vertexDiscardByOpacity(externalColor.a);
|
|
11
11
|
|
|
12
|
-
${
|
|
12
|
+
${k===d.ObjectAndLayerIdColor?z`externalColor.a = 1.0;`:""}
|
|
13
13
|
|
|
14
|
-
if (externalColor.a < ${
|
|
14
|
+
if (externalColor.a < ${z.float(P)}) {
|
|
15
15
|
// Discard this vertex
|
|
16
16
|
gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
|
|
17
17
|
return;
|
|
@@ -23,18 +23,18 @@ import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";imp
|
|
|
23
23
|
forwardVertexColor();
|
|
24
24
|
forwardLinearDepth();
|
|
25
25
|
forwardObjectAndLayerIdColor();
|
|
26
|
-
${
|
|
26
|
+
${oe?Q?z`
|
|
27
27
|
groundNormal = normalize(positionWorld());
|
|
28
28
|
tbnTangent = normalize(cross(vec3(0.0, 0.0, 1.0), groundNormal));
|
|
29
|
-
tbnBiTangent = normalize(cross(groundNormal, tbnTangent));`:
|
|
29
|
+
tbnBiTangent = normalize(cross(groundNormal, tbnTangent));`:z`
|
|
30
30
|
groundNormal = vec3(0.0, 0.0, 1.0);
|
|
31
31
|
tbnTangent = vec3(1.0, 0.0, 0.0);
|
|
32
32
|
tbnBiTangent = vec3(0.0, 1.0, 0.0);`:""}
|
|
33
|
-
${
|
|
34
|
-
`),
|
|
33
|
+
${re?z`setOverlayVTC(projectOverlay(position));`:""}
|
|
34
|
+
`),g(k))return G.include(C),_.include(N,H),_.include(f,H),_.include(x,H),_.include(L,H),_.include(E,H),K&&_.include(W,H),G.code.add(z`
|
|
35
35
|
float evaluateShadow() {
|
|
36
|
-
return ${
|
|
37
|
-
}`),
|
|
36
|
+
return ${K?"readShadowMap(vPositionWorldCameraRelative, linearDepth)":"0.0"};
|
|
37
|
+
}`),re&&G.uniforms.add(new V("ovColorTex",((e,r)=>A(e,r)))),Y&&O(G),G.main.add(z`
|
|
38
38
|
discardBySlice(vPositionWorldCameraRelative);
|
|
39
39
|
terrainDepthTest(vPosition_view.z);
|
|
40
40
|
|
|
@@ -50,35 +50,35 @@ import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";imp
|
|
|
50
50
|
externalColor,
|
|
51
51
|
externalColorMixMode
|
|
52
52
|
);
|
|
53
|
-
${
|
|
54
|
-
`),
|
|
53
|
+
${re?z`vec4 overlayColor = getOverlayColor(ovColorTex, vtcOverlay);`:""}
|
|
54
|
+
`),Y?G.main.add(z`
|
|
55
55
|
applyPBRFactors();
|
|
56
|
-
${
|
|
56
|
+
${R(q===M.Normal,z`if (int(externalColorMixMode) == 3) {
|
|
57
57
|
mrr = vec3(0.0, 0.6, 0.2);
|
|
58
58
|
}`)}
|
|
59
59
|
vec3 normalVertex = shadingNormalWorld();
|
|
60
60
|
float additionalIrradiance = 0.02 * mainLightIntensity[2];
|
|
61
|
-
${
|
|
62
|
-
vec3 shadingNormal = ${
|
|
63
|
-
vec3 normalGround = ${
|
|
61
|
+
${R(U,"mat3 tangentSpace = computeTangentSpace(normalVertex, vPositionWorldCameraRelative, vuv0);")}
|
|
62
|
+
vec3 shadingNormal = ${U?"computeTextureNormal(tangentSpace, vuv0)":"normalVertex"};
|
|
63
|
+
vec3 normalGround = ${Q?z`normalize(positionWorld())`:z`vec3(0.0, 0.0, 1.0)`};
|
|
64
64
|
|
|
65
65
|
vec3 viewDir = normalize(vPositionWorldCameraRelative);
|
|
66
66
|
float ssao = 1.0 - occlusion * evaluateAmbientOcclusionInverse();
|
|
67
|
-
${
|
|
67
|
+
${R(J,z`vec3 surfaceNormal = normalize(shadingNormalWorld());
|
|
68
68
|
float snow = smoothstep(0.5, 0.55, dot(surfaceNormal, normalize(positionWorld())));
|
|
69
69
|
materialColor.rgb = mix(materialColor.rgb, vec3(1.1), snow);
|
|
70
70
|
ssao = mix(ssao, 0.5 * ssao, snow);
|
|
71
71
|
shadingNormal = mix(shadingNormal, surfaceNormal, snow);`)}
|
|
72
|
-
${
|
|
72
|
+
${R(re,"materialColor = materialColor * (1.0 - overlayColor.a) + overlayColor;")}
|
|
73
73
|
|
|
74
74
|
vec3 additionalLight = evaluateAdditionalLighting(ssao, positionWorld());
|
|
75
75
|
vec4 emission = getEmissions();
|
|
76
76
|
vec4 shadedColor = vec4(evaluateSceneLightingPBR(shadingNormal, materialColor.rgb, evaluateShadow(), ssao, additionalLight, viewDir, normalGround, mrr, emission, additionalIrradiance), materialColor.a);
|
|
77
|
-
`):(!
|
|
78
|
-
${
|
|
79
|
-
float shadow = ${
|
|
77
|
+
`):(!K&&Q&&j(G),oe&&G.uniforms.add(new V("ovNormalTex",((e,r)=>r.overlay?.getTexture(a.WaterNormal)))),G.main.add(z`
|
|
78
|
+
${R(!K&&Q,"float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());")}
|
|
79
|
+
float shadow = ${K?"evaluateShadow()":Q?"lightingGlobalFactor * (1.0 - additionalAmbientScale)":"0.0"};
|
|
80
80
|
|
|
81
|
-
${
|
|
81
|
+
${R(J,z`vec3 surfaceNormal = normalize(cross(dFdx(vPositionWorldCameraRelative), dFdy(vPositionWorldCameraRelative)));
|
|
82
82
|
float snow = smoothstep(0.5, 0.55, dot(surfaceNormal, normalize(positionWorld())));
|
|
83
83
|
materialColor.rgb = mix(materialColor.rgb, vec3(1), snow);`)}
|
|
84
84
|
|
|
@@ -86,10 +86,10 @@ import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";imp
|
|
|
86
86
|
float ambientOcclusion = evaluateAmbientOcclusion();
|
|
87
87
|
vec3 additionalLight = evaluateAdditionalLighting(ambientOcclusion, positionWorld());
|
|
88
88
|
|
|
89
|
-
${
|
|
89
|
+
${re?z` materialColor = materialColor * (1.0 - overlayColor.a) + overlayColor;`:""}
|
|
90
90
|
|
|
91
91
|
vec4 shadedColor = vec4(evaluateSceneLighting(shadingNormalWorld(), materialColor.rgb, shadow, ambientOcclusion, additionalLight), materialColor.a);
|
|
92
|
-
${
|
|
92
|
+
${R(oe,z`vec4 overlayWaterMask = getOverlayColor(ovNormalTex, vtcOverlay);
|
|
93
93
|
float waterNormalLength = length(overlayWaterMask);
|
|
94
94
|
if (waterNormalLength > 0.95) {
|
|
95
95
|
mat3 tbnMatrix = mat3(tbnTangent, tbnBiTangent, groundNormal);
|
|
@@ -98,20 +98,20 @@ import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";imp
|
|
|
98
98
|
// un-gamma the ground color to mix in linear space
|
|
99
99
|
shadedColor = mix(shadedColor, waterColorNonLinear, waterColorLinear.w);
|
|
100
100
|
}`)}
|
|
101
|
-
`)),
|
|
101
|
+
`)),G.main.add(z`outputColorHighlightOID(shadedColor, vPositionWorldCameraRelative);`),_;const ae=k===d.Normal,ie=k===d.ObjectAndLayerIdColor,le=k===d.Highlight,te=Z||k===d.ViewshedShadow;return te&&_.include(p,H),ae&&_.include(x,H),_.include(b,H),G.main.add(z`
|
|
102
102
|
discardBySlice(vPositionWorldCameraRelative);
|
|
103
103
|
|
|
104
104
|
vec4 textureColor = readBaseColorTexture();
|
|
105
105
|
discardOrAdjustAlpha(textureColor);
|
|
106
106
|
|
|
107
|
-
${
|
|
108
|
-
${
|
|
107
|
+
${R(te,"outputDepth(linearDepth);")}
|
|
108
|
+
${R(ae,z`float alpha = ${H.normalType===c.Ground?"0.0":"1.0"};
|
|
109
109
|
fragColor = vec4(vec3(.5) + .5 * shadingNormal_view(), alpha);`)}
|
|
110
|
-
${
|
|
111
|
-
${
|
|
110
|
+
${R(ie,re?"fragColor = getOverlayColorTexel(vtcOverlay);":"outputObjectAndLayerIdColor();")}
|
|
111
|
+
${R(le,z`${R(re,z`vec4 overlayHighlightBits = getCombinedOverlayColor();
|
|
112
112
|
if (overlayHighlightBits == vec4(0.0)) {
|
|
113
113
|
fragHighlight = vec4(0.0);
|
|
114
114
|
return;
|
|
115
115
|
}`)}
|
|
116
116
|
outputHighlight();`)}
|
|
117
|
-
`),
|
|
117
|
+
`),_}const _=Object.freeze(Object.defineProperty({__proto__:null,build:H},Symbol.toStringTag,{value:"Module"}));export{_ as C,H as b};
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
All material copyright ESRI, All Rights Reserved, unless otherwise specified.
|
|
3
3
|
See https://js.arcgis.com/4.31/esri/copyright.txt for details.
|
|
4
4
|
*/
|
|
5
|
-
import{ForwardLinearDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{Offset as r}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{
|
|
5
|
+
import{ForwardLinearDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{Offset as r}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{isColorOrColorEmission as o}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{SliceDraw as i}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as a}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as l}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as s,NormalType as n}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{PositionAttribute as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/PositionAttribute.glsl.js";import{SymbolColor as d}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/SymbolColor.glsl.js";import{TextureCoordinateAttribute as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as m}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VertexNormal as g}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VerticalOffset as v}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as u}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{ComputeNormalTexture as b}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{EvaluateAmbientOcclusion as w}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as h,addAmbientBoostFactor as p,addLightingGlobalFactor as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{addMainLightIntensity as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{multipassTerrainTest as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{Normals as L}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{PhysicallyBasedRendering as C}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as j,PBRMode as P}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMapPass as O,ReadShadowMapDraw as N}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{colorTextureUV as T,normalTextureUV as S,emissiveTextureUV as A,occlusionTextureUV as M,metallicRoughnessTextureUV as V}from"../views/3d/webgl-engine/core/shaderLibrary/shading/TextureTransformUV.glsl.js";import{VisualVariables as $}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{alphaCutoff as E}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaCutoff.js";import{DiscardOrAdjustAlphaPass as D}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{MixExternalColor as U}from"../views/3d/webgl-engine/core/shaderLibrary/util/MixExternalColor.glsl.js";import{addProjViewLocalOrigin as I,addCameraPosition as B}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3PassUniform as _}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{Float4PassUniform as F}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as R}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as z,If as W}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as G}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DPassUniform as k}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{VertexAttribute as H}from"../views/3d/webgl-engine/lib/VertexAttribute.js";import{outputColorHighlightOID as q}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOID.glsl.js";function J(J){const K=new G,{vertex:Q,fragment:X,varyings:Y}=K,{output:Z,normalType:ee,offsetBackfaces:re,instancedColor:oe,spherical:ie,receiveShadows:ae,snowCover:le,pbrMode:se}=J,{multipassEnabled:ne,textureAlphaPremultiplied:te,instancedDoublePrecision:de,hasVertexColors:ce,hasVertexTangents:me}=J,{hasColorTexture:ge,hasNormalTexture:ve,hasNormalTextureTransform:ue,hasColorTextureTransform:be}=J;if(I(Q,J),K.include(t),Y.add("vpos","vec3"),K.include($,J),K.include(l,J),K.include(v,J),K.include(T,J),!o(Z))return K.include(u,J),K;K.include(S,J),K.include(A,J),K.include(M,J),K.include(V,J),B(Q,J),K.include(s,J),K.include(a,J);const we=ee===n.Attribute||ee===n.Compressed;return we&&re&&K.include(r),K.include(b,J),K.include(g,J),oe&&K.attributes.add(H.INSTANCECOLOR,"vec4"),Y.add("vPositionLocal","vec3"),K.include(c,J),K.include(e,J),K.include(d,J),K.include(m,J),Q.uniforms.add(new F("externalColor",(e=>e.externalColor))),Y.add("vcolorExt","vec4"),ne&&Y.add("depth","float"),Q.main.add(z`
|
|
6
6
|
forwardNormalizedVertexColor();
|
|
7
7
|
vcolorExt = externalColor;
|
|
8
8
|
${W(oe,"vcolorExt *= instanceColor * 0.003921568627451;")}
|
package/chunks/Path.glsl.js
CHANGED
|
@@ -2,43 +2,48 @@
|
|
|
2
2
|
All material copyright ESRI, All Rights Reserved, unless otherwise specified.
|
|
3
3
|
See https://js.arcgis.com/4.31/esri/copyright.txt for details.
|
|
4
4
|
*/
|
|
5
|
-
import{ForwardLinearDepth as e,addNearFar as i}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{ShaderOutput as
|
|
5
|
+
import{ForwardLinearDepth as e,addNearFar as i}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{ShaderOutput as a}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{SliceDraw as o}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as r}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{ObjectAndLayerIdColor as l}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/ObjectAndLayerIdColor.glsl.js";import{PathVertexPosition as n}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/PathVertexPosition.glsl.js";import{OutputDepth as s}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as d}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{EvaluateAmbientOcclusion as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as c,addAmbientBoostFactor as g,addLightingGlobalFactor as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{addMainLightIntensity as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{multipassTerrainTest as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{Normals as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{NormalUtils as u}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PhysicallyBasedRenderingParameters as b,PBRMode as w}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMapDraw as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{ColorConversion as y}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{addProjViewLocalOrigin as j,addViewNormal as L,addCameraPosition as P}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3PassUniform as S}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{FloatPassUniform as O}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as C,If as A}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as D}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{outputColorHighlightOID as I}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOID.glsl.js";function B(B){const F=new D,{vertex:M,fragment:_}=F;j(M,B),F.varyings.add("vpos","vec3"),F.include(n,B);const{output:V,spherical:z,pbrMode:E,receiveShadows:H}=B;switch(V!==a.Color&&V!==a.ObjectAndLayerIdColor||(F.include(r,B),F.include(f,B),F.include(e,B),F.include(l,B),F.varyings.add("vnormal","vec3"),F.varyings.add("vcolor","vec4"),B.multipassEnabled&&F.varyings.add("depth","float"),M.main.add(C`
|
|
6
6
|
vpos = calculateVPos();
|
|
7
7
|
vnormal = normalize(localNormal());
|
|
8
8
|
|
|
9
|
-
${
|
|
9
|
+
${B.multipassEnabled?"depth = (view * vec4(vpos, 1.0)).z;":""}
|
|
10
10
|
gl_Position = transformPosition(proj, view, vpos);
|
|
11
11
|
|
|
12
|
-
${
|
|
12
|
+
${V===a.Color?"forwardLinearDepth();":""}
|
|
13
13
|
forwardObjectAndLayerIdColor();
|
|
14
14
|
|
|
15
|
-
vcolor = getColor();`)),
|
|
15
|
+
vcolor = getColor();`)),F.include(p,B),V){case a.Color:F.include(b,B),F.include(c,B),F.include(t,B),F.include(f,B),F.include(h,B),F.include(o,B),F.include(I,B),P(_,B),g(_),m(_),_.uniforms.add(M.uniforms.get("localOrigin"),new S("ambient",(e=>e.ambient)),new S("diffuse",(e=>e.diffuse)),new S("specular",(e=>e.specular)),new O("opacity",(e=>e.opacity))),_.include(y),v(_),_.main.add(C`
|
|
16
16
|
discardBySlice(vpos);
|
|
17
|
-
${
|
|
17
|
+
${B.multipassEnabled?C`terrainDepthTest(depth);`:""}
|
|
18
18
|
|
|
19
19
|
shadingParams.viewDirection = normalize(vpos - cameraPosition);
|
|
20
20
|
shadingParams.normalView = vnormal;
|
|
21
21
|
vec3 normal = shadingNormal(shadingParams);
|
|
22
22
|
float ssao = evaluateAmbientOcclusionInverse();
|
|
23
23
|
|
|
24
|
-
|
|
24
|
+
vec3 posWorld = vpos + localOrigin;
|
|
25
|
+
vec3 normalGround = ${z?"normalize(posWorld);":"vec3(0.0, 0.0, 1.0);"}
|
|
26
|
+
|
|
27
|
+
float additionalAmbientScale = additionalDirectedAmbientLight(posWorld);
|
|
25
28
|
vec3 additionalLight = ssao * mainLightIntensity * additionalAmbientScale * ambientBoostFactor * lightingGlobalFactor;
|
|
26
|
-
|
|
29
|
+
float shadow = ${H?"readShadowMap(vpos, linearDepth);":z?"lightingGlobalFactor * (1.0 - additionalAmbientScale);":"0.0;"}
|
|
27
30
|
vec3 albedo = vcolor.rgb * max(ambient, diffuse); // combine the old material parameters into a single one
|
|
28
31
|
float combinedOpacity = vcolor.a * opacity;
|
|
29
32
|
albedo += 0.25 * specular; // don't completely ignore specular for now
|
|
30
33
|
|
|
31
|
-
|
|
34
|
+
${A(E===w.Schematic,"float additionalAmbientIrradiance = additionalAmbientIrradianceFactor * mainLightIntensity[2];\n vec4 emission = getEmissions();")}
|
|
35
|
+
|
|
36
|
+
vec3 shadedColor = ${E===w.Schematic?"evaluateSceneLightingPBR(normal, albedo, shadow, 1.0 - ssao, additionalLight, shadingParams.viewDirection, normalGround, mrr, emission, additionalAmbientIrradiance);":"evaluateSceneLighting(normal, albedo, shadow, 1.0 - ssao, additionalLight);"}
|
|
32
37
|
vec4 finalColor = vec4(shadedColor, combinedOpacity);
|
|
33
|
-
outputColorHighlightOID(finalColor, vpos);`);break;case
|
|
34
|
-
gl_Position = transformPosition(proj, view, vpos);`),
|
|
35
|
-
gl_Position = transformPositionWithDepth(proj, view, vpos, nearFar, depth);`),
|
|
36
|
-
outputDepth(depth);`);break;case
|
|
37
|
-
outputObjectAndLayerIdColor();`);break;case
|
|
38
|
+
outputColorHighlightOID(finalColor, vpos);`);break;case a.Depth:F.include(r,B),M.main.add(C`vpos = calculateVPos();
|
|
39
|
+
gl_Position = transformPosition(proj, view, vpos);`),F.include(o,B),_.main.add(C`discardBySlice(vpos);`);break;case a.Shadow:case a.ShadowHighlight:case a.ShadowExcludeHighlight:case a.ViewshedShadow:F.include(r,B),i(F),F.varyings.add("depth","float"),M.main.add(C`vpos = calculateVPos();
|
|
40
|
+
gl_Position = transformPositionWithDepth(proj, view, vpos, nearFar, depth);`),F.include(o,B),F.include(s,B),_.main.add(C`discardBySlice(vpos);
|
|
41
|
+
outputDepth(depth);`);break;case a.ObjectAndLayerIdColor:F.include(o,B),_.main.add(C`discardBySlice(vpos);
|
|
42
|
+
outputObjectAndLayerIdColor();`);break;case a.Normal:F.include(r,B),F.include(u,B),L(M),F.varyings.add("vnormal","vec3"),M.main.add(C`vpos = calculateVPos();
|
|
38
43
|
vnormal = normalize((viewNormal * vec4(localNormal(), 1.0)).xyz);
|
|
39
|
-
gl_Position = transformPosition(proj, view, vpos);`),
|
|
44
|
+
gl_Position = transformPosition(proj, view, vpos);`),F.include(o,B),_.main.add(C`discardBySlice(vpos);
|
|
40
45
|
vec3 normal = normalize(vnormal);
|
|
41
46
|
if (gl_FrontFacing == false) normal = -normal;
|
|
42
|
-
fragColor = vec4(vec3(0.5) + 0.5 * normal, 1.0);`);break;case
|
|
43
|
-
gl_Position = transformPosition(proj, view, vpos);`),
|
|
44
|
-
outputHighlight();`)}return
|
|
47
|
+
fragColor = vec4(vec3(0.5) + 0.5 * normal, 1.0);`);break;case a.Highlight:F.include(r,B),F.include(u,B),F.varyings.add("vnormal","vec3"),M.main.add(C`vpos = calculateVPos();
|
|
48
|
+
gl_Position = transformPosition(proj, view, vpos);`),F.include(o,B),F.include(d,B),_.main.add(C`discardBySlice(vpos);
|
|
49
|
+
outputHighlight();`)}return F}const F=Object.freeze(Object.defineProperty({__proto__:null,build:B},Symbol.toStringTag,{value:"Module"}));export{F as P,B as b};
|
package/exports/csv.js
CHANGED
|
@@ -2,4 +2,4 @@
|
|
|
2
2
|
All material copyright ESRI, All Rights Reserved, unless otherwise specified.
|
|
3
3
|
See https://js.arcgis.com/4.31/esri/copyright.txt for details.
|
|
4
4
|
*/
|
|
5
|
-
import e from"../core/
|
|
5
|
+
import e from"../core/Logger.js";import t from"../layers/support/Field.js";function n(e){return Object.keys(e.attributes).map((n=>{const i=e.attributes[n];return"objectid"===n.toLowerCase()||"fid"===n.toLowerCase()?new t({name:n,alias:n,type:"oid"}):new t("number"==typeof i?{name:n,alias:n,type:"double"}:{name:n,alias:n,type:"string"})}))}function i(e){if(!e.fields){const t=e.features[0];if(t.layer){e.fields=t.layer.fields;const n=Object.keys(t.attributes),i=e.fields.filter((e=>n.includes(e.name)));e.fields=i}else e.fields=n(t)}return e}function o(e){return e.map((({attributes:e})=>e))}function r(e){const{delimiter:t,fields:n=[],outFields:i=[]}=e,o=t||",",r=n.map((e=>e.name));return e=>{let t="";return r.filter((e=>i.includes(e))).forEach((i=>{const r=n.find((({name:e})=>e===i));let a=e[i]||"";if("date"===r?.type&&(a=new Date(a).toString()),r?.domain&&"coded-value"===r.domain.type){const e=r.domain.codedValues.find((e=>a===e.code));e&&(a=e.name)}"string"==typeof a&&a.includes(o)&&(a=`"${a}"`),t+=`${a}${o}`})),`${t}\r\n`}}async function a(n,{includeGeometry:a=!0,delimiter:l=",",outFields:s=["*"]}={}){n=i(n),a&&"point"!==n.geometryType&&e.getLogger("esri.exports.csv").warn(`The input geometry ${n.geometryType} is not supported. Geometry will be excluded from export.`);const{features:d}=n;if(!d.length)return null;let u=n.fields;const[m]=s;"*"===m&&(s=u.map((e=>e.name))),a&&"point"===n.geometryType&&(u.some((e=>"x"===e.name||"y"===e.name))||(u=[...u,new t({name:"lon",alias:"Longitude",type:"double"}),new t({name:"lat",alias:"Latitude",type:"double"})],s=[...s,"lon","lat"]),d.forEach((({attributes:e,geometry:t})=>{e.lon="point"===t?.type?t.longitude:null,e.lat="point"===t?.type?t.latitude:null}))),u=u.filter((e=>s.includes(e.name)));const p=l||",",c=o(d),f=u.map((e=>e.name)).join(p),y=r({delimiter:p,outFields:s||u.map((e=>e.name)),fields:u});let g=`${f}${p}\r\n`;c.forEach((e=>{g+=y(e)}));const b=new RegExp(`${p}\r\n\\s*$`,"g");return g.replace(b,"")}export{r as attributeToString,a as convertFeaturesToCSV,o as extractAttributes,n as extractFieldsFromFeature,i as validateFeatureSetFields};
|
package/interfaces.d.ts
CHANGED
|
@@ -106701,7 +106701,7 @@ declare namespace __esri {
|
|
|
106701
106701
|
*
|
|
106702
106702
|
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable.html#maxSize)
|
|
106703
106703
|
*/
|
|
106704
|
-
|
|
106704
|
+
maxSize: number;
|
|
106705
106705
|
/**
|
|
106706
106706
|
* Set this object to customize the feature table's menu content.
|
|
106707
106707
|
*
|
|
@@ -106881,11 +106881,11 @@ declare namespace __esri {
|
|
|
106881
106881
|
*/
|
|
106882
106882
|
deleteSelection(showWarningPrompt?: boolean): Promise<void>;
|
|
106883
106883
|
/**
|
|
106884
|
-
*
|
|
106884
|
+
* Exports features associated with currently selected rows to a CSV file and displays a download prompt.
|
|
106885
106885
|
*
|
|
106886
106886
|
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable.html#exportSelectionToCSV)
|
|
106887
106887
|
*/
|
|
106888
|
-
exportSelectionToCSV(): void
|
|
106888
|
+
exportSelectionToCSV(includeGeometry?: boolean): Promise<void>;
|
|
106889
106889
|
/**
|
|
106890
106890
|
* Filters the table by the current selection.
|
|
106891
106891
|
*
|
|
@@ -107106,6 +107106,12 @@ declare namespace __esri {
|
|
|
107106
107106
|
| (KnowledgeGraphSublayerProperties & { type: "knowledge-graph-sublayer" })
|
|
107107
107107
|
| (SceneLayerProperties & { type: "scene" })
|
|
107108
107108
|
| (WFSLayerProperties & { type: "wfs" });
|
|
107109
|
+
/**
|
|
107110
|
+
* Applies a limit to the total number of features displayed in the table.
|
|
107111
|
+
*
|
|
107112
|
+
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable.html#maxSize)
|
|
107113
|
+
*/
|
|
107114
|
+
maxSize?: number;
|
|
107109
107115
|
/**
|
|
107110
107116
|
* Set this object to customize the feature table's menu content.
|
|
107111
107117
|
*
|
|
@@ -107488,7 +107494,7 @@ declare namespace __esri {
|
|
|
107488
107494
|
*
|
|
107489
107495
|
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#maxSize)
|
|
107490
107496
|
*/
|
|
107491
|
-
|
|
107497
|
+
maxSize: number;
|
|
107492
107498
|
/**
|
|
107493
107499
|
* Controls whether the table allows multiple selected rows.
|
|
107494
107500
|
*
|
|
@@ -107528,7 +107534,7 @@ declare namespace __esri {
|
|
|
107528
107534
|
*
|
|
107529
107535
|
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#pageIndex)
|
|
107530
107536
|
*/
|
|
107531
|
-
|
|
107537
|
+
pageIndex: number;
|
|
107532
107538
|
/**
|
|
107533
107539
|
* The default page size used when displaying features within the table.
|
|
107534
107540
|
*
|
|
@@ -107642,7 +107648,13 @@ declare namespace __esri {
|
|
|
107642
107648
|
*
|
|
107643
107649
|
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#deleteSelection)
|
|
107644
107650
|
*/
|
|
107645
|
-
deleteSelection(
|
|
107651
|
+
deleteSelection(): Promise<void>;
|
|
107652
|
+
/**
|
|
107653
|
+
* Exports features associated with currently selected rows to a CSV file and displays a download prompt.
|
|
107654
|
+
*
|
|
107655
|
+
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#exportSelectionToCSV)
|
|
107656
|
+
*/
|
|
107657
|
+
exportSelectionToCSV(includeGeometry?: boolean): Promise<void>;
|
|
107646
107658
|
/**
|
|
107647
107659
|
* Filters the table using the current row selection and displays only those selected table rows.
|
|
107648
107660
|
*
|
|
@@ -107830,6 +107842,12 @@ declare namespace __esri {
|
|
|
107830
107842
|
| (KnowledgeGraphSublayerProperties & { type: "knowledge-graph-sublayer" })
|
|
107831
107843
|
| (SceneLayerProperties & { type: "scene" })
|
|
107832
107844
|
| (WFSLayerProperties & { type: "wfs" });
|
|
107845
|
+
/**
|
|
107846
|
+
* Applies a limit to the total number of features displayed in the table.
|
|
107847
|
+
*
|
|
107848
|
+
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#maxSize)
|
|
107849
|
+
*/
|
|
107850
|
+
maxSize?: number;
|
|
107833
107851
|
/**
|
|
107834
107852
|
* Controls whether the table allows multiple selected rows.
|
|
107835
107853
|
*
|
|
@@ -107858,6 +107876,12 @@ declare namespace __esri {
|
|
|
107858
107876
|
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#outFields)
|
|
107859
107877
|
*/
|
|
107860
107878
|
outFields?: string[];
|
|
107879
|
+
/**
|
|
107880
|
+
* Represents the index of the page of feature currently being displayed.
|
|
107881
|
+
*
|
|
107882
|
+
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#pageIndex)
|
|
107883
|
+
*/
|
|
107884
|
+
pageIndex?: number;
|
|
107861
107885
|
/**
|
|
107862
107886
|
* The default page size used when displaying features within the table.
|
|
107863
107887
|
*
|
|
@@ -115026,7 +115050,7 @@ declare namespace __esri {
|
|
|
115026
115050
|
*
|
|
115027
115051
|
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#exportedLinks)
|
|
115028
115052
|
*/
|
|
115029
|
-
|
|
115053
|
+
exportedLinks: Collection<FileLink>;
|
|
115030
115054
|
/**
|
|
115031
115055
|
* This option allows passing extra parameters (in addition to [templateOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#templateOptions)) to the print (export webmap) requests.
|
|
115032
115056
|
*
|
|
@@ -115120,6 +115144,12 @@ declare namespace __esri {
|
|
|
115120
115144
|
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#allowedLayouts)
|
|
115121
115145
|
*/
|
|
115122
115146
|
allowedLayouts?: string | string[];
|
|
115147
|
+
/**
|
|
115148
|
+
* The collection of links exported from the Print widget.
|
|
115149
|
+
*
|
|
115150
|
+
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#exportedLinks)
|
|
115151
|
+
*/
|
|
115152
|
+
exportedLinks?: CollectionProperties<FileLink>;
|
|
115123
115153
|
/**
|
|
115124
115154
|
* This option allows passing extra parameters (in addition to [templateOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#templateOptions)) to the print (export webmap) requests.
|
|
115125
115155
|
*
|
|
@@ -115308,8 +115338,6 @@ declare namespace __esri {
|
|
|
115308
115338
|
* [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-PrintViewModel.html#includeDefaultTemplates)
|
|
115309
115339
|
*/
|
|
115310
115340
|
includeDefaultTemplates: boolean;
|
|
115311
|
-
readonly layoutTemplateInfo: any;
|
|
115312
|
-
readonly layoutTemplateNorthArrowInfo: any;
|
|
115313
115341
|
/**
|
|
115314
115342
|
* It is possible to search a specified portal instance's [locator services](https://enterprise.arcgis.com/en/portal/latest/administer/windows/configure-portal-to-geocode-addresses.htm).
|
|
115315
115343
|
*
|
package/package.json
CHANGED
package/support/revision.js
CHANGED
|
@@ -2,4 +2,4 @@
|
|
|
2
2
|
All material copyright ESRI, All Rights Reserved, unless otherwise specified.
|
|
3
3
|
See https://js.arcgis.com/4.31/esri/copyright.txt for details.
|
|
4
4
|
*/
|
|
5
|
-
const
|
|
5
|
+
const d="20240822",b="3e296894cf581b3d92bc8df50b92af328d12a12d";export{d as buildDate,b as commitHash};
|
|
@@ -2,4 +2,4 @@
|
|
|
2
2
|
All material copyright ESRI, All Rights Reserved, unless otherwise specified.
|
|
3
3
|
See https://js.arcgis.com/4.31/esri/copyright.txt for details.
|
|
4
4
|
*/
|
|
5
|
-
import i from"../../../core/Collection.js";import{HighlightGroup as t}from"./HighlightGroup.js";import
|
|
5
|
+
import i from"../../../core/Collection.js";import{HighlightGroup as t}from"./HighlightGroup.js";import n from"./HighlightOptions.js";const o=i.ofType(t);function e(){return new o([{name:"default",options:new n},{name:"popup",options:new n({color:"teal"})},{name:"temporary",options:new n({color:"yellow"})}])}function h(i){if(!i.highlights)return null;const t=i.highlights.findIndex((i=>"default"===i.name));return-1===t?null:i.highlights.items[t].options}function l(i,t){if(!i.highlights){if(!t)return;i.highlights=new o([{name:"default",options:new n}])}const e=i.highlights.findIndex((i=>"default"===i.name));t?i.highlights.items[e].options=t:i.highlights.removeAt(e)}export{e as createInitialHighlightGroups,h as getDefaultHighlightOptions,l as setDefaultHighlightOptions};
|