Skip to content

Commit

Permalink
Merge pull request #841 from egovernments/HLM-6172
Browse files Browse the repository at this point in the history
Update processHierarchyAndData.js
  • Loading branch information
nipunarora-eGov authored Jun 11, 2024
2 parents f69332b + 1ab104d commit 634338a
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ const mergeHierarchicalData = (data1, data2) => {
data1[key].data = value.data; // Merge data
mergeHierarchicalData(data1[key].children, value.children); // Recursively merge children
}
if (data1[key].data.feature) {
if (data1[key].data?.feature) {
const { feature, ...temp } = value.data ? _.cloneDeep(value.data) : {};
data1[key].data.feature.properties = { ...data1[key].data.feature?.properties, ...temp };
data1[key].data.feature.properties = { ...data1[key].data?.feature?.properties, ...temp };
}
}
return data1;
Expand Down

0 comments on commit 634338a

Please sign in to comment.