Skip to content

Commit

Permalink
Fix build status on front page. (#1483)
Browse files Browse the repository at this point in the history
* Fix build status on front page.

Changes "googlecartographer" to "cartographer-project"
for references to CI and GitHub.

Following cartographer-project/cartographer#1693.

Signed-off-by: Wolfgang Hess <[email protected]>

* Remove Indigo and Lunar Dockerfiles.
  • Loading branch information
wohe authored Jun 24, 2020
1 parent 2ceb9f9 commit bdf8f59
Show file tree
Hide file tree
Showing 26 changed files with 68 additions and 225 deletions.
76 changes: 0 additions & 76 deletions Dockerfile.indigo

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile.kinetic
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ ARG github_token
# Xenial's base image doesn't ship with sudo.
RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/*

# First, we invalidate the entire cache if googlecartographer/cartographer has
# First, we invalidate the entire cache if cartographer-project/cartographer has
# changed. This file's content changes whenever master changes. See:
# http://stackoverflow.com/questions/36996046/how-to-prevent-dockerfile-caching-git-clone
ADD https://api.github.com/repos/googlecartographer/cartographer/git/refs/heads/master?access_token=$github_token \
ADD https://api.github.com/repos/cartographer-project/cartographer/git/refs/heads/master?access_token=$github_token \
cartographer_ros/cartographer_version.json

# wstool needs the updated rosinstall file to clone the correct repos.
Expand Down
79 changes: 0 additions & 79 deletions Dockerfile.lunar

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile.melodic
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ ARG github_token
# Bionic's base image doesn't ship with sudo.
RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/*

# First, we invalidate the entire cache if googlecartographer/cartographer has
# First, we invalidate the entire cache if cartographer-project/cartographer has
# changed. This file's content changes whenever master changes. See:
# http://stackoverflow.com/questions/36996046/how-to-prevent-dockerfile-caching-git-clone
ADD https://api.github.com/repos/googlecartographer/cartographer/git/refs/heads/master?access_token=$github_token \
ADD https://api.github.com/repos/cartographer-project/cartographer/git/refs/heads/master?access_token=$github_token \
cartographer_ros/cartographer_version.json

# wstool needs the updated rosinstall file to clone the correct repos.
Expand Down
12 changes: 6 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Purpose
and mapping (`SLAM`_) in 2D and 3D across multiple platforms and sensor
configurations. This project provides Cartographer's ROS integration.

.. _Cartographer: https://github.com/googlecartographer/cartographer
.. _Cartographer: https://github.com/cartographer-project/cartographer
.. _SLAM: https://en.wikipedia.org/wiki/Simultaneous_localization_and_mapping

Getting started
Expand All @@ -35,26 +35,26 @@ Getting started
* You can ask a question by `creating an issue`_.

.. _our Read the Docs site: https://google-cartographer-ros.readthedocs.io
.. _creating an issue: https://github.com/googlecartographer/cartographer_ros/issues/new?labels=question
.. _creating an issue: https://github.com/cartographer-project/cartographer_ros/issues/new?labels=question

Contributing
============

You can find information about contributing to Cartographer's ROS integration
at `our Contribution page`_.

.. _our Contribution page: https://github.com/googlecartographer/cartographer_ros/blob/master/CONTRIBUTING.md
.. _our Contribution page: https://github.com/cartographer-project/cartographer_ros/blob/master/CONTRIBUTING.md

.. |build| image:: https://travis-ci.org/googlecartographer/cartographer_ros.svg?branch=master
.. |build| image:: https://travis-ci.org/cartographer-project/cartographer_ros.svg?branch=master
:alt: Build Status
:scale: 100%
:target: https://travis-ci.org/googlecartographer/cartographer_ros
:target: https://travis-ci.org/cartographer-project/cartographer_ros
.. |docs| image:: https://readthedocs.org/projects/google-cartographer-ros/badge/?version=latest
:alt: Documentation Status
:scale: 100%
:target: https://google-cartographer-ros.readthedocs.io/en/latest/?badge=latest
.. |license| image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg
:alt: Apache 2 license.
:scale: 100%
:target: https://github.com/googlecartographer/cartographer_ros/blob/master/LICENSE
:target: https://github.com/cartographer-project/cartographer_ros/blob/master/LICENSE

2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
choco upgrade %ROS_METAPACKAGE% -y
choco upgrade ros-melodic-perception -y
robocopy "." ".\src\cartographer_ros" /E /MOVE /XD "src" > NUL
git clone https://github.com/googlecartographer/cartographer src\cartographer
git clone https://github.com/cartographer-project/cartographer src\cartographer
call "C:\opt\ros\melodic\x64\env.bat" rosdep install --from-paths src --ignore-src -r -y
env:
ROS_METAPACKAGE: 'ros-melodic-desktop'
Expand Down
4 changes: 2 additions & 2 deletions cartographer_ros.rosinstall
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- git: {local-name: cartographer, uri: 'https://github.com/googlecartographer/cartographer.git', version: '1.0.0'}
- git: {local-name: cartographer_ros, uri: 'https://github.com/googlecartographer/cartographer_ros.git', version: '1.0.0'}
- git: {local-name: cartographer, uri: 'https://github.com/cartographer-project/cartographer.git', version: '1.0.0'}
- git: {local-name: cartographer_ros, uri: 'https://github.com/cartographer-project/cartographer_ros.git', version: '1.0.0'}
- git: {local-name: ceres-solver, uri: 'https://ceres-solver.googlesource.com/ceres-solver.git', version: '1.13.0'}
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ options = {

-- We also write a PLY file at this stage, because gray points look good.
-- The points in the PLY can be visualized using
-- https://github.com/googlecartographer/point_cloud_viewer.
-- https://github.com/cartographer-project/point_cloud_viewer.
{
action = "write_ply",
filename = "points.ply",
Expand Down
2 changes: 1 addition & 1 deletion cartographer_ros/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</maintainer>
<license>Apache 2.0</license>

<url>https://github.com/googlecartographer/cartographer_ros</url>
<url>https://github.com/cartographer-project/cartographer_ros</url>

<author email="[email protected]">
The Cartographer Authors
Expand Down
2 changes: 1 addition & 1 deletion cartographer_ros_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</maintainer>
<license>Apache 2.0</license>

<url>https://github.com/googlecartographer/cartographer_ros</url>
<url>https://github.com/cartographer-project/cartographer_ros</url>

<author email="[email protected]">
The Cartographer Authors
Expand Down
2 changes: 1 addition & 1 deletion cartographer_rviz/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</maintainer>
<license>Apache 2.0</license>

<url>https://github.com/googlecartographer/cartographer_ros</url>
<url>https://github.com/cartographer-project/cartographer_ros</url>

<author email="[email protected]">
The Cartographer Authors
Expand Down
2 changes: 1 addition & 1 deletion cartographer_rviz/rviz_plugin_description.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
base_class_type="rviz::Display">
<description>
Displays submaps as a unified map in RViz.
https://github.com/googlecartographer/cartographer_ros
https://github.com/cartographer-project/cartographer_ros
</description>
</class>
</library>
10 changes: 5 additions & 5 deletions docs/source/algo_walkthrough.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ IEEE, 2016. pp. 1271–1278.
Overview
--------

.. image:: https://raw.githubusercontent.com/googlecartographer/cartographer/master/docs/source/high_level_system_overview.png
:target: https://github.com/googlecartographer/cartographer/blob/master/docs/source/high_level_system_overview.png
.. image:: https://raw.githubusercontent.com/cartographer-project/cartographer/master/docs/source/high_level_system_overview.png
:target: https://github.com/cartographer-project/cartographer/blob/master/docs/source/high_level_system_overview.png

Cartographer can be seen as two separate, but related subsystems.
The first one is **local SLAM** (sometimes also called **frontend** or local trajectory builder).
Its job is to build a succession of **submaps**.
Each submap is meant to be locally consistent but we accept that local SLAM drifts over time.
Most of the local SLAM options can be found in `install_isolated/share/cartographer/configuration_files/trajectory_builder_2d.lua`_ for 2D and `install_isolated/share/cartographer/configuration_files/trajectory_builder_3d.lua`_ for 3D. (for the rest of this page we will refer to `TRAJECTORY_BUILDER_nD` for the common options)

.. _install_isolated/share/cartographer/configuration_files/trajectory_builder_2d.lua: https://github.com/googlecartographer/cartographer/blob/df337194e21f98f8c7b0b88dab33f878066d4b56/configuration_files/trajectory_builder_2d.lua
.. _install_isolated/share/cartographer/configuration_files/trajectory_builder_3d.lua: https://github.com/googlecartographer/cartographer/blob/df337194e21f98f8c7b0b88dab33f878066d4b56/configuration_files/trajectory_builder_3d.lua
.. _install_isolated/share/cartographer/configuration_files/trajectory_builder_2d.lua: https://github.com/cartographer-project/cartographer/blob/df337194e21f98f8c7b0b88dab33f878066d4b56/configuration_files/trajectory_builder_2d.lua
.. _install_isolated/share/cartographer/configuration_files/trajectory_builder_3d.lua: https://github.com/cartographer-project/cartographer/blob/df337194e21f98f8c7b0b88dab33f878066d4b56/configuration_files/trajectory_builder_3d.lua

The other subsystem is **global SLAM** (sometimes called the **backend**).
It runs in background threads and its main job is to find **loop closure constraints**.
Expand All @@ -50,7 +50,7 @@ It also incorporates other sensor data to get a higher level view and identify t
In 3D, it also tries to find the direction of gravity.
Most of its options can be found in `install_isolated/share/cartographer/configuration_files/pose_graph.lua`_

.. _install_isolated/share/cartographer/configuration_files/pose_graph.lua: https://github.com/googlecartographer/cartographer/blob/df337194e21f98f8c7b0b88dab33f878066d4b56/configuration_files/pose_graph.lua
.. _install_isolated/share/cartographer/configuration_files/pose_graph.lua: https://github.com/cartographer-project/cartographer/blob/df337194e21f98f8c7b0b88dab33f878066d4b56/configuration_files/pose_graph.lua

On a higher abstraction, the job of local SLAM is to generate good submaps and the job of global SLAM is to tie them most consistently together.

Expand Down
Loading

0 comments on commit bdf8f59

Please sign in to comment.