A11y: various improvements

src/Models/MapProperties.ts

@@ -16,6 +16,7 @@ export interface MapProperties {
     readonly maxbounds: UIEventSource<undefined | BBox>
     readonly allowMoving: UIEventSource<true | boolean>
     readonly allowRotating: UIEventSource<true | boolean>
+    readonly rotation: UIEventSource<number>
     readonly lastClickLocation: Store<{ lon: number; lat: number }>
     readonly allowZooming: UIEventSource<true | boolean>
 

src/Models/MenuState.ts

@@ -14,13 +14,7 @@ export type MenuViewTabStates = (typeof MenuState._menuviewTabs)[number]
  * Some convenience methods are provided for this as well
  */
 export class MenuState {
-    public static readonly _themeviewTabs = [
-        "intro",
-        "filters",
-        "download",
-        "copyright",
-        "share",
-    ] as const
+    public static readonly _themeviewTabs = ["intro", "download", "copyright", "share"] as const
     public static readonly _menuviewTabs = [
         "about",
         "settings",
@@ -39,6 +33,8 @@ export class MenuState {
     public readonly backgroundLayerSelectionIsOpened: UIEventSource<boolean> =
         new UIEventSource<boolean>(false)
 
+    public readonly filtersPanelIsOpened: UIEventSource<boolean> = new UIEventSource<boolean>(false)
+
     public readonly allToggles: {
         toggle: UIEventSource<boolean>
         name: string
@@ -84,8 +80,8 @@ export class MenuState {
                 this.highlightedUserSetting.setData(undefined)
             }
         })
-        this.themeViewTab.addCallbackAndRun((tab) => {
-            if (tab !== "filters") {
+        this.filtersPanelIsOpened.addCallbackAndRun((isOpen) => {
+            if (!isOpen) {
                 this.highlightedLayerInFilters.setData(undefined)
             }
         })
@@ -121,8 +117,7 @@ export class MenuState {
     }
 
     public openFilterView(highlightLayer?: LayerConfig | string) {
-        this.themeIsOpened.setData(true)
-        this.themeViewTab.setData("filters")
+        this.filtersPanelIsOpened.setData(true)
         if (highlightLayer) {
             if (typeof highlightLayer !== "string") {
                 highlightLayer = highlightLayer.id
@@ -159,6 +154,7 @@ export class MenuState {
             this.menuIsOpened,
             this.themeIsOpened,
             this.backgroundLayerSelectionIsOpened,
+            this.filtersPanelIsOpened,
         ]
         const somethingIsOpen = toggles.some((t) => t.data)
         toggles.forEach((t) => t.setData(false))

src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson.ts

@@ -279,6 +279,13 @@ export interface QuestionableTagRenderingConfigJson extends TagRenderingConfigJs
      */
     questionHint?: Translatable
 
+    /**
+     * When using a screenreader and selecting the 'edit' button, the current rendered value is read aloud in normal circumstances.
+     * In some rare cases, this is not desirable. For example, if the rendered value is a link to a website, this link can be selected (and will be read aloud).
+     * If the user presses _tab_ again, they'll select the button and have the link read aloud a second time.
+     */
+    editButtonAriaLabel?: Translatable
+
     /**
      * A list of labels. These are strings that are used for various purposes, e.g. to only include a subset of the tagRenderings when reusing a layer
      */

src/Models/ThemeConfig/TagRenderingConfig.ts

@@ -76,6 +76,7 @@ export default class TagRenderingConfig {
     public readonly multiAnswer: boolean
 
     public readonly mappings?: Mapping[]
+    public readonly editButtonAriaLabel?: Translation
     public readonly labels: string[]
     public readonly classes: string[]
 
@@ -134,6 +135,11 @@ export default class TagRenderingConfig {
         this.question = Translations.T(json.question, translationKey + ".question")
         this.questionhint = Translations.T(json.questionHint, translationKey + ".questionHint")
         this.description = Translations.T(json.description, translationKey + ".description")
+        this.editButtonAriaLabel = Translations.T(
+            json.editButtonAriaLabel,
+            translationKey + ".editButtonAriaLabel"
+        )
+
         this.condition = TagUtils.Tag(json.condition ?? { and: [] }, `${context}.condition`)
         this.invalidValues = json["invalidValues"]
             ? TagUtils.Tag(json["invalidValues"], `${context}.invalidValues`)

src/Models/ThemeViewState.ts

@@ -61,6 +61,7 @@ import NearbyFeatureSource from "../Logic/FeatureSource/Sources/NearbyFeatureSou
 import FavouritesFeatureSource from "../Logic/FeatureSource/Sources/FavouritesFeatureSource"
 import { ProvidedImage } from "../Logic/ImageProviders/ImageProvider"
 import { GeolocationControlState } from "../UI/BigComponents/GeolocationControl"
+import { Orientation } from "../Sensors/Orientation"
 
 /**
  *
@@ -115,8 +116,6 @@ export default class ThemeViewState implements SpecialVisualizationState {
     readonly geolocation: GeoLocationHandler
     readonly geolocationControl: GeolocationControlState
 
-    readonly lastGeolocationRequestMoment: UIEventSource<Date> = new UIEventSource<Date>(undefined)
-
     readonly imageUploadManager: ImageUploadManager
     readonly previewedImage = new UIEventSource<ProvidedImage>(undefined)