Fix sort order for language-tagged OSM tag keys

In agreement with @Mayaryin.

Author: opyh

src/components/CombinedFeaturePanel/components/AccessibilitySection/OSMTagPanel.tsx

@@ -1,6 +1,9 @@
 import { get, set, sortBy } from "lodash";
 import * as React from "react";
-import { getAvailableLangTags } from "~/components/CombinedFeaturePanel/utils/TagKeyUtils";
+import {
+  getAvailableLangTags,
+  normalizeAndExtractLanguageTagsIfPresent,
+} from "~/components/CombinedFeaturePanel/utils/TagKeyUtils";
 import { useCurrentLanguageTagStrings } from "~/lib/context/LanguageTagContext";
 import type { TypeTaggedOSMFeature } from "~/lib/model/geo/AnyFeature";
 import { omittedKeyPrefixes } from "~/lib/model/osm/tag-config/omittedKeyPrefixes";
@@ -54,7 +57,9 @@ function generateTree(keys: string[]): ITreeNode {
 function nest(tree: ITreeNode) {
   const entries = Object.entries(tree);
   const sortedEntries = sortBy(entries, ([key]) => {
-    const order = sortOrderMap.get(key);
+    const { normalizedOSMTagKey } =
+      normalizeAndExtractLanguageTagsIfPresent(key);
+    const order = sortOrderMap.get(normalizedOSMTagKey);
     return order === undefined ? 100000 : order;
   });
 

src/components/CombinedFeaturePanel/editors/AutoEditor.tsx

@@ -150,7 +150,7 @@ export const AutoEditor = ({
 
   const handleTagKeyChange = React.useCallback(
     (newPickerValue: string) => {
-      const { normalizedTag: baseTag } =
+      const { normalizedOSMTagKey: baseTag } =
         normalizeAndExtractLanguageTagsIfPresent(tagName);
       const updatedTagName = [baseTag, newPickerValue].join(":");
 

src/components/CombinedFeaturePanel/editors/StringFieldEditor.tsx

@@ -36,7 +36,7 @@ export const StringFieldEditor: React.FC<BaseEditorProps> = ({
   }
   const { baseFeatureUrl } = useContext(FeaturePanelContext);
 
-  const { normalizedTag: tagKeyWithoutLangTag } =
+  const { normalizedOSMTagKey: tagKeyWithoutLangTag } =
     normalizeAndExtractLanguageTagsIfPresent(tagKey);
   const initialTagValue = feature.properties?.[tagKey] ?? "";
 

src/components/CombinedFeaturePanel/utils/TagKeyUtils.tsx

@@ -13,16 +13,16 @@ import { languageTaggedKeys } from "~/lib/model/osm/tag-config/languageTaggedKey
  * Input: `an:other:tag`, Output: `{ an:other:tag, false, null }`
  */
 
-export const normalizeAndExtractLanguageTagsIfPresent = (tagName: string) => {
-  if (languageTaggedKeys.has(tagName)) {
+export const normalizeAndExtractLanguageTagsIfPresent = (osmTagKey: string) => {
+  if (languageTaggedKeys.has(osmTagKey)) {
     return {
-      normalizedTag: tagName,
+      normalizedOSMTagKey: osmTagKey,
       hasLanguageTagSupport: true,
       languageTag: null,
     };
   }
 
-  const parts: string[] = tagName.split(":");
+  const parts: string[] = osmTagKey.split(":");
   let assembledString: string = parts.slice(0, parts.length - 1).join(":");
 
   for (let i = 1; i < parts.length; i++) {
@@ -32,14 +32,14 @@ export const normalizeAndExtractLanguageTagsIfPresent = (tagName: string) => {
         describeIETFLanguageTag(languageTag, false) !== "undefined tag";
       if (isValidTag) {
         return {
-          normalizedTag: assembledString,
+          normalizedOSMTagKey: assembledString,
           hasLanguageTagSupport: true,
           languageTag,
         };
       }
       console.warn("Tag ", assembledString, "is appended with an unknown tag.");
       return {
-        normalizedTag: assembledString,
+        normalizedOSMTagKey: assembledString,
         hasLanguageTagSupport: true,
         languageTag: null,
       };
@@ -48,7 +48,7 @@ export const normalizeAndExtractLanguageTagsIfPresent = (tagName: string) => {
   }
 
   return {
-    normalizedTag: tagName,
+    normalizedOSMTagKey: osmTagKey,
     hasLanguageTagSupport: false,
     languageTag: null,
   };