Skip to content

Commit 85cba42

Browse files
AlexeyMerzlyakovAlexeyMerzlyakov
committed
Fixing review comments
* Separate map_server and map_saver sources * Fix copyrights * Suppress false-positive uncrustify failure
1 parent 0db44c7 commit 85cba42

8 files changed

Lines changed: 39 additions & 18 deletions

File tree

‎nav2_map_server/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ set(map_saver_cli_executable map_saver_cli)
2626
set(map_saver_server_executable map_saver_server)
2727

2828
add_executable(${map_server_executable}
29-
src/map_server_main.cpp)
29+
src/map_server/main.cpp)
3030

3131
add_executable(${map_saver_cli_executable}
32-
src/map_saver_cli_main.cpp)
32+
src/map_saver/main_cli.cpp)
3333

3434
add_executable(${map_saver_server_executable}
35-
src/map_saver_server_main.cpp)
35+
src/map_saver/main_server.cpp)
3636

3737
set(map_io_library_name map_io)
3838

@@ -43,8 +43,8 @@ add_library(${map_io_library_name} SHARED
4343
src/map_io.cpp)
4444

4545
add_library(${library_name} SHARED
46-
src/map_server.cpp
47-
src/map_saver.cpp)
46+
src/map_server/map_server.cpp
47+
src/map_saver/map_saver.cpp)
4848

4949
set(map_io_dependencies
5050
yaml_cpp_vendor

‎nav2_map_server/include/nav2_map_server/map_saver.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Copyright (c) 2020 Samsung Research Russia
2+
// Copyright (c) 2018 Intel Corporation
23
//
34
// Licensed under the Apache License, Version 2.0 (the "License");
45
// you may not use this file except in compliance with the License.

nav2_map_server/src/map_saver_cli_main.cpp renamed to nav2_map_server/src/map_saver/main_cli.cpp

File renamed without changes.

nav2_map_server/src/map_saver_server_main.cpp renamed to nav2_map_server/src/map_saver/main_server.cpp

File renamed without changes.

nav2_map_server/src/map_saver.cpp renamed to nav2_map_server/src/map_saver/map_saver.cpp

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
1-
// Copyright (c) 2020 Samsung Research Russia
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
/*
2+
* Copyright (c) 2020 Samsung Research Russia
3+
* Copyright 2019 Rover Robotics
4+
* Copyright (c) 2008, Willow Garage, Inc.
5+
* All rights reserved.
6+
*
7+
* Redistribution and use in source and binary forms, with or without
8+
* modification, are permitted provided that the following conditions are met:
9+
*
10+
* * Redistributions of source code must retain the above copyright
11+
* notice, this list of conditions and the following disclaimer.
12+
* * Redistributions in binary form must reproduce the above copyright
13+
* notice, this list of conditions and the following disclaimer in the
14+
* documentation and/or other materials provided with the distribution.
15+
* * Neither the name of the <ORGANIZATION> nor the names of its
16+
* contributors may be used to endorse or promote products derived from
17+
* this software without specific prior written permission.
18+
*
19+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
23+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29+
* POSSIBILITY OF SUCH DAMAGE.
30+
*/
1431

1532
#include "nav2_map_server/map_saver.hpp"
1633

nav2_map_server/src/map_server_main.cpp renamed to nav2_map_server/src/map_server/main.cpp

File renamed without changes.

nav2_map_server/src/map_server.cpp renamed to nav2_map_server/src/map_server/map_server.cpp

File renamed without changes.

‎nav2_map_server/test/test_constants/test_constants.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ extern const char * g_valid_yaml_file;
4646
extern const char * g_tmp_dir;
4747

4848
extern const double g_valid_image_res;
49+
// *INDENT-OFF*
50+
// Uncrustify may incorrectly guide to add extra spaces in < double > during CI tests
4951
extern const std::vector<double> g_valid_origin;
52+
// *INDENT-ON*
5053
extern const double g_default_free_thresh;
5154
extern const double g_default_occupied_thresh;
5255

0 commit comments

Comments
 (0)