Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3D view updates #298

Merged
merged 11 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false # don't cancel if a job from the matrix fails
matrix:
python-version: ["3.9", "3.10", "3.11"] # 3.12: pyfftw not yet supported
python-version: ["3.10", "3.11", "3.12", "3.13"]

steps:
- uses: actions/checkout@v2
Expand All @@ -26,7 +26,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
run: |
sudo apt install -y sqlite3 fftw3 libfftw3-dev
sudo apt install -y sqlite3 libfftw3-bin libfftw3-dev
pip install -r app/requirements.txt
- name : Running Tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Flight Review is deployed at https://review.px4.io.
#### Ubuntu

```bash
sudo apt-get install sqlite3 fftw3 libfftw3-dev
sudo apt-get install sqlite3 libfftw3-bin libfftw3-dev
```

**Note:** Under some Ubuntu and Debian environments you might have to
Expand Down
6 changes: 3 additions & 3 deletions app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ubuntu:jammy
FROM ubuntu:noble

COPY requirements.txt requirements.txt

RUN apt-get update && \
apt-get install -y --no-install-recommends apt-utils python3 python3-pip sqlite3 fftw3 python3-setuptools && \
apt-get install -y --no-install-recommends apt-utils python3 python3-pip sqlite3 libfftw3-bin python3-setuptools && \
apt-get install -y --no-install-recommends python3-dev libfftw3-dev git && \
pip3 install --no-cache-dir -r requirements.txt && \
pip3 install --break-system-packages --no-cache-dir -r requirements.txt && \
apt-get remove -y python3-dev libfftw3-dev git && \
apt-get -y autoremove && \
rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 0 additions & 2 deletions app/config_default.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ airframes_url = https://px4-travis.s3.amazonaws.com/Firmware/master/_general/air
parameters_url = https://px4-travis.s3.amazonaws.com/Firmware/master/_general/parameters.xml
events_url = https://px4-travis.s3.amazonaws.com/Firmware/master/_general/all_events.json.xz

# for 3D view, https://www.bingmapsportal.com/
bing_maps_api_key =
# for 3D view, https://cesium.com/ion/
cesium_api_key =
# https://www.mapbox.com/account/access-tokens
Expand Down
5 changes: 0 additions & 5 deletions app/plot_app/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
__PARAMETERS_URL = _conf.get('general', 'parameters_url')
__EVENTS_URL = _conf.get('general', 'events_url')
__MAPBOX_API_ACCESS_TOKEN = _conf.get('general', 'mapbox_api_access_token')
__BING_API_KEY = _conf.get('general', 'bing_maps_api_key')
__CESIUM_API_KEY = _conf.get('general', 'cesium_api_key')
__LOG_CACHE_SIZE = int(_conf.get('general', 'log_cache_size'))
__DB_FILENAME_CUSTOM = _conf.get('general', 'db_filename')
Expand Down Expand Up @@ -136,10 +135,6 @@ def get_mapbox_api_access_token():
""" get MapBox API Access Token """
return __MAPBOX_API_ACCESS_TOKEN

def get_bing_maps_api_key():
""" get Bing maps API key """
return __BING_API_KEY

def get_cesium_api_key():
""" get Cesium API key """
return __CESIUM_API_KEY
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<TileMap version="1.0.0" tilemapservice="http://tms.osgeo.org/1.0.0">
<Title>NE2_HR_LC_SR_W_DR_recolored.tif</Title>
<Abstract></Abstract>
<SRS>EPSG:4326</SRS>
<BoundingBox miny="-90.00000000000000" minx="-180.00000000000000" maxy="90.00000000000000" maxx="180.00000000000000"/>
<Origin y="-90.00000000000000" x="-180.00000000000000"/>
<TileFormat width="256" height="256" mime-type="image/jpg" extension="jpg"/>
<TileSets profile="geodetic">
<TileSet href="0" units-per-pixel="0.70312500000000" order="0"/>
<TileSet href="1" units-per-pixel="0.35156250000000" order="1"/>
<TileSet href="2" units-per-pixel="0.17578125000000" order="2"/>
</TileSets>
</TileMap>
<?xml version="1.0" encoding="utf-8"?>
<TileMap version="1.0.0" tilemapservice="http://tms.osgeo.org/1.0.0">
<Title>NE2_HR_LC_SR_W_DR_recolored.tif</Title>
<Abstract></Abstract>
<SRS>EPSG:4326</SRS>
<BoundingBox miny="-90.00000000000000" minx="-180.00000000000000" maxy="90.00000000000000" maxx="180.00000000000000"/>
<Origin y="-90.00000000000000" x="-180.00000000000000"/>
<TileFormat width="256" height="256" mime-type="image/jpg" extension="jpg"/>
<TileSets profile="geodetic">
<TileSet href="0" units-per-pixel="0.70312500000000" order="0"/>
<TileSet href="1" units-per-pixel="0.35156250000000" order="1"/>
<TileSet href="2" units-per-pixel="0.17578125000000" order="2"/>
</TileSets>
</TileMap>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Loading
Loading