diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/texture_one.png b/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/texture_one.png new file mode 100644 index 00000000..392885bb Binary files /dev/null and b/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/texture_one.png differ 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 new file mode 100644 index 00000000..6d6285d8 --- /dev/null +++ b/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/xml_file.xml @@ -0,0 +1,9 @@ + + + + + + + + + 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 new file mode 100644 index 00000000..a1b8ed6b Binary files /dev/null and b/xml_converter/integration_tests/test_cases/xml_inheritance/output_proto/markers.bin differ diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/output_proto/texture_one.png b/xml_converter/integration_tests/test_cases/xml_inheritance/output_proto/texture_one.png new file mode 100644 index 00000000..392885bb Binary files /dev/null and b/xml_converter/integration_tests/test_cases/xml_inheritance/output_proto/texture_one.png differ diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/texture_one.png b/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/texture_one.png new file mode 100644 index 00000000..392885bb Binary files /dev/null and b/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/texture_one.png differ 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 new file mode 100644 index 00000000..c6f53a62 --- /dev/null +++ b/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/xml_file.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/testcase.yaml b/xml_converter/integration_tests/test_cases/xml_inheritance/testcase.yaml new file mode 100644 index 00000000..9510c793 --- /dev/null +++ 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 index 3f096b1d..9e235ad2 100644 --- a/xml_converter/src/packaging_xml.cpp +++ b/xml_converter/src/packaging_xml.cpp @@ -168,7 +168,7 @@ vector parse_pois(rapidxml::xml_node<>* root_node, mapicon_attributes.size(); i++) { trail->init_xml_attribute( - categories[category_index]->icon_attributes[i], + categories[category_index]->trail_attributes[i], &ignored_errors, state); }