Skip to content

Commit ca56bd6

Browse files
javizqhjavizqh
authored
Merge pull request #543 from JdeRobot/update-db
Update db
2 parents 2ab77f8 + 3fca767 commit ca56bd6

File tree

1 file changed

+62
-44
lines changed

1 file changed

+62
-44
lines changed

‎database/universes.sql‎

Lines changed: 62 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@ CREATE TABLE public.worlds (
5757
id bigint NOT NULL,
5858
name character varying(100) NOT NULL,
5959
launch_file_path character varying(200) NOT NULL,
60-
visualization_config_path character varying(200) NOT NULL,
60+
tools_config character varying(200) NOT NULL,
6161
ros_version character varying(4) NOT NULL,
62-
visualization character varying(50) NOT NULL,
63-
world character varying(50) NOT NULL,
62+
type character varying(50) NOT NULL,
6463
start_pose real[6] NOT NULL
6564
);
6665

@@ -109,6 +108,18 @@ ALTER TABLE public.robots ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
109108
CACHE 1
110109
);
111110

111+
--
112+
-- Name: tools; Type: TABLE; Schema: public; Owner: user-dev
113+
--
114+
115+
CREATE TABLE public.tools (
116+
name character varying(50) NOT NULL PRIMARY KEY,
117+
base_config character varying(200) NOT NULL
118+
);
119+
120+
121+
ALTER TABLE public.tools OWNER TO "user-dev";
122+
112123
--
113124
-- Data for Name: universes; Type: TABLE DATA; Schema: public; Owner: user-dev
114125
--
@@ -148,8 +159,6 @@ COPY public.universes (id, name, world_id, robot_id) FROM stdin;
148159
32 Follow Road Harmonic 32 0
149160
33 Laser Mapping Warehouse 12 0
150161
34 Pick And Place World 34 0
151-
35 Spa Circuit 35 0
152-
36 Monaco Circuit 36 0
153162
\.
154163

155164

@@ -158,46 +167,43 @@ COPY public.universes (id, name, world_id, robot_id) FROM stdin;
158167
--
159168

160169

161-
COPY public.worlds (id, name, launch_file_path, visualization_config_path, ros_version, visualization, world, start_pose) FROM stdin;
162-
0 None None None ROS2 none none {0.0,0.0,0.0,0.0,0.0,0.0}
163-
1 3d Reconstruction /opt/jderobot/Launchers/3d_reconstruction.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
164-
2 Autoparking Gas Station: In battery /opt/jderobot/Launchers/gas_station_battery_ackermann.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
165-
3 Autoparking Gas Station: In line /opt/jderobot/Launchers/gas_station_line_ackermann.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
166-
4 Autoparking Gas Station: Parking lot /opt/jderobot/Launchers/gas_station_parking_ackermann.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
167-
5 Autoparking Lidar Simple: In line /opt/jderobot/Launchers/prius_360_autoparking.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
168-
6 Autoparking Simple: In battery /opt/jderobot/Launchers/prius_bateria.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
169-
7 Autoparking Simple: In line /opt/jderobot/Launchers/prius_autoparking.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
170-
8 City Large /opt/jderobot/Launchers/taxi_navigator.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
171-
9 City Large Followcam /opt/jderobot/Launchers/taxi_navigator_followingcam.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
172-
10 Follow Person /opt/jderobot/Launchers/follow_person.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
173-
11 Follow Person Teleop /opt/jderobot/Launchers/follow_person_teleop.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
174-
12 Laser Mapping Warehouse /opt/jderobot/Launchers/laser_mapping.launch.py /opt/jderobot/Launchers/visualization/laser_mapping.config ROS2 gzsim_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
175-
13 Montmelo Ackermann Circuit /opt/jderobot/Launchers/montmelo_circuit_ackermann.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
176-
14 Montmelo Circuit /opt/jderobot/Launchers/montmelo_circuit.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
177-
15 Montreal Ackermann Circuit /opt/jderobot/Launchers/montreal_circuit_ackermann.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
178-
16 Montreal Circuit /opt/jderobot/Launchers/montreal_circuit.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
179-
17 Nurburgring Ackermann Circuit /opt/jderobot/Launchers/nurburgring_circuit_ackermann.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
180-
18 Nurburgring Circuit /opt/jderobot/Launchers/nurburgring_circuit.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
181-
19 Obstacle Avoidance Default /opt/jderobot/Launchers/simple_circuit_obstacles_followingcam.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
182-
20 Rescue Default /opt/jderobot/Launchers/world.json None ROS2 gazebo_rae drones {0.0,0.0,0.0,0.0,0.0,0.0}
183-
21 Restaurant /opt/jderobot/Launchers/restaurant.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
184-
22 Simple Ackermann Circuit /opt/jderobot/Launchers/simple_circuit_ackermann.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
185-
23 Simple Circuit /opt/jderobot/Launchers/simple_circuit.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
186-
24 Vacuums House /opt/jderobot/Launchers/vacuum_cleaner.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
187-
25 Vacuums House Markers /opt/jderobot/Launchers/marker_visual_loc.launch.py /opt/jderobot/Launchers/visualization/marker_visual_loc.config ROS2 gzsim_rae gazebo {1,-1.5,0.6,0,0,0}
188-
26 Vacuums House Roof /opt/jderobot/Launchers/montecarlo_visual_loc.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
189-
27 Warehouse 1 /opt/jderobot/Launchers/amazon_robot.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
190-
28 Warehouse 1 Ackermann /opt/jderobot/Launchers/small_warehouse_with_ackermann_logistic_robot.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
191-
29 Warehouse 2 /opt/jderobot/Launchers/pallet_warehouse.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
192-
30 Warehouse 2 Ackermann /opt/jderobot/Launchers/pallet_warehouse_with_ackermann_logistic_robot.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
193-
31 Rescue People Harmonic /opt/jderobot/Launchers/rescue_people.launch.py /opt/jderobot/Launchers/visualization/rescue_people.config ROS2 gzsim_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
194-
32 Follow Road Harmonic /opt/jderobot/Launchers/follow_road.launch.py /opt/jderobot/Launchers/visualization/follow_road.config ROS2 gzsim_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
195-
33 Small Laser Mapping Warehouse /opt/jderobot/Launchers/small_laser_mapping.launch.py /opt/jderobot/Launchers/visualization/small_laser_mapping.config ROS2 gzsim_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
196-
34 Pick And Place Arm /home/dev_ws/src/IndustrialRobots/ros2_SimRealRobotControl/ros2srrc_launch/moveit2/moveit2.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
197-
35 Spa Circuit /opt/jderobot/Launchers/spa_circuit.launch.py None ROS2 gzsim_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
198-
36 Monaco Circuit /opt/jderobot/Launchers/monaco_circuit.launch.py None ROS2 gzsim_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
170+
COPY public.worlds (id, name, launch_file_path, tools_config, ros_version, type, start_pose) FROM stdin;
171+
0 None None None ROS2 none {0.0,0.0,0.0,0.0,0.0,0.0}
172+
1 3d Reconstruction /opt/jderobot/Launchers/3d_reconstruction.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
173+
2 Autoparking Gas Station: In battery /opt/jderobot/Launchers/gas_station_battery_ackermann.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
174+
3 Autoparking Gas Station: In line /opt/jderobot/Launchers/gas_station_line_ackermann.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
175+
4 Autoparking Gas Station: Parking lot /opt/jderobot/Launchers/gas_station_parking_ackermann.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
176+
5 Autoparking Lidar Simple: In line /opt/jderobot/Launchers/prius_360_autoparking.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
177+
6 Autoparking Simple: In battery /opt/jderobot/Launchers/prius_bateria.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
178+
7 Autoparking Simple: In line /opt/jderobot/Launchers/prius_autoparking.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
179+
8 City Large /opt/jderobot/Launchers/taxi_navigator.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
180+
9 City Large Followcam /opt/jderobot/Launchers/taxi_navigator_followingcam.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
181+
10 Follow Person /opt/jderobot/Launchers/follow_person.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
182+
11 Follow Person Teleop /opt/jderobot/Launchers/follow_person_teleop.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
183+
12 Laser Mapping Warehouse /opt/jderobot/Launchers/laser_mapping.launch.py {"gzsim":"/opt/jderobot/Launchers/visualization/laser_mapping.config"} ROS2 gz {0.0,0.0,0.0,0.0,0.0,0.0}
184+
13 Montmelo Ackermann Circuit /opt/jderobot/Launchers/montmelo_circuit_ackermann.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
185+
14 Montmelo Circuit /opt/jderobot/Launchers/montmelo_circuit.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
186+
15 Montreal Ackermann Circuit /opt/jderobot/Launchers/montreal_circuit_ackermann.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
187+
16 Montreal Circuit /opt/jderobot/Launchers/montreal_circuit.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
188+
17 Nurburgring Ackermann Circuit /opt/jderobot/Launchers/nurburgring_circuit_ackermann.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
189+
18 Nurburgring Circuit /opt/jderobot/Launchers/nurburgring_circuit.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
190+
19 Obstacle Avoidance Default /opt/jderobot/Launchers/simple_circuit_obstacles_followingcam.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
191+
20 Rescue Default /opt/jderobot/Launchers/world.json None ROS2 drones {0.0,0.0,0.0,0.0,0.0,0.0}
192+
21 Restaurant /opt/jderobot/Launchers/restaurant.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
193+
22 Simple Ackermann Circuit /opt/jderobot/Launchers/simple_circuit_ackermann.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
194+
23 Simple Circuit /opt/jderobot/Launchers/simple_circuit.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
195+
24 Vacuums House /opt/jderobot/Launchers/vacuum_cleaner.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
196+
25 Vacuums House Markers /opt/jderobot/Launchers/marker_visual_loc.launch.py {"gzsim":"/opt/jderobot/Launchers/visualization/marker_visual_loc.config"} ROS2 gz {1,-1.5,0.6,0,0,0}
197+
26 Vacuums House Roof /opt/jderobot/Launchers/montecarlo_visual_loc.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
198+
27 Warehouse 1 /opt/jderobot/Launchers/amazon_robot.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
199+
28 Warehouse 1 Ackermann /opt/jderobot/Launchers/small_warehouse_with_ackermann_logistic_robot.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
200+
29 Warehouse 2 /opt/jderobot/Launchers/pallet_warehouse.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
201+
30 Warehouse 2 Ackermann /opt/jderobot/Launchers/pallet_warehouse_with_ackermann_logistic_robot.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
202+
31 Rescue People Harmonic /opt/jderobot/Launchers/rescue_people.launch.py {"gzsim":"/opt/jderobot/Launchers/visualization/rescue_people.config"} ROS2 gz {0.0,0.0,0.0,0.0,0.0,0.0}
203+
32 Follow Road Harmonic /opt/jderobot/Launchers/follow_road.launch.py {"gzsim":"/opt/jderobot/Launchers/visualization/follow_road.config"} ROS2 gz {0.0,0.0,0.0,0.0,0.0,0.0}
204+
33 Small Laser Mapping Warehouse /opt/jderobot/Launchers/small_laser_mapping.launch.py {"gzsim":"/opt/jderobot/Launchers/visualization/small_laser_mapping.config"} ROS2 gz {0.0,0.0,0.0,0.0,0.0,0.0}
205+
34 Pick And Place Arm /home/dev_ws/src/IndustrialRobots/ros2_SimRealRobotControl/ros2srrc_launch/moveit2/moveit2.launch.py None ROS2 gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
199206
\.
200-
-- 34 Pick And Place Arm /opt/jderobot/Launchers/pick_place.launch.py None ROS2 gazebo_rae gazebo {0.0,0.0,0.0,0.0,0.0,0.0}
201207

202208
--
203209
-- Data for Name: robots; Type: TABLE DATA; Schema: public; Owner: user-dev
@@ -208,6 +214,18 @@ COPY public.robots (id, name, launch_file_path) FROM stdin;
208214
\.
209215
-- 1 Turtlebot 3 /opt/jderobot/Launchers/robots/turtlebot3/spawn_robot.launch.py
210216

217+
--
218+
-- Data for Name: tools; Type: TABLE DATA; Schema: public; Owner: user-dev
219+
--
220+
221+
COPY public.tools (name, base_config) FROM stdin;
222+
console None
223+
simulator None
224+
web_gui None
225+
state_monitor None
226+
\.
227+
228+
211229
--
212230
-- Name: exercises_universe_id_seq; Type: SEQUENCE SET; Schema: public; Owner: user-dev
213231
--

0 commit comments

Comments
 (0)