Symbology/restore srmp to marker label (#498)

* fix: 🐛 user click marker does not show milepost, only route
* refactor: include alpha in highwaySignBackgroundColor
* chore: move ArcGIS Pro project
* chore: modify ArcGIS Pro symbology
* feat: remove route name from label

fixes #74455

.gitattributes

@@ -300,7 +300,10 @@ Procfile          text
 *.*ignore         text
 # Prevents massive diffs from built files
 dist/*            binary
-
-
-
 *.stylx filter=lfs diff=lfs merge=lfs -text
+*.aprx filter=lfs diff=lfs merge=lfs -text
+*.gpkg filter=lfs diff=lfs merge=lfs -text
+*.sde filter=lfs diff=lfs merge=lfs -text
+*.atbx filter=lfs diff=lfs merge=lfs -text
+*.lyrx filter=lfs diff=lfs merge=lfs -text
+*.lpkx filter=lfs diff=lfs merge=lfs -text

src/colors.ts

@@ -3,7 +3,7 @@ import Color from "@arcgis/core/Color";
 /**
  * The shade of green for the background of highway signs.
  */
-export const highwaySignBackgroundColor = new Color("#01735c");
+export const highwaySignBackgroundColor = new Color([1, 115, 92, 255]);
 /**
  * The white outline around a sign, which is equivalent to "#ffffff" or "white".
  */

src/layers/MilepostLayer/arcade/Route Segment Label.arcade

@@ -16,16 +16,16 @@ function formatSrmp(srmp, abIndicator) {
   return Text(srmp, "#.##") + IIf(Upper(abIndicator) == "B", "B", "")
 }
 
-Console("Begin SRMP", $feature.Srmp)
-Console("Back", $feature.Back)
-Console("End SRMP", $feature.EndSrmp)
-Console("End Back", $feature.EndBack)
-Console("Direction", $feature.Direction)
-
-var beginSrmp = formatSrmp($feature.Srmp, $feature.Back)
-var dir = $feature.Direction
-if (HasKey($feature, "EndSrmp")) {
-  var endSrmp = formatSrmp($feature.EndSrmp, $feature.EndBack)
-  return `${$feature.Route} (${dir}): ${beginSrmp} — ${endSrmp}`
+function createLabel(includeRoute) {
+  var beginSrmp = formatSrmp($feature.Srmp, $feature.Back)
+  var dir = $feature.Direction
+  var output = IIf(includeRoute, `${$feature.Route} (${dir}): `, "")
+  output += `${beginSrmp}`
+  if (HasKey($feature, "EndSrmp")) {
+    var endSrmp = formatSrmp($feature.EndSrmp, $feature.EndBack)
+    output += ` — ${endSrmp}`
+  }
+  return output;
 }
-return `${$feature.Route} (${dir}) @ ${beginSrmp}`;
+
+createLabel(false);

src/layers/MilepostLayer/milepost-line-layer/MilepostOffsetLineRenderer.ts

@@ -79,14 +79,9 @@ const offsetAndMilepostCimSymbol = new CIMSymbol({
 const lineSegmentSymbol = new SimpleLineSymbol({
 	color: highwaySignBackgroundColor,
 	width: 3,
-	marker: {
-		color: highwaySignBackgroundColor,
-		style: "square",
-		placement: "begin-end",
-	},
 });
 
-export const arcadeHasEndSrmp = "IIf($feature.EndSrmp != null, '1', '0')";
+const arcadeHasEndSrmp = "IIf($feature.EndSrmp != null, '1', '0')";
 /**
  * Simple Renderer using a CIM symbol.
  */

src/layers/MilepostLayer/symbol/beginOverride.arcade

@@ -1,6 +1,14 @@
-var showEnd = HasKey($feature, "EndSrmp") && $feature.SRMP > $feature.EndSrmp
+Console("beginOverride.arcade begins")
 
-IIf(showEnd,
-    `${$feature.Route}\n${$feature.EndSrmp}${$feature.EndBack}`,
-    `${$feature.Route}\n${$feature.SRMP}${$feature.Back}`
-)
+Console($feature);
+
+var showEnd = HasKey($feature, "EndSrmp") && $feature.EndSrmp != null && $feature.Srmp > $feature.EndSrmp;
+
+var srmp = IIf(showEnd, $feature.EndSrmp, $feature.Srmp);
+var back = IIf(showEnd, $feature.EndBack, $feature.Back);
+
+
+var output = `${Text(srmp, "#.##")}${back}`;
+
+Console("beginOverride.arcade ends")
+return output;

src/main.ts

@@ -482,11 +482,12 @@ if (!testWebGL2Support()) {
 		popupEnabled: false,
 	});
 
-	if (import.meta.env.DEV) {
-		view.watch("scale", (scale) => {
-			console.debug("scale changed", scale);
-		});
-	}
+	// Uncomment this section to debug scale changes 👇
+	// if (import.meta.env.DEV) {
+	// 	view.watch("scale", (scale) => {
+	// 		console.debug("scale changed", scale);
+	// 	});
+	// }
 
 	import("./setupPopupActions")
 		.then(({ setupPopupActions }) => {