diff --git a/.cspell/custom-dictionary.txt b/.cspell/custom-dictionary.txt index 3534607a..2d38ded8 100644 --- a/.cspell/custom-dictionary.txt +++ b/.cspell/custom-dictionary.txt @@ -28,6 +28,7 @@ nojekyll noopener noreferrer NOSONAR +Noto osmzoom RDWY Rrts diff --git a/src/layers/MilepostLayer/symbol/beginOverride.arcade b/src/layers/MilepostLayer/symbol/beginOverride.arcade index e34c1659..1568495b 100644 --- a/src/layers/MilepostLayer/symbol/beginOverride.arcade +++ b/src/layers/MilepostLayer/symbol/beginOverride.arcade @@ -1,15 +1,15 @@ -Console("beginOverride.arcade begins") - -Console($feature); - +// Determine if the route segment has an end SRMP attribute. +// Locations located by user click will not have an end SRMP attribute. +// If the end SRMP is greater than the begin SRMP, then the +// mileposts displayed at the route ends need to be reversed. var showEnd = HasKey($feature, "EndSrmp") && $feature.EndSrmp != null && $feature.Srmp > $feature.EndSrmp; +// Get the appropriate SRMP and back indicator values based on the showEnd flag. var srmp = IIf(showEnd, $feature.EndSrmp, $feature.Srmp); +// The Back attribute should always be either a "B" or an empty string. var back = IIf(showEnd, $feature.EndBack, $feature.Back); +// Create the label string var output = `${$feature.Route}\n${Text(srmp, "#.##")}${back}`; - - -Console("beginOverride.arcade ends") return output; \ No newline at end of file diff --git a/src/layers/MilepostLayer/symbol/endOverride.arcade b/src/layers/MilepostLayer/symbol/endOverride.arcade deleted file mode 100644 index b6796dfe..00000000 --- a/src/layers/MilepostLayer/symbol/endOverride.arcade +++ /dev/null @@ -1,5 +0,0 @@ -IIf( - $feature.SRMP > $feature.EndSrmp, - `${$feature.Route}\n${$feature.SRMP}${$feature.Back}`, - `${$feature.Route}\n${$feature.EndSrmp}${$feature.EndBack}` -) \ No newline at end of file diff --git a/src/layers/MilepostLayer/symbol/index.ts b/src/layers/MilepostLayer/symbol/index.ts index 61ed5562..fba2fcb3 100644 --- a/src/layers/MilepostLayer/symbol/index.ts +++ b/src/layers/MilepostLayer/symbol/index.ts @@ -1,8 +1,5 @@ import CIMSymbol from "@arcgis/core/symbols/CIMSymbol"; -import { - endMilepostLabelPrimitiveOverride, - milepostLabelPrimitiveOverride, -} from "./primitiveOverrides"; +import { milepostLabelPrimitiveOverride } from "./primitiveOverrides"; const cimCallout: __esri.CIMBackgroundCallout = { type: "CIMBackgroundCallout", @@ -100,11 +97,6 @@ const cimPointSymbol: __esri.CIMPointSymbol = { angleAlignment: "Display", }; -const endpointCimPointSymbol: __esri.CIMPointSymbol = { - ...cimPointSymbol, - symbolLayers: [segmentEndpointCimVectorMarker], -}; - export const milepostSymbol = new CIMSymbol({ data: { primitiveOverrides: [milepostLabelPrimitiveOverride], @@ -112,14 +104,3 @@ export const milepostSymbol = new CIMSymbol({ symbol: cimPointSymbol, }, }); - -export const endpointMilepostSymbol = new CIMSymbol({ - data: { - primitiveOverrides: [ - milepostLabelPrimitiveOverride, - endMilepostLabelPrimitiveOverride, - ], - type: "CIMSymbolReference", - symbol: endpointCimPointSymbol, - }, -}); diff --git a/src/layers/MilepostLayer/symbol/primitiveOverrides.ts b/src/layers/MilepostLayer/symbol/primitiveOverrides.ts index ddccce2a..376ebd79 100644 --- a/src/layers/MilepostLayer/symbol/primitiveOverrides.ts +++ b/src/layers/MilepostLayer/symbol/primitiveOverrides.ts @@ -1,5 +1,4 @@ import beginOverride from "./beginOverride.arcade?raw"; -import endOverride from "./endOverride.arcade?raw"; /** * The expression info for the primitive override for the milepost label symbol. @@ -11,15 +10,6 @@ const beginMilepostExpressionInfo = { returnType: "String", } as const; -/** - * The expression info for the primitive override for the end milepost label symbol. - * This will be used on the route segment line layer. - */ -const endMilepostExpressionInfo = { - ...beginMilepostExpressionInfo, - expression: endOverride, -} as const; - /** * The primitive override for the milepost label symbol. * This will be used on the milepost line layer. @@ -30,13 +20,3 @@ export const milepostLabelPrimitiveOverride = { type: "CIMPrimitiveOverride", valueExpressionInfo: beginMilepostExpressionInfo, } as const; - -/** - * The primitive override for the end milepost label symbol. - * This will be used on the route segment line layer. - */ -export const endMilepostLabelPrimitiveOverride = { - ...milepostLabelPrimitiveOverride, - primitiveName: "endMilepostLabel", - valueExpressionInfo: endMilepostExpressionInfo, -} as const;