fix changeset implementation in OSM History Widget

maproulette · Feb 15, 2025 · f640f1d · f640f1d
1 parent 3eceec6
commit f640f1d
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/services/OSM/OSM.js b/src/services/OSM/OSM.js
@@ -113,10 +113,21 @@ export const fetchOSMElementHistory = async (idString, includeChangesets = false
       const history = await response.json();
       if (includeChangesets) {
         const changesetIds = map(history.elements, "changeset");
-        const changesetMap = new Map(await fetchOSMChangesets(changesetIds));
+        const changesetMap = await fetchOSMChangesets(changesetIds);
+        const mapfetchedIds = changesetMap.map((c) => c.id);
+        // Update each history element with its full changeset data
         each(history.elements, (entry) => {
-          if (changesetMap.has(entry.changeset))
-            entry.changeset = changesetMap.get(entry.changeset);
+          if (entry.changeset && mapfetchedIds.includes(entry.changeset)) {
+            // Store the changeset ID before overwriting
+            const changesetId = entry.changeset;
+            // Get the full changeset data
+            const changesetData = changesetMap.find((c) => c.id === changesetId);
+            // Merge the changeset data while preserving the ID
+            entry.changeset = {
+              id: changesetId,
+              ...changesetData,
+            };
+          }
         });
       }
       return history.elements;