Fixed a bug that caused trails to not inherit attributes correctly

klingbolt · Sep 11, 2024 · a087e5e · a087e5e
1 parent 4de28d3
commit a087e5e
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 1 deletion.
diff --git a/...nverter/integration_tests/test_cases/xml_inheritance/input/pack/texture_one.png b/...nverter/integration_tests/test_cases/xml_inheritance/input/pack/texture_one.png
diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/xml_file.xml
@@ -0,0 +1,9 @@
+<OverlayData>
+	<MarkerCategory DisplayName="My Category" IconFile="texture_one.png" Texture="texture_one.png" Name="mycategory">
+	</MarkerCategory>
+
+	<POIs>
+		<POI Type="mycategory" MapID="50" />
+		<Trail Type="mycategory" MapID="50" />
+	</POIs>
+</OverlayData>
diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_inheritance/output_proto/markers.bin
diff --git a/...erter/integration_tests/test_cases/xml_inheritance/output_proto/texture_one.png b/...erter/integration_tests/test_cases/xml_inheritance/output_proto/texture_one.png
diff --git a/...nverter/integration_tests/test_cases/xml_inheritance/output_xml/texture_one.png b/...nverter/integration_tests/test_cases/xml_inheritance/output_xml/texture_one.png
diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/xml_file.xml
@@ -0,0 +1,9 @@
+<OverlayData>
+<MarkerCategory  DisplayName="My Category" ID="KOjMBsKTXpY=" Name="mycategory">
+</MarkerCategory>
+
+<POIs>
+<POI  Type="mycategory" IconFile="texture_one.png" MapID="50"/>
+<Trail  Type="mycategory" MapID="50" Texture="texture_one.png"/>
+</POIs>
+</OverlayData>
diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/testcase.yaml b/xml_converter/integration_tests/test_cases/xml_inheritance/testcase.yaml
@@ -0,0 +1,5 @@
+input_paths: 
+    "pack": "xml"
+expected_stdout: |
+expected_stderr: |
+expected_returncode: 0
diff --git a/xml_converter/src/packaging_xml.cpp b/xml_converter/src/packaging_xml.cpp
@@ -168,7 +168,7 @@ vector<Parseable*> parse_pois(rapidxml::xml_node<>* root_node, map<string, Categ
             for (size_t category_index = 0; category_index < categories.size(); category_index++) {
                 for (size_t i = 0; i < categories[category_index]->icon_attributes.size(); i++) {
                     trail->init_xml_attribute(
-                        categories[category_index]->icon_attributes[i],
+                        categories[category_index]->trail_attributes[i],
                         &ignored_errors,
                         state);
                 }