Merge pull request #27 from astumpf/pr_fix_empty_msg_header

Fix empty header of wavemap msgs for non-hashed octrees
ethz-asl · Aug 28, 2023 · 661b1ac · 661b1ac
2 parents 10a8219 + d6a4656
commit 661b1ac
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 11 deletions.
diff --git a/libraries/wavemap/CHANGELOG.rst b/libraries/wavemap/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.3.2 (2023-08-28)
+------------------
+
 1.3.1 (2023-08-22)
 ------------------
 * Release the code under the BSD-3 license

diff --git a/libraries/wavemap/package.xml b/libraries/wavemap/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap</name>
-  <version>1.3.1</version>
+  <version>1.3.2</version>
   <description>Base library for wavemap.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/libraries/wavemap_io/CHANGELOG.rst b/libraries/wavemap_io/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_io
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.3.2 (2023-08-28)
+------------------
+
 1.3.1 (2023-08-22)
 ------------------
 * Release the code under the BSD-3 license

diff --git a/libraries/wavemap_io/package.xml b/libraries/wavemap_io/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_io</name>
-  <version>1.3.1</version>
+  <version>1.3.2</version>
   <description>(De)serialization of wavemap types to files.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_msgs/CHANGELOG.rst b/ros/wavemap_msgs/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.3.2 (2023-08-28)
+------------------
+
 1.3.1 (2023-08-22)
 ------------------
 * Release the code under the BSD-3 license

diff --git a/ros/wavemap_msgs/package.xml b/ros/wavemap_msgs/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_msgs</name>
-  <version>1.3.1</version>
+  <version>1.3.2</version>
   <description>Message definitions for wavemap's ROS interfaces.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_ros/CHANGELOG.rst b/ros/wavemap_ros/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package wavemap_ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.3.2 (2023-08-28)
+------------------
+* Fix empty header of wavemap msgs
+* Contributors: Alexander Stumpf
+
 1.3.1 (2023-08-22)
 ------------------
 * Release the code under the BSD-3 license

diff --git a/ros/wavemap_ros/package.xml b/ros/wavemap_ros/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_ros</name>
-  <version>1.3.1</version>
+  <version>1.3.2</version>
   <description>ROS interface for wavemap.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_ros/src/wavemap_server.cc b/ros/wavemap_ros/src/wavemap_server.cc
@@ -75,8 +75,8 @@ void WavemapServer::publishMap(bool republish_whole_map) {
     } else {
       occupancy_map_->threshold();
       wavemap_msgs::Map map_msg;
-      if (convert::mapToRosMsg(*occupancy_map_, map_msg.header.frame_id,
-                               map_msg.header.stamp, map_msg)) {
+      if (convert::mapToRosMsg(*occupancy_map_, config_.world_frame,
+                               ros::Time::now(), map_msg)) {
         map_pub_.publish(map_msg);
       }
     }

diff --git a/ros/wavemap_ros_conversions/CHANGELOG.rst b/ros/wavemap_ros_conversions/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_ros_conversions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.3.2 (2023-08-28)
+------------------
+
 1.3.1 (2023-08-22)
 ------------------
 * Release the code under the BSD-3 license

diff --git a/ros/wavemap_ros_conversions/package.xml b/ros/wavemap_ros_conversions/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_ros_conversions</name>
-  <version>1.3.1</version>
+  <version>1.3.2</version>
   <description>Conversions between wavemap and ROS types.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_rviz_plugin/CHANGELOG.rst b/ros/wavemap_rviz_plugin/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_rviz_plugin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.3.2 (2023-08-28)
+------------------
+
 1.3.1 (2023-08-22)
 ------------------
 * Release the code under the BSD-3 license

diff --git a/ros/wavemap_rviz_plugin/package.xml b/ros/wavemap_rviz_plugin/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_rviz_plugin</name>
-  <version>1.3.1</version>
+  <version>1.3.2</version>
   <description>Plugin to interactively visualize maps published in wavemap's
     native format.
   </description>

diff --git a/tooling/packages/catkin_setup/CHANGELOG.rst b/tooling/packages/catkin_setup/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package catkin_setup
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.3.2 (2023-08-28)
+------------------
+
 1.3.1 (2023-08-22)
 ------------------
 * Release the code under the BSD-3 license

diff --git a/tooling/packages/catkin_setup/package.xml b/tooling/packages/catkin_setup/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>catkin_setup</name>
-    <version>1.3.1</version>
+    <version>1.3.2</version>
     <description>Dummy package to make it easy to setup the workspace and generate the setup.[sh|bash|zsh] scripts in CI.</description>
 
     <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/tooling/packages/wavemap_all/CHANGELOG.rst b/tooling/packages/wavemap_all/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_all
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.3.2 (2023-08-28)
+------------------
+
 1.3.1 (2023-08-22)
 ------------------
 * Release the code under the BSD-3 license

diff --git a/tooling/packages/wavemap_all/package.xml b/tooling/packages/wavemap_all/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_all</name>
-  <version>1.3.1</version>
+  <version>1.3.2</version>
   <description>Metapackage that builds all wavemap packages.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/tooling/packages/wavemap_utils/CHANGELOG.rst b/tooling/packages/wavemap_utils/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_utils
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.3.2 (2023-08-28)
+------------------
+
 1.3.1 (2023-08-22)
 ------------------
 * Release the code under the BSD-3 license

diff --git a/tooling/packages/wavemap_utils/package.xml b/tooling/packages/wavemap_utils/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>wavemap_utils</name>
-    <version>1.3.1</version>
+    <version>1.3.2</version>
     <description>Small package containing scripts to simplify common wavemap development tasks.</description>
 
     <maintainer email="[email protected]">Victor Reijgwart</maintainer>