Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed render_on_map to is_hidden_on_map #351

Merged
merged 3 commits into from
Sep 19, 2024

Conversation

klingbolt
Copy link
Contributor

No description provided.

@klingbolt klingbolt changed the title Changed render_on_map to _is_hidden_on_map Changed render_on_map to is_hidden_on_map Sep 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/input/pack/markers.bin.textproto._old	2024-09-11 00:52:54.908517059 +0000
+++ xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/input/pack/markers.bin.textproto._new	2024-09-11 00:52:54.916517035 +0000
@@ -0,0 +1,21 @@
+category {
+  name: "My Category"
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  id: "(\350\314\006\302\223^\226"
+}

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this field is used on trails and icons, but only icons are tested here. Lets add a test for trails as well.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/output_proto/markers.bin.textproto._old	2024-09-11 00:52:54.936516970 +0000
+++ xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/output_proto/markers.bin.textproto._new	2024-09-11 00:52:54.944516945 +0000
@@ -0,0 +1,21 @@
+category {
+  name: "My Category"
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  id: "(\350\314\006\302\223^\226"
+}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/xml_render_on_map/output_proto/markers.bin.textproto._old	2024-09-11 00:52:54.952516919 +0000
+++ xml_converter/integration_tests/test_cases/xml_render_on_map/output_proto/markers.bin.textproto._new	2024-09-11 00:52:54.960516893 +0000
@@ -0,0 +1,72 @@
+category {
+  name: "My Category"
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  id: "(\350\314\006\302\223^\226"
+}

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this field is used on trails and icons, but only icons are tested here. Lets add a test for trails as well.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/input/pack/markers.bin.textproto._old	2024-09-12 03:29:00.603396789 +0000
+++ xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/input/pack/markers.bin.textproto._new	2024-09-12 03:29:00.611396852 +0000
@@ -0,0 +1,26 @@
+category {
+  name: "My Category"
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  trail {
+    32: 1
+  }
+  trail {
+  }
+  id: "(\350\314\006\302\223^\226"
+}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/output_proto/markers.bin.textproto._old	2024-09-12 03:29:00.631397009 +0000
+++ xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/output_proto/markers.bin.textproto._new	2024-09-12 03:29:00.639397073 +0000
@@ -0,0 +1,26 @@
+category {
+  name: "My Category"
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  trail {
+    32: 1
+  }
+  trail {
+  }
+  id: "(\350\314\006\302\223^\226"
+}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/xml_render_on_map/output_proto/markers.bin.textproto._old	2024-09-12 03:29:00.647397136 +0000
+++ xml_converter/integration_tests/test_cases/xml_render_on_map/output_proto/markers.bin.textproto._new	2024-09-12 03:29:00.655397199 +0000
@@ -0,0 +1,92 @@
+category {
+  name: "My Category"
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  trail {
+    32: 1
+  }
+  trail {
+    32: 1
+  }
+  trail {
+  }
+  trail {
+  }
+  trail {
+    32: 1
+  }
+  trail {
+    32: 1
+  }
+  trail {
+  }
+  trail {
+  }
+  id: "(\350\314\006\302\223^\226"
+}

@AsherGlick
Copy link
Owner

This branch now has conflicts

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/input/pack/markers.bin.textproto._old	2024-09-19 03:30:48.570819324 +0000
+++ xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/input/pack/markers.bin.textproto._new	2024-09-19 03:30:48.578819394 +0000
@@ -0,0 +1,26 @@
+category {
+  name: "My Category"
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  trail {
+    32: 1
+  }
+  trail {
+  }
+  id: "(\350\314\006\302\223^\226"
+}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/output_proto/markers.bin.textproto._old	2024-09-19 03:30:48.586819464 +0000
+++ xml_converter/integration_tests/test_cases/proto_is_hidden_on_map/output_proto/markers.bin.textproto._new	2024-09-19 03:30:48.594819534 +0000
@@ -0,0 +1,26 @@
+category {
+  name: "My Category"
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  trail {
+    32: 1
+  }
+  trail {
+  }
+  id: "(\350\314\006\302\223^\226"
+}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/xml_render_on_map/output_proto/markers.bin.textproto._old	2024-09-19 03:30:48.601819595 +0000
+++ xml_converter/integration_tests/test_cases/xml_render_on_map/output_proto/markers.bin.textproto._new	2024-09-19 03:30:48.608819656 +0000
@@ -0,0 +1,92 @@
+category {
+  name: "My Category"
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    35: 1
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+  }
+  trail {
+    32: 1
+  }
+  trail {
+    32: 1
+  }
+  trail {
+  }
+  trail {
+  }
+  trail {
+    32: 1
+  }
+  trail {
+    32: 1
+  }
+  trail {
+  }
+  trail {
+  }
+  id: "(\350\314\006\302\223^\226"
+}

@AsherGlick AsherGlick merged commit 1c95171 into AsherGlick:xml_converter Sep 19, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants