Merge pull request #261 from klingbolt/case_insensitive

Case Insensitive Category name
AsherGlick · Jan 3, 2024 · 2fa4415 · 2fa4415
2 parents 616fd09 + bbf82c9
commit 2fa4415
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 2 deletions.
diff --git a/xml_converter/integration_tests/test_cases/category_name/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/category_name/input/pack/xml_file.xml
@@ -0,0 +1,9 @@
+<OverlayData>
+    <MarkerCategory DisplayName="My Category" Name="MYCATEGORY">
+    </MarkerCategory>
+    <POIs>
+        <POI Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
+        <POI Type="Mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
+        <POI Type="mYcAtEgOrY" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
+    </POIs>
+</OverlayData>
diff --git a/xml_converter/integration_tests/test_cases/category_name/input/pack/xml_file2.xml b/xml_converter/integration_tests/test_cases/category_name/input/pack/xml_file2.xml
@@ -0,0 +1,4 @@
+<OverlayData>
+    <MarkerCategory DisplayName="My Category" Name="mycategory">
+    </MarkerCategory>
+</OverlayData>
diff --git a/xml_converter/integration_tests/test_cases/category_name/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/category_name/output_proto/markers.bin
@@ -0,0 +1,3 @@
+
+L
+My Category 2B\�)Cf�RC{�WC 2B\�)Cf�RC{�WC 2B\�)Cf�RC{�WC

diff --git a/xml_converter/integration_tests/test_cases/category_name/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/category_name/output_xml/xml_file.xml
@@ -0,0 +1,10 @@
+<OverlayData>
+<MarkerCategory  DisplayName="My Category" Name="mycategory">
+</MarkerCategory>
+
+<POIs>
+<POI  Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002"/>
+<POI  Type="Mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002"/>
+<POI  Type="mYcAtEgOrY" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002"/>
+</POIs>
+</OverlayData>
diff --git a/xml_converter/integration_tests/test_cases/category_name/testcase.yaml b/xml_converter/integration_tests/test_cases/category_name/testcase.yaml
@@ -0,0 +1,5 @@
+input_paths: 
+    "pack": "xml"
+expected_stdout: |
+expected_stderr: |
+expected_returncode: 0
diff --git a/xml_converter/src/packaging_protobin.cpp b/xml_converter/src/packaging_protobin.cpp
@@ -209,11 +209,11 @@ void write_protobuf_file(
         Parseable* parsed_poi = (*parsed_pois)[i];
         if (parsed_poi->classname() == "POI") {
             Icon* icon = dynamic_cast<Icon*>(parsed_poi);
-            category_to_pois[icon->category.category].push_back(parsed_poi);
+            category_to_pois[lowercase(icon->category.category)].push_back(parsed_poi);
         }
         else if (parsed_poi->classname() == "Trail") {
             Trail* trail = dynamic_cast<Trail*>(parsed_poi);
-            category_to_pois[trail->category.category].push_back(parsed_poi);
+            category_to_pois[lowercase(trail->category.category)].push_back(parsed_poi);
         }
         else {
             std::cout << "Unknown type" << std::endl;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@

		L
		My Category 2B\�)Cf�RC{�WC 2B\�)Cf�RC{�WC 2B\�)Cf�RC{�WC
Expand Down