feat: add operation for cycling crosswalk tags

data/core.yaml

@@ -513,8 +513,9 @@ en:
     cycle_highway_tag:
       title: Cycle Highway Tag
       key: C
-      description: Shortcut to cycle selected highway through several different tags.
-      annotation: Changed highway tag of selected way.
+      description: Shortcut to cycle selected highway or crosswalk through several different tags.
+      highway_annotation: Changed highway tag of selected way.
+      crosswalk_annotation: Changed crosswalk tag of selected way.
   restriction:
     controls:
       distance: Distance

modules/operations/cycle_highway_tag.js

@@ -6,31 +6,62 @@ import { KeyOperationBehavior } from '../behaviors/KeyOperationBehavior';
 let _wasSelectedIDs = [];
 let _wasPresetIDs = [];
 
-
 export function operationCycleHighwayTag(context, selectedIDs) {
   const editor = context.systems.editor;
   const graph = editor.staging.graph;
   const l10n = context.systems.l10n;
   const presets = context.systems.presets;
 
   // Allow cycling through lines that match these presets
-  const allowPresetRegex = [
+  const allowHighwayPresetRegex = [
     /^highway\/(motorway|trunk|primary|secondary|tertiary|unclassified|residential|living_street|service|track)/,
-    /^line$/
+    /^line$/,
   ];
 
-  const defaultPresetIDs = [
+  const defaultHighwayPresetIDs = [
     'highway/residential',
     'highway/service',
     'highway/track',
     'highway/unclassified',
     'highway/tertiary',
-    'line'
+    'line',
+  ];
+
+  // Allow cycling through crossings that match these presets
+  const allowCrossingPresetRegex = [
+    /^crossing\/(unmarked|marked|marked:zebra|marked:lines|marked:dashes|marked:ladder|marked:dots|marked:ladder:skewed)/,
+  ];
+
+  const defaultCrossingPresetIDs = [
+    'crossing/unmarked;crossing:markings=no',
+    'crossing/marked;crossing:markings=yes',
+    'crossing/marked;crossing:markings=zebra',
+    'crossing/marked;crossing:markings=lines',
+    'crossing/marked;crossing:markings=ladder',
+    'crossing/marked;crossing:markings=dashes',
+    'crossing/marked;crossing:markings=dots',
+    'crossing/marked;crossing:markings=ladder:skewed',
   ];
 
-  // same selection as before?
-  const isSameSelection = utilArrayIdentical(selectedIDs, _wasSelectedIDs);
-  const presetIDs = new Set(isSameSelection ? _wasPresetIDs : defaultPresetIDs);
+  // Check if selection is highway or crossing
+  const isCrosswalkSelection = selectedIDs.some((id) => id.includes('crosswalk'));
+  const isHighwaySelection = selectedIDs.some((id) => id.includes('highway'));
+
+  // Define the preset IDs based on the selection type
+  let presetIDs;
+
+  // Declare isSameSelection here
+  let isSameSelection = utilArrayIdentical(selectedIDs, _wasSelectedIDs);
+
+  if (isCrosswalkSelection) {
+    presetIDs = defaultCrossingPresetIDs;
+  } else if (isHighwaySelection) {
+    presetIDs = isSameSelection ? _wasPresetIDs : defaultHighwayPresetIDs;
+  } else {
+    return;
+  }
+
+  _wasPresetIDs = presetIDs;
 
   // Gather selected entities allowed to be cycled
   const entities = selectedIDs
@@ -39,22 +70,22 @@ export function operationCycleHighwayTag(context, selectedIDs) {
       if (entity?.type !== 'way') return false;
 
       const preset = presets.match(entity, graph);
-      if (allowPresetRegex.some(regex => regex.test(preset.id))) {
-        if (!presetIDs.has(preset.id)) presetIDs.add(preset.id);  // make sure we can cycle back to the original preset
+      // Check if the preset matches either allowHighwayPresetRegex or allowCrossingPresetRegex
+      if (
+        allowHighwayPresetRegex.some(regex => regex.test(preset.id)) ||
+        allowCrossingPresetRegex.some(regex => regex.test(preset.id))
+      ) {
         return true;
-      } else {
-        return false;
       }
+      return false;
     });
 
-  _wasSelectedIDs = selectedIDs.slice();  // copy
-  _wasPresetIDs = Array.from(presetIDs);  // copy
-
+  _wasSelectedIDs = selectedIDs.slice(); // copy
 
   let operation = function() {
     if (!entities.length) return;
 
-    // Pick the next preset..
+    // Pick the next preset...
     const currPresetIDs = Array.from(presetIDs);
     const currPreset = presets.match(entities[0], editor.staging.graph);
     const index = currPreset ? currPresetIDs.indexOf(currPreset.id) : -1;
@@ -63,51 +94,47 @@ export function operationCycleHighwayTag(context, selectedIDs) {
 
     editor.beginTransaction();
 
-    // Update all selected highways...
+    // Update all selected highways or crosswalks...
     for (const entity of entities) {
       const oldPreset = presets.match(entity, editor.staging.graph);
-      const action = actionChangePreset(entity.id, oldPreset, newPreset, true /* skip field defaults */);
+      const action = actionChangePreset(entity.id, oldPreset, newPreset, true);
       editor.perform(action);
     }
 
-    // If this is the same selection as before, and the previous edit was also a cycle-tags,
-    // we can just replace the previous edit with this one.
-    const annotation = operation.annotation();
+    // Determine the appropriate annotation based on the selection type
+    const annotationKey = isCrosswalkSelection ? 'crosswalk_annotation' : 'highway_annotation';
+    const annotation = l10n.t(`operations.cycle_highway_tag.${annotationKey}`);
+
     const options = { annotation: annotation, selectedIDs: selectedIDs };
     if (isSameSelection && editor.getUndoAnnotation() === annotation) {
-      editor.commitAppend(options);  // Replace the previous cycle-tags edit
+      editor.commitAppend(options);
     } else {
       editor.commit(options);
     }
 
     editor.endTransaction();
-    context.enter('select-osm', { selection: { osm: selectedIDs }} );  // reselect
+    context.enter('select-osm', { selection: { osm: selectedIDs } });
   };
 
-
   operation.available = function() {
     return entities.length > 0;
   };
 
-
   operation.disabled = function() {
     return false;
   };
 
-
   operation.tooltip = function() {
     const disabledReason = operation.disabled();
-    return disabledReason ?
-      l10n.t(`operations.cycle_highway_tag.${disabledReason}`) :
-      l10n.t('operations.cycle_highway_tag.description');
+    return disabledReason
+      ? l10n.t(`operations.cycle_highway_tag.${disabledReason}`)
+      : l10n.t('operations.cycle_highway_tag.description');
   };
 
-
   operation.annotation = function() {
     return l10n.t('operations.cycle_highway_tag.annotation');
   };
 
-
   operation.id = 'cycle_highway_tag';
   operation.keys = [ '⇧' + l10n.t('operations.cycle_highway_tag.key') ];
   operation.title = l10n.t('operations.cycle_highway_tag.title');