EditDialog: show parent ways for nodes (#886)

zbycz · Jan 11, 2025 · 32a17aa · 32a17aa
1 parent 608d427
commit 32a17aa
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 9 deletions.
diff --git a/src/components/FeaturePanel/EditDialog/EditContent/ParentsEditor.tsx b/src/components/FeaturePanel/EditDialog/EditContent/ParentsEditor.tsx
@@ -16,6 +16,7 @@ import { getApiId, getShortId } from '../../../../services/helpers';
 import { FeatureRow } from './FeatureRow';
 import { t } from '../../../../services/intl';
 import { useGetHandleClick } from './helpers';
+import { fetchNodesWaysFeatures } from '../../../../services/osm/fetchNodesWaysFeatures';
 
 export const ParentsEditor = () => {
   const { shortId } = useFeatureEditData();
@@ -30,7 +31,11 @@ export const ParentsEditor = () => {
         return;
       }
 
-      setParents(await fetchParentFeatures(getApiId(shortId)));
+      const [parentFeatures, waysFeatures] = await Promise.all([
+        fetchParentFeatures(getApiId(shortId)),
+        fetchNodesWaysFeatures(getApiId(shortId)),
+      ]);
+      setParents([...parentFeatures, ...waysFeatures]);
     })();
   }, [shortId]);
 

diff --git a/src/services/osm/fetchNodesWaysFeatures.ts b/src/services/osm/fetchNodesWaysFeatures.ts
@@ -0,0 +1,18 @@
+import { OsmId } from '../types';
+import { fetchJson } from '../fetch';
+import { getOsmNodesWaysUrl, isNodeOsmId, NodeOsmId } from './urls';
+import { addSchemaToFeature } from '../tagging/idTaggingScheme';
+import { osmToFeature } from './osmToFeature';
+import { OsmResponse } from './types';
+
+const getOsmNodesWaysPromise = async (apiId: NodeOsmId) =>
+  fetchJson<OsmResponse<'way'>>(getOsmNodesWaysUrl(apiId));
+
+export const fetchNodesWaysFeatures = async (apiId: OsmId) => {
+  if (isNodeOsmId(apiId)) {
+    const { elements } = await getOsmNodesWaysPromise(apiId);
+    return elements.map((element) => addSchemaToFeature(osmToFeature(element)));
+  }
+
+  return [];
+};
diff --git a/src/services/osm/fetchParentFeatures.ts b/src/services/osm/fetchParentFeatures.ts
@@ -1,13 +1,12 @@
-import { OsmId } from '../types';
+import { Feature, OsmId } from '../types';
 import { fetchJson } from '../fetch';
 import { getOsmParentUrl } from './urls';
 import { addSchemaToFeature } from '../tagging/idTaggingScheme';
 import { osmToFeature } from './osmToFeature';
+import { OsmResponse } from './types';
 
-const getOsmParentPromise = async (apiId: OsmId) => {
-  const { elements } = await fetchJson(getOsmParentUrl(apiId));
-  return { elements };
-};
+const getOsmParentPromise = async (apiId: OsmId) =>
+  fetchJson<OsmResponse>(getOsmParentUrl(apiId));
 
 export const fetchParentFeatures = async (apiId: OsmId) => {
   const { elements } = await getOsmParentPromise(apiId);

diff --git a/src/services/osm/osmApiAuth.ts b/src/services/osm/osmApiAuth.ts
@@ -347,6 +347,7 @@ export const saveChanges = async (
   const changesetId = await putChangeset(changesetXml);
 
   // TODO refactor below
+  // or even better use osmChange xml https://wiki.openstreetmap.org/wiki/API_v0.6#Diff_upload:_POST_/api/0.6/changeset/#id/upload
   const changesNodes = changes.filter(({ shortId }) => shortId[0] === 'n');
   const savedNodesIds = await Promise.all(
     changesNodes.map((change) => saveChange(changesetId, change)),

diff --git a/src/services/osm/types.ts b/src/services/osm/types.ts
@@ -14,6 +14,6 @@ export type OsmElement<T extends OsmType = 'node' | 'way' | 'relation'> = {
   members?: RelationMember[];
 };
 
-export type OsmResponse = {
-  elements: OsmElement[];
+export type OsmResponse<T extends OsmType = 'node' | 'way' | 'relation'> = {
+  elements: OsmElement<T>[];
 };
diff --git a/src/services/osm/urls.ts b/src/services/osm/urls.ts
@@ -1,6 +1,10 @@
 import { OsmId } from '../types';
 import { API_SERVER } from './consts';
 
+export type NodeOsmId = { type: 'node'; id: number };
+export const isNodeOsmId = (apiId: OsmId): apiId is NodeOsmId =>
+  apiId.type === 'node';
+
 export const getOsmUrl = ({ type, id }: OsmId) =>
   `${API_SERVER}/api/0.6/${type}/${id}.json`;
 
@@ -10,6 +14,9 @@ export const getOsmFullUrl = ({ type, id }: OsmId) =>
 export const getOsmParentUrl = ({ type, id }: OsmId) =>
   `${API_SERVER}/api/0.6/${type}/${id}/relations.json`;
 
+export const getOsmNodesWaysUrl = ({ id }: NodeOsmId) =>
+  `${API_SERVER}/api/0.6/node/${id}/ways.json`;
+
 export const getOsmHistoryUrl = ({ type, id }: OsmId) =>
   `${API_SERVER}/api/0.6/${type}/${id}/history.json`;
 

diff --git a/src/services/tagging/idTaggingScheme.ts b/src/services/tagging/idTaggingScheme.ts
@@ -197,7 +197,7 @@ export const getSchemaForFeature = (feature: Feature) => {
   };
 };
 
-export const addSchemaToFeature = (feature: Feature) => {
+export const addSchemaToFeature = (feature: Feature): Feature => {
   let schema;
   try {
     schema = getSchemaForFeature(feature); // TODO forward lang here ?? maybe full intl?