Skip to content

Commit

Permalink
changed split categories to make file names from normalized Display N…
Browse files Browse the repository at this point in the history 
…ames
  • Loading branch information
@klingbolt
klingbolt committed Feb 20, 2025
1 parent e14eb99 commit 494223e
Show file tree
Hide file tree
Showing 13 changed files with 111 additions and 108 deletions.
52 changes: 26 additions & 26 deletions ...verter/integration_tests/test_cases/xml_split_by_category_depth_0/input/pack/xml_file.xml
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<OverlayData>
<MarkerCategory Name="parent1" XPos="100" YPos="000" ZPos="000" MapID="50">
<MarkerCategory Name="child1" XPos="110" >
<MarkerCategory Name="grandchild1" XPos="111" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="112" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="113" ></MarkerCategory>
<MarkerCategory DisplayName="Parent1" Name="parent1" XPos="100" YPos="000" ZPos="000" MapID="50">
<MarkerCategory DisplayName="Child1" Name="child1" XPos="110" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="111" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="112" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="113" ></MarkerCategory>
</MarkerCategory>
<MarkerCategory Name="child2" XPos="120" >
<MarkerCategory Name="grandchild1" XPos="121" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="122" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="123" ></MarkerCategory>
<MarkerCategory DisplayName="Child2" Name="child2" XPos="120" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="121" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="122" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="123" ></MarkerCategory>
</MarkerCategory>
<MarkerCategory Name="child3" XPos="130" >
<MarkerCategory Name="grandchild1" XPos="131" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="132" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="133" ></MarkerCategory>
<MarkerCategory DisplayName="Child3" Name="child3" XPos="130" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="131" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="132" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="133" ></MarkerCategory>
</MarkerCategory>
</MarkerCategory>
<MarkerCategory Name="parent2" XPos="200" YPos="000" ZPos="000" MapID="50">
<MarkerCategory Name="child1" XPos="210" >
<MarkerCategory Name="grandchild1" XPos="211" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="212" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="213" ></MarkerCategory>
<MarkerCategory DisplayName="Parent2" Name="parent2" XPos="200" YPos="000" ZPos="000" MapID="50">
<MarkerCategory DisplayName="Child1" Name="child1" XPos="210" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="211" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="212" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="213" ></MarkerCategory>
</MarkerCategory>
<MarkerCategory Name="child2" XPos="220" >
<MarkerCategory Name="grandchild1" XPos="221" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="222" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="223" ></MarkerCategory>
<MarkerCategory DisplayName="Child2" Name="child2" XPos="220" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="221" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="222" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="223" ></MarkerCategory>
</MarkerCategory>
<MarkerCategory Name="child3" XPos="230" >
<MarkerCategory Name="grandchild1" XPos="231" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="232" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="233" ></MarkerCategory>
<MarkerCategory DisplayName="Child3" Name="child3" XPos="230" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="231" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="232" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="233" ></MarkerCategory>
</MarkerCategory>
</MarkerCategory>

Expand Down
Binary file modified ...ntegration_tests/test_cases/xml_split_by_category_depth_0/output_proto/parent1.guildpoint
View file
Binary file not shown.
Binary file modified ...ntegration_tests/test_cases/xml_split_by_category_depth_0/output_proto/parent2.guildpoint
View file
Binary file not shown.
52 changes: 26 additions & 26 deletions ...verter/integration_tests/test_cases/xml_split_by_category_depth_0/output_xml/xml_file.xml
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<OverlayData>
<MarkerCategory ID="LUSqSdk1Qsc=" Name="parent1">
<MarkerCategory ID="sdeZoq6FWfQ=" Name="child1">
<MarkerCategory ID="sIvniM+Cv1c=" Name="grandchild1"/>
<MarkerCategory ID="s4vniHC8/5I=" Name="grandchild2"/>
<MarkerCategory ID="tYvniBH2P84=" Name="grandchild3"/>
<MarkerCategory DisplayName="Parent1" ID="LUSqSdk1Qsc=" Name="parent1">
<MarkerCategory DisplayName="Child1" ID="sdeZoq6FWfQ=" Name="child1">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniM+Cv1c=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniHC8/5I=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniBH2P84=" Name="grandchild3"/>
</MarkerCategory>
<MarkerCategory ID="sdeZoo9am+A=" Name="child2">
<MarkerCategory ID="sIvniLBXAUQ=" Name="grandchild1"/>
<MarkerCategory ID="s4vniFGRQX8=" Name="grandchild2"/>
<MarkerCategory ID="tYvniPLKgbo=" Name="grandchild3"/>
<MarkerCategory DisplayName="Child2" ID="sdeZoo9am+A=" Name="child2">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniLBXAUQ=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniFGRQX8=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniPLKgbo=" Name="grandchild3"/>
</MarkerCategory>
<MarkerCategory ID="sdeZonAv3cw=" Name="child3">
<MarkerCategory ID="sIvniJEsQzA=" Name="grandchild1"/>
<MarkerCategory ID="s4vniDJmg2s=" Name="grandchild2"/>
<MarkerCategory ID="tYvniNOfw6Y=" Name="grandchild3"/>
<MarkerCategory DisplayName="Child3" ID="sdeZonAv3cw=" Name="child3">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniJEsQzA=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniDJmg2s=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniNOfw6Y=" Name="grandchild3"/>
</MarkerCategory>
</MarkerCategory>
<MarkerCategory ID="LUSqSdo1Qsc=" Name="parent2">
<MarkerCategory ID="sdeZoq+FWfQ=" Name="child1">
<MarkerCategory ID="sIvniNCCv1c=" Name="grandchild1"/>
<MarkerCategory ID="s4vniHG8/5I=" Name="grandchild2"/>
<MarkerCategory ID="tYvniBL2P84=" Name="grandchild3"/>
<MarkerCategory DisplayName="Parent2" ID="LUSqSdo1Qsc=" Name="parent2">
<MarkerCategory DisplayName="Child1" ID="sdeZoq+FWfQ=" Name="child1">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniNCCv1c=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniHG8/5I=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniBL2P84=" Name="grandchild3"/>
</MarkerCategory>
<MarkerCategory ID="sdeZopBam+A=" Name="child2">
<MarkerCategory ID="sIvniLFXAUQ=" Name="grandchild1"/>
<MarkerCategory ID="s4vniFKRQX8=" Name="grandchild2"/>
<MarkerCategory ID="tYvniPPKgbo=" Name="grandchild3"/>
<MarkerCategory DisplayName="Child2" ID="sdeZopBam+A=" Name="child2">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniLFXAUQ=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniFKRQX8=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniPPKgbo=" Name="grandchild3"/>
</MarkerCategory>
<MarkerCategory ID="sdeZonEv3cw=" Name="child3">
<MarkerCategory ID="sIvniJIsQzA=" Name="grandchild1"/>
<MarkerCategory ID="s4vniDNmg2s=" Name="grandchild2"/>
<MarkerCategory ID="tYvniNSfw6Y=" Name="grandchild3"/>
<MarkerCategory DisplayName="Child3" ID="sdeZonEv3cw=" Name="child3">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniJIsQzA=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniDNmg2s=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniNSfw6Y=" Name="grandchild3"/>
</MarkerCategory>
</MarkerCategory>
<POIs>
Expand Down
52 changes: 26 additions & 26 deletions ...verter/integration_tests/test_cases/xml_split_by_category_depth_1/input/pack/xml_file.xml
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<OverlayData>
<MarkerCategory Name="parent1" XPos="100" YPos="000" ZPos="000" MapID="50">
<MarkerCategory Name="child1" XPos="110" >
<MarkerCategory Name="grandchild1" XPos="111" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="112" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="113" ></MarkerCategory>
<MarkerCategory DisplayName="Parent1" Name="parent1" XPos="100" YPos="000" ZPos="000" MapID="50">
<MarkerCategory DisplayName="Child1" Name="child1" XPos="110" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="111" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="112" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="113" ></MarkerCategory>
</MarkerCategory>
<MarkerCategory Name="child2" XPos="120" >
<MarkerCategory Name="grandchild1" XPos="121" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="122" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="123" ></MarkerCategory>
<MarkerCategory DisplayName="Child2" Name="child2" XPos="120" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="121" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="122" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="123" ></MarkerCategory>
</MarkerCategory>
<MarkerCategory Name="child3" XPos="130" >
<MarkerCategory Name="grandchild1" XPos="131" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="132" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="133" ></MarkerCategory>
<MarkerCategory DisplayName="Child3" Name="child3" XPos="130" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="131" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="132" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="133" ></MarkerCategory>
</MarkerCategory>
</MarkerCategory>
<MarkerCategory Name="parent2" XPos="200" YPos="000" ZPos="000" MapID="50">
<MarkerCategory Name="child1" XPos="210" >
<MarkerCategory Name="grandchild1" XPos="211" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="212" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="213" ></MarkerCategory>
<MarkerCategory DisplayName="Parent2" Name="parent2" XPos="200" YPos="000" ZPos="000" MapID="50">
<MarkerCategory DisplayName="Child1" Name="child1" XPos="210" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="211" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="212" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="213" ></MarkerCategory>
</MarkerCategory>
<MarkerCategory Name="child2" XPos="220" >
<MarkerCategory Name="grandchild1" XPos="221" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="222" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="223" ></MarkerCategory>
<MarkerCategory DisplayName="Child2" Name="child2" XPos="220" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="221" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="222" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="223" ></MarkerCategory>
</MarkerCategory>
<MarkerCategory Name="child3" XPos="230" >
<MarkerCategory Name="grandchild1" XPos="231" ></MarkerCategory>
<MarkerCategory Name="grandchild2" XPos="232" ></MarkerCategory>
<MarkerCategory Name="grandchild3" XPos="233" ></MarkerCategory>
<MarkerCategory DisplayName="Child3" Name="child3" XPos="230" >
<MarkerCategory DisplayName="Grandchild1" Name="grandchild1" XPos="231" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild2" Name="grandchild2" XPos="232" ></MarkerCategory>
<MarkerCategory DisplayName="Grandchild3" Name="grandchild3" XPos="233" ></MarkerCategory>
</MarkerCategory>
</MarkerCategory>

Expand Down
Binary file modified ...ion_tests/test_cases/xml_split_by_category_depth_1/output_proto/parent1.child1.guildpoint
View file
Binary file not shown.
Binary file modified ...ion_tests/test_cases/xml_split_by_category_depth_1/output_proto/parent1.child2.guildpoint
View file
Binary file not shown.
Binary file modified ...ion_tests/test_cases/xml_split_by_category_depth_1/output_proto/parent1.child3.guildpoint
View file
Binary file not shown.
Binary file modified ...ion_tests/test_cases/xml_split_by_category_depth_1/output_proto/parent2.child1.guildpoint
View file
Binary file not shown.
Binary file modified ...ion_tests/test_cases/xml_split_by_category_depth_1/output_proto/parent2.child2.guildpoint
View file
Binary file not shown.
Binary file modified ...ion_tests/test_cases/xml_split_by_category_depth_1/output_proto/parent2.child3.guildpoint
View file
Binary file not shown.
52 changes: 26 additions & 26 deletions ...verter/integration_tests/test_cases/xml_split_by_category_depth_1/output_xml/xml_file.xml
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<OverlayData>
<MarkerCategory ID="LUSqSdk1Qsc=" Name="parent1">
<MarkerCategory ID="sdeZoq6FWfQ=" Name="child1">
<MarkerCategory ID="sIvniM+Cv1c=" Name="grandchild1"/>
<MarkerCategory ID="s4vniHC8/5I=" Name="grandchild2"/>
<MarkerCategory ID="tYvniBH2P84=" Name="grandchild3"/>
<MarkerCategory DisplayName="Parent1" ID="LUSqSdk1Qsc=" Name="parent1">
<MarkerCategory DisplayName="Child1" ID="sdeZoq6FWfQ=" Name="child1">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniM+Cv1c=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniHC8/5I=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniBH2P84=" Name="grandchild3"/>
</MarkerCategory>
<MarkerCategory ID="sdeZoo9am+A=" Name="child2">
<MarkerCategory ID="sIvniLBXAUQ=" Name="grandchild1"/>
<MarkerCategory ID="s4vniFGRQX8=" Name="grandchild2"/>
<MarkerCategory ID="tYvniPLKgbo=" Name="grandchild3"/>
<MarkerCategory DisplayName="Child2" ID="sdeZoo9am+A=" Name="child2">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniLBXAUQ=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniFGRQX8=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniPLKgbo=" Name="grandchild3"/>
</MarkerCategory>
<MarkerCategory ID="sdeZonAv3cw=" Name="child3">
<MarkerCategory ID="sIvniJEsQzA=" Name="grandchild1"/>
<MarkerCategory ID="s4vniDJmg2s=" Name="grandchild2"/>
<MarkerCategory ID="tYvniNOfw6Y=" Name="grandchild3"/>
<MarkerCategory DisplayName="Child3" ID="sdeZonAv3cw=" Name="child3">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniJEsQzA=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniDJmg2s=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniNOfw6Y=" Name="grandchild3"/>
</MarkerCategory>
</MarkerCategory>
<MarkerCategory ID="LUSqSdo1Qsc=" Name="parent2">
<MarkerCategory ID="sdeZoq+FWfQ=" Name="child1">
<MarkerCategory ID="sIvniNCCv1c=" Name="grandchild1"/>
<MarkerCategory ID="s4vniHG8/5I=" Name="grandchild2"/>
<MarkerCategory ID="tYvniBL2P84=" Name="grandchild3"/>
<MarkerCategory DisplayName="Parent2" ID="LUSqSdo1Qsc=" Name="parent2">
<MarkerCategory DisplayName="Child1" ID="sdeZoq+FWfQ=" Name="child1">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniNCCv1c=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniHG8/5I=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniBL2P84=" Name="grandchild3"/>
</MarkerCategory>
<MarkerCategory ID="sdeZopBam+A=" Name="child2">
<MarkerCategory ID="sIvniLFXAUQ=" Name="grandchild1"/>
<MarkerCategory ID="s4vniFKRQX8=" Name="grandchild2"/>
<MarkerCategory ID="tYvniPPKgbo=" Name="grandchild3"/>
<MarkerCategory DisplayName="Child2" ID="sdeZopBam+A=" Name="child2">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniLFXAUQ=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniFKRQX8=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniPPKgbo=" Name="grandchild3"/>
</MarkerCategory>
<MarkerCategory ID="sdeZonEv3cw=" Name="child3">
<MarkerCategory ID="sIvniJIsQzA=" Name="grandchild1"/>
<MarkerCategory ID="s4vniDNmg2s=" Name="grandchild2"/>
<MarkerCategory ID="tYvniNSfw6Y=" Name="grandchild3"/>
<MarkerCategory DisplayName="Child3" ID="sdeZonEv3cw=" Name="child3">
<MarkerCategory DisplayName="Grandchild1" ID="sIvniJIsQzA=" Name="grandchild1"/>
<MarkerCategory DisplayName="Grandchild2" ID="s4vniDNmg2s=" Name="grandchild2"/>
<MarkerCategory DisplayName="Grandchild3" ID="tYvniNSfw6Y=" Name="grandchild3"/>
</MarkerCategory>
</MarkerCategory>
<POIs>
Expand Down
11 changes: 7 additions & 4 deletions xml_converter/src/packaging_protobin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,23 +295,26 @@ void _category_filter_by_depth(
int target_depth,
map<string, StringHierarchy>* category_hierarchy,
vector<string> parent_name,
vector<string> parent_display_name,
int current_depth) {
for (auto it = marker_categories->begin(); it != marker_categories->end(); it++) {
vector<string> child_name = parent_name;
child_name.push_back(it->first);
vector<string> child_display_name = parent_display_name;
child_name.push_back(it->second.name);
child_display_name.push_back(normalize(it->second.display_name));
if (target_depth == current_depth) {
(*category_hierarchy)[join(child_name, ".")].add_path(child_name, true);
(*category_hierarchy)[join(child_display_name, ".")].add_path(child_name, true);
continue;
}
_category_filter_by_depth(&(it->second.children), target_depth, category_hierarchy, child_name, current_depth + 1);
_category_filter_by_depth(&(it->second.children), target_depth, category_hierarchy, child_name, child_display_name, current_depth + 1);
}
}

map<string, StringHierarchy> category_filter_by_depth(
const map<string, Category>* marker_categories,
const int split_by_category_depth) {
map<string, StringHierarchy> category_hierarchy;
_category_filter_by_depth(marker_categories, split_by_category_depth, &category_hierarchy, {}, 0);
_category_filter_by_depth(marker_categories, split_by_category_depth, &category_hierarchy, {}, {}, 0);
return category_hierarchy;
}

Expand Down

0 comments on commit 494223e

Please sign in to comment.