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

Merge test web visualisation to dev branch #8

Merged
merged 23 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d355a64
Add two version of python and of requirement for apache-superset down…
MatRouillard Jul 3, 2024
9f1531d
Add test and review of apache-superset
MatRouillard Jul 3, 2024
d0d345e
Add Apache-superset preview
MatRouillard Jul 4, 2024
6778fe1
Change requirements architecture and documents related to requirements
MatRouillard Jul 4, 2024
6146882
Add first tests and review of streamlit
MatRouillard Jul 4, 2024
f62ec3c
Change a line in streamlit application
MatRouillard Jul 8, 2024
44fcc2e
Update QGIS project
MatRouillard Jul 10, 2024
0435989
Update streamlit test for GeoServer
MatRouillard Jul 10, 2024
01c8f5a
Add files for Plotly Dash tests
MatRouillard Jul 10, 2024
2678d3c
Add files to init and use GeoServer
MatRouillard Jul 10, 2024
1e42f1e
Update Streamlit review / Add Plotly Dash review / Add GeoServer section
MatRouillard Jul 10, 2024
166305f
Update init.sh file
MatRouillard Jul 10, 2024
64cf01e
Update files and QGIS project
MatRouillard Jul 11, 2024
ad65395
Add several python scripts and tests
MatRouillard Jul 11, 2024
6ab3d2d
Change gitignore
MatRouillard Jul 19, 2024
55720a3
Change requirements file
MatRouillard Jul 19, 2024
fbf2bcb
Remove vector tiles script
MatRouillard Jul 19, 2024
ab24224
Rerun data integration and quality scripts and change minor things / …
MatRouillard Jul 19, 2024
3fc9815
Update first trial of shiny script
MatRouillard Jul 19, 2024
7ea3044
Add dashboard app and reviews
MatRouillard Jul 19, 2024
0558572
Add nav and sidebar to the application
MatRouillard Jul 23, 2024
4819c1d
Finish dashboard by adding licenses, help and logos
MatRouillard Jul 23, 2024
a920133
Change requirement path in github action
MatRouillard Jul 23, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Dependencies installation
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install -r Requirements/requirements_base.txt

- name: Docker setup
run: docker compose up -d
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.venv
__pycache__/
cache/
cache/
.streamlit/
tiles
other.py
Binary file modified Data/QGIS/quality_criteria_OSM_OMF.qgz
Binary file not shown.
308 changes: 58 additions & 250 deletions Data/Results/Automatic_result.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Documentation/Comparison-OSM-OvertureMap_PgRouting.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Comparison betweem OpenStreetMap and OvertureMap Foundation data with PgRouting
# Comparison between OpenStreetMap and OvertureMap Foundation data with PgRouting

- [Comparison betweem OpenStreetMap and OvertureMap Foundation data with PgRouting](#comparison-betweem-openstreetmap-and-overturemap-foundation-data-with-pgrouting)
- [Comparison between OpenStreetMap and OvertureMap Foundation data with PgRouting](#comparison-between-openstreetmap-and-overturemap-foundation-data-with-pgrouting)
- [Dataset creation](#dataset-creation)
- [Comparison process](#comparison-process)
- [Tests zone](#tests-zone)
Expand Down
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.
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.
Binary file not shown.
51 changes: 41 additions & 10 deletions Documentation/command.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
# Useful commands

## Create virtual environnment
- [Useful commands](#useful-commands)
- [Virtual environnment](#virtual-environnment)
- [Delete directory](#delete-directory)
- [Create and activate virtual environment](#create-and-activate-virtual-environment)
- [Ugrade pip](#ugrade-pip)
- [Install dependencies](#install-dependencies)
- [Push to a new branch on github](#push-to-a-new-branch-on-github)
- [Install act (tool to run github actions locally)](#install-act-tool-to-run-github-actions-locally)
- [Install scoop](#install-scoop)
- [Install act](#install-act)
- [Install docker](#install-docker)
- [Install wls](#install-wls)
- [Path of python in windows](#path-of-python-in-windows)

**Delete directory**

## Virtual environnment

### Delete directory

```console
rmdir /S /Q .venv
```

**Create and activate virtual environment**
### Create and activate virtual environment

```console
python -m venv .venv
Expand All @@ -24,10 +39,18 @@ To activate the virtual environnment:
To deactivate it:

```console
.venv\Scripts\activate
.venv\Scripts\deactivate.bat
```

## Install dependencies
### Ugrade pip

```console
python.exe -m pip install --upgrade pip
```

### Install dependencies

Replace `requirements.in` by the name of your requirements file.

```console
pip install pip-tools
Expand All @@ -51,7 +74,7 @@ git push --set-upstream origin tests_functions

Following this document : https://gist.github.com/sweetlilmre/758818d0b2a0fdfd79595e396d1e608d.

**Install scoop**
### Install scoop

In a powershell command

Expand All @@ -60,22 +83,30 @@ Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
Invoke-RestMethod -Uri https://get.scoop.sh | Invoke-Expression
```

**Install act**
### Install act

```console
scoop bucket add main
scoop install main/act
```

**Install docker**
### Install docker

On this website : https://www.docker.com/products/docker-desktop/

Download the installer and follow the procedure

**Install wls**
### Install wls

```console
wsl --install
```

Then type your username and password (mathis for both).
Then type your username and password (mathis for both).

## Path of python in windows

C:\Users\Mathis.Rouillard\AppData\Local\Programs\Python\Python312\Scripts\
C:\Users\Mathis.Rouillard\AppData\Local\Programs\Python\Python312\
C:\Users\Mathis.Rouillard\AppData\Local\Programs\Python\Python310\Scripts\
C:\Users\Mathis.Rouillard\AppData\Local\Programs\Python\Python310\
Loading
Loading