move SpeechPriority class definition

Signed-off-by: Daisuke Sato <[email protected]>

cabot_ui/cabot_ui/cabot_rclpy_util.py

@@ -91,10 +91,3 @@ def to_sec(cls, duration: Duration):
     @classmethod
     def time_zero(cls):
         return Time(seconds=0, nanoseconds=0, clock_type=cls.instance().clock.clock_type)
-
-
-class SpeechPriority:
-    REQUIRED = 90
-    HIGH = 60
-    NORMAL = 30
-    LOW = 10

cabot_ui/cabot_ui/geojson.py

@@ -40,7 +40,8 @@
 import angles
 import geometry_msgs.msg
 from cabot_ui import geoutil, i18n
-from cabot_ui.cabot_rclpy_util import CaBotRclpyUtil, SpeechPriority
+from cabot_ui.cabot_rclpy_util import CaBotRclpyUtil
+from cabot_ui.interface import SpeechPriority
 
 
 class RouteStruct(enum.Enum):

cabot_ui/cabot_ui/interface.py

@@ -25,7 +25,7 @@
 from rclpy.duration import Duration
 from rclpy.exceptions import InvalidServiceNameException
 from rclpy.callback_groups import MutuallyExclusiveCallbackGroup
-from cabot_ui.cabot_rclpy_util import CaBotRclpyUtil, SpeechPriority
+from cabot_ui.cabot_rclpy_util import CaBotRclpyUtil
 
 import std_msgs.msg
 import cabot_msgs.msg
@@ -37,6 +37,13 @@
 from cabot_common import vibration
 
 
+class SpeechPriority:
+    REQUIRED = 90
+    HIGH = 60
+    NORMAL = 30
+    LOW = 10
+
+
 class UserInterface(object):
     SOCIAL_ANNOUNCE_INTERVAL = Duration(seconds=15.0)
     NOTIFY_TURN_INTERVAL = Duration(seconds=5.0)