Skip to content

Commit 4f2b8bd

Browse files
author
berndgassmann
authored
Fix map matching with AltitudeUnknown (#75)
* Fix map matching with AltitudeUnknown * Remove Ubuntu 16.04 support and use PROJ from Ubuntu
1 parent a44354b commit 4f2b8bd

File tree

19 files changed

+1371
-1100
lines changed

19 files changed

+1371
-1100
lines changed

.github/workflows/build_test.yml

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -11,53 +11,6 @@ env:
1111
BUILDCMD: "colcon build --event-handlers console_direct+ --executor sequential --cmake-args -DBUILD_HARDENING=ON -DBUILD_TESTING=ON -DBUILD_PYTHON_BINDING=ON -DPYTHON_BINDING_VERSION=${PYTHON_BINDING_VERSION} && colcon test --event-handlers console_direct+ --packages-select ad_map_access ad_physics && colcon test-result"
1212

1313
jobs:
14-
ubuntu16job:
15-
name: Ubuntu 16.04
16-
runs-on: ubuntu-16.04
17-
18-
strategy:
19-
matrix:
20-
include:
21-
- compiler: gcc5
22-
EXTRA_PACKAGES: ""
23-
CC: ""
24-
CXX: ""
25-
PYTHON_BINDING_VERSION: "2.7"
26-
- compiler: gcc6
27-
EXTRA_PACKAGES: g++-6
28-
CC: /usr/bin/gcc-6
29-
CXX: /usr/bin/g++-6
30-
PYTHON_BINDING_VERSION: "2.7"
31-
- compiler: clang5
32-
EXTRA_PACKAGES: clang-5.0
33-
CC: /usr/bin/clang-5.0
34-
CXX: /usr/bin/clang++-5.0
35-
PYTHON_BINDING_VERSION: "2.7"
36-
- compiler: clang6
37-
EXTRA_PACKAGES: clang-6.0
38-
CC: /usr/bin/clang-6.0
39-
CXX: /usr/bin/clang++-6.0
40-
PYTHON_BINDING_VERSION: "2.7"
41-
42-
steps:
43-
- uses: actions/checkout@v2
44-
with:
45-
submodules: true
46-
47-
- name: Install Dependencies
48-
run: bash .github/workflows/install_dependencies.sh
49-
50-
- name: Build and Test
51-
env:
52-
CC: ${{ matrix.CC }}
53-
CXX: ${{ matrix.CXX }}
54-
EXTRA_PACKAGES: ${{ matrix.EXTRA_PACKAGES }}
55-
PYTHON_BINDING_VERSION: ${{ matrix.PYTHON_BINDING_VERSION }}
56-
run: |
57-
sudo apt-get install ${EXTRA_PACKAGES}
58-
rm -rf log build install
59-
eval CC=${CC} CXX=${CXX} ${BUILDCMD}
60-
6114
ubuntu18job:
6215
name: Ubuntu 18.04
6316
runs-on: ubuntu-18.04

.github/workflows/check_documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
documentationjob:
1111

1212
name: Build and Test Documentation
13-
runs-on: ubuntu-16.04
13+
runs-on: ubuntu-20.04
1414

1515
steps:
1616
- uses: actions/checkout@v2

.github/workflows/wheels.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,14 @@ jobs:
2525
with:
2626
fetch-depth: 1
2727
submodules: true
28+
- name: Prepare PROJ
29+
run: |
30+
git clone --depth=1 -b 4.9.3 https://github.com/OSGeo/PROJ.git dependencies/PROJ
2831
- name: Build wheels
32+
shell: bash
2933
run: |
34+
colcon build --packages-select PROJ4 --event-handlers console_direct+ --cmake-args -DCMAKE_POSITION_INDEPENDENT_CODE=ON
35+
source install/setup.bash
3036
colcon build --packages-up-to ad_map_access --meta colcon_python.meta --event-handlers console_direct+ --cmake-args -DPYTHON_BINDING_VERSION=${PYTHON_BINDING_VERSION}
3137
- name: Repair wheels
3238
shell: bash

.github/workflows/wheels/docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1616
autoconf \
1717
automake \
1818
castxml \
19-
libpugixml-dev && \
19+
libpugixml-dev \
20+
libproj-dev && \
2021
rm -rf /var/lib/apt/lists/*
2122

2223
RUN \

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/build/
22
/install/
33
/log/
4-
4+
__pycache__/
5+
*\.pyc

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "dependencies/spdlog"]
22
path = dependencies/spdlog
33
url = https://github.com/gabime/spdlog.git
4-
[submodule "dependencies/PROJ"]
5-
path = dependencies/PROJ
6-
url = https://github.com/OSGeo/PROJ.git

README.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,20 +67,16 @@ To download the library, you may run:
6767
```
6868

6969
#### Supported systems <a name="systems"></a>
70-
Development systems are Ubuntu 18.04 and Ubuntu 20.04. The use of Ubuntu 16.04 is no longer recommended, and support will end with the next release.
70+
Development systems are Ubuntu 18.04 and Ubuntu 20.04.
7171
Following compiler combinations are [tested continously](https://github.com/carla-simulator/map/blob/master/.travis.yml):
7272

73-
| | Ubuntu 16.04 | Ubuntu 18.04 | Ubuntu 20.04 |
74-
|:---------------:|:------------:|:------------:|:------------:|
75-
| Clang 5.0 | deprecated | | |
76-
| Clang 6.0 | deprecated | | |
77-
| Clang 7 | | x | |
78-
| Clang 8 | | x | |
79-
| GCC 5 | deprecated | | |
80-
| GCC 6 | deprecated | | |
81-
| GCC 7 | | x | |
82-
| GCC 8 | | x | |
83-
| GCC 9 | | x | x |
73+
| | Ubuntu 18.04 | Ubuntu 20.04 |
74+
|:---------------:|:------------:|:------------:|
75+
| Clang 7 | x | |
76+
| Clang 8 | x | |
77+
| GCC 7 | x | |
78+
| GCC 8 | x | |
79+
| GCC 9 | x | x |
8480

8581
Important: cmake is required to be at least version 3.5!
8682

0 commit comments

Comments
 (0)