EditDialog: Create climbing/route_bottom as default member in crag (#897

)
zbycz · Jan 26, 2025 · 3733ee5 · 3733ee5
1 parent 3fa5765
commit 3733ee5
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 8 deletions.
diff --git a/src/components/FeaturePanel/EditDialog/EditContent/AddMemberForm.tsx b/src/components/FeaturePanel/EditDialog/EditContent/AddMemberForm.tsx
@@ -41,7 +41,28 @@ const getNewNodeLocation = async (items: EditDataItem[], members: Members) => {
   return lonLat.map((x) => x + 0.0001);
 };
 
-export const AddMemberForm = ({ newLonLat }: { newLonLat?: LonLat }) => {
+const defaultRouteBottomTags = {
+  climbing: 'route_bottom',
+  sport: 'climbing',
+};
+
+export const AddMemberForm = ({
+  newLonLat,
+  selectedPresetKey,
+}: {
+  newLonLat?: LonLat;
+  selectedPresetKey?: string;
+}) => {
+  const getDefaultTags = useCallback(
+    () => ({
+      ...(selectedPresetKey === 'climbing/route_bottom'
+        ? defaultRouteBottomTags
+        : {}),
+    }),
+    [selectedPresetKey],
+  );
+  const defaultTags = getDefaultTags();
+
   const { addFeature, items, setCurrent, current } = useEditContext();
   const { members, setMembers, tags, setShortId } = useFeatureEditData();
   const [showInput, setShowInput] = React.useState(false);
@@ -51,7 +72,7 @@ export const AddMemberForm = ({ newLonLat }: { newLonLat?: LonLat }) => {
   const handleAddMember = useCallback(async () => {
     const lastNodeLocation =
       newLonLat ?? (await getNewNodeLocation(items, members));
-    const newNode = getNewNode(lastNodeLocation, label);
+    const newNode = getNewNode(lastNodeLocation, label, defaultTags);
     const newShortId = getShortId(newNode.osmMeta);
     addFeature(newNode);
     setMembers((prev) => [
@@ -61,7 +82,16 @@ export const AddMemberForm = ({ newLonLat }: { newLonLat?: LonLat }) => {
     setShowInput(false);
     setLabel('');
     setCurrent(newShortId);
-  }, [addFeature, items, label, members, newLonLat, setCurrent, setMembers]);
+  }, [
+    addFeature,
+    defaultTags,
+    items,
+    label,
+    members,
+    newLonLat,
+    setCurrent,
+    setMembers,
+  ]);
 
   React.useEffect(() => {
     const downHandler = (e) => {

diff --git a/src/components/FeaturePanel/EditDialog/EditContent/MembersEditor.tsx b/src/components/FeaturePanel/EditDialog/EditContent/MembersEditor.tsx
@@ -57,6 +57,9 @@ export const MembersEditor = () => {
   );
 
   const isClimbingCrag = tags.climbing === 'crag';
+  const selectedPresetKey = isClimbingCrag
+    ? 'climbing/route_bottom'
+    : undefined;
   const hasNoMembers = !members || members.length === 0;
 
   if (!isClimbingCrag && hasNoMembers) return null;
@@ -74,9 +77,12 @@ export const MembersEditor = () => {
         );
       })}
       {isClimbingCrag && hasNoMembers ? (
-        <AddMemberForm newLonLat={nodeLonLat} />
+        <AddMemberForm
+          newLonLat={nodeLonLat}
+          selectedPresetKey={selectedPresetKey}
+        />
       ) : (
-        <AddMemberForm />
+        <AddMemberForm selectedPresetKey={selectedPresetKey} />
       )}
     </AccordionComponent>
   );

diff --git a/src/services/getCoordsFeature.ts b/src/services/getCoordsFeature.ts
@@ -1,5 +1,5 @@
 import { getImagesFromCenter } from './images/getImageDefs';
-import { Feature, LonLat, LonLatRounded, OsmType } from './types';
+import { Feature, FeatureTags, LonLat, LonLatRounded, OsmType } from './types';
 
 let nextId = 0;
 
@@ -22,7 +22,11 @@ export const getCoordsFeature = ([lon, lat]: LonLatRounded): Feature => {
   };
 };
 
-export const getNewNode = ([lon, lat]: LonLat, name: string): Feature => {
+export const getNewNode = (
+  [lon, lat]: LonLat,
+  name: string,
+  defaultTags: FeatureTags = {},
+): Feature => {
   nextId += 1;
 
   return {
@@ -33,7 +37,7 @@ export const getNewNode = ([lon, lat]: LonLat, name: string): Feature => {
       type: 'node',
       id: nextId * -1, // negative id means "adding new point" in osmApiAuth#saveChanges()
     },
-    tags: { name },
+    tags: { name, ...defaultTags },
     properties: { class: 'marker', subclass: 'point' },
   };
 };