Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
b0ef7e7
Add line breaks to tirex README
sebastianfuehr May 17, 2021
e6b9799
Reformating of README.md
sebastianfuehr May 18, 2021
9ef928a
Add files from the development server into project - not mine!
sebastianfuehr May 18, 2021
e999091
Improved setup instructions inside READMEs
sebastianfuehr May 24, 2021
2a5f699
Adds global logger into settings.py
sebastianfuehr May 24, 2021
c3d27c1
Recent changes by the project group.
sebastianfuehr May 24, 2021
817c38b
Sets primary key of django models to AutoField
sebastianfuehr May 24, 2021
99ea412
Add installation guide for manjaro linux.
sebastianfuehr May 26, 2021
deb28a2
Remove importer build and dist from github
sebastianfuehr May 26, 2021
2590d2a
Remove django migrations
sebastianfuehr May 26, 2021
c817d2f
Remove django migrations via gitignore
sebastianfuehr May 26, 2021
5079e46
Recent changes made by the visualization project team
sebastianfuehr May 26, 2021
15fb853
Extensive docstring documentation for the API models
sebastianfuehr May 26, 2021
f9ccc5e
Extensive docstring documentation for the rides.py script functionality
sebastianfuehr May 26, 2021
64cc989
Add step by step commends and structure into pipelines
sebastianfuehr May 26, 2021
a067ef0
Documentation of the filter collection
sebastianfuehr May 26, 2021
240c33d
Add test resources directory
sebastianfuehr May 27, 2021
8ad065c
Add documentation and some reformatting
sebastianfuehr May 27, 2021
ff8f902
Resolve import issues for VSC
sebastianfuehr May 27, 2021
03dba97
Get and save shortest path of graphhopper into the database
sebastianfuehr May 27, 2021
076f36b
Black autoformatter
sebastianfuehr May 27, 2021
b6ecec3
Expand leg model by avoided and chosen counter
sebastianfuehr May 30, 2021
c347f8f
Add project links to component list
sebastianfuehr Jun 2, 2021
9c1cbaf
Add documentation and prototype of update_avoided_legs function
sebastianfuehr Jun 2, 2021
3277849
Structure rides.py for new comparison functionality and documentation
sebastianfuehr Jun 2, 2021
924d919
Route comparison counter
sebastianfuehr Jun 2, 2021
b3bad7f
Merge pull request #1 from KrokodileDandy/dev-shortest-path
sebastianfuehr Jun 2, 2021
46d71e7
Minor comment
sebastianfuehr Jun 2, 2021
8e1ee56
Add general SimRa project description
sebastianfuehr Jun 4, 2021
07a2e0a
Add project website link
sebastianfuehr Jun 4, 2021
a792ee1
Merge pull request #2 from KrokodileDandy/dev-shortest-path-gui
sebastianfuehr Jun 4, 2021
f2de7af
Reformatting via python black
sebastianfuehr Jun 10, 2021
d91a45f
Switch to logger from console printing and reformatting
sebastianfuehr Jun 10, 2021
ee12091
Add initial setup instructions for Ubuntu 18.04
sebastianfuehr Jun 14, 2021
31d45a6
Specify tirex config files for Arch and Ubuntu
sebastianfuehr Jun 14, 2021
a3ebfba
Add a prototype for a popularity combined map
sebastianfuehr Jun 14, 2021
b40e9af
Ubuntu setup instructions for python and database
sebastianfuehr Jun 14, 2021
52689af
Add extensive mapnik setup description
sebastianfuehr Jun 14, 2021
da03ca2
Small changes to dependencies
sebastianfuehr Jun 14, 2021
c305811
Changes csv data path specific to local machine
sebastianfuehr Jun 14, 2021
b66e6e9
Resolved django setup dependency bugs
sebastianfuehr Jun 14, 2021
06ac852
Resolve wrong imports
sebastianfuehr Jun 15, 2021
b7aef37
Adapt to local configuration
sebastianfuehr Jun 16, 2021
2b18674
Add Graphhopper configuration and startup utilities
sebastianfuehr Jun 16, 2021
1b4a533
Change print to log statements (info)
sebastianfuehr Jun 16, 2021
00d700e
Add missing steps for Apache2 and mod_tile setup instructions
sebastianfuehr Jun 16, 2021
9a0f7a2
Resolve geopy ValueError because of normalization prohibition
sebastianfuehr Jun 16, 2021
1268204
Add 4 popularity maps
sebastianfuehr Jun 17, 2021
a89dcf4
Add tirex management shell script
sebastianfuehr Jun 17, 2021
fba54c0
Implement popularity-map functionality and incident overlay
sebastianfuehr Jun 18, 2021
9360bb3
Small changes to local configuration and documentation
sebastianfuehr Jun 18, 2021
9404ecf
Add incidents to remaining popularity maps
sebastianfuehr Jun 18, 2021
228e4a0
Add popularity maps with incident overlay
sebastianfuehr Jun 19, 2021
41ae5ef
Move tirex.sh into util directory
sebastianfuehr Jun 19, 2021
9b64468
Add automated setup script for Ubuntu 18.04
sebastianfuehr Jun 19, 2021
1312f7a
Merge pull request #4 from KrokodileDandy/dev-config-changes
sebastianfuehr Jun 19, 2021
27ebd9d
Add new popularity maps to -e option
sebastianfuehr Jun 19, 2021
e16a0c0
Finalization of popularity map implementation
sebastianfuehr Jun 19, 2021
78226f2
Restructure projects documentation structure
sebastianfuehr Jun 19, 2021
2538d68
Merge pull request #5 from KrokodileDandy/dev-popularity-tiles
sebastianfuehr Jun 19, 2021
3a9e711
Remove files and directories no longer needed
sebastianfuehr Jun 19, 2021
29d97ce
Implement detour threshold for map popualrity calculation
sebastianfuehr Jun 20, 2021
ac54a73
Popularity score formula correction
sebastianfuehr Jul 7, 2021
c93de14
Merge pull request #6 from KrokodileDandy/dev-detour-threshold
sebastianfuehr Jul 7, 2021
615bca8
Cleanup of unused import statements
sebastianfuehr Jul 7, 2021
41cda6a
Merge pull request #7 from KrokodileDandy/develop
sebastianfuehr Jul 7, 2021
52b9b0b
Merge branch 'feature/popularity_street_segments' into master
adriangronau Dec 1, 2021
e18d4de
Merge pull request #1 from KrokodileDandy/master
adriangronau Dec 1, 2021
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
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
__pycache__/
csvdata/*
*.zip
build/

# IDE settings
.idea
.vscode

/importer/build/
/importer/dist/
/importer/SimRa_Importer.egg-info
/api/SimRaAPI/migrations/

# Graphhopper service and map data
graphhopper/*.pbf
graphhopper/*.jar
graph-cache/
28 changes: 22 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,36 @@
# SimRa-Visualization
# SimRa Visualization

This project is part of the SimRa research project which includes the following subprojects:
- [sirma-android](https://github.com/simra-project/simra-android/): The SimRa app for Android.

- [simra-android](https://github.com/simra-project/simra-android/): The SimRa app for Android.
- [simra-ios](https://github.com/simra-project/simra-ios): The SimRa app for iOS.
- [backend](https://github.com/simra-project/backend): The SimRa backend software.
- [dataset](https://github.com/simra-project/dataset): Result data from the SimRa project.
- [screenshots](https://github.com/simra-project/screenshots): Screenshots of both the iOS and Android app.
- [SimRa-Visualization](https://github.com/simra-project/SimRa-Visualization): Web application for visualizing the dataset.

In this project, we collect – with a strong focus on data protection and privacy – data on such near crashes to identify when and where bicyclists are especially at risk. We also aim to identify the main routes of bicycle traffic in Berlin. To obtain such data, we have developed a smartphone app that uses GPS information to track routes of bicyclists and the built-in acceleration sensors to pre-categorize near crashes. After their trip, users are asked to annotate and upload the collected data, pseudonymized per trip.
For more information see [our website](https://www.digital-future.berlin/en/research/projects/simra/).
- SimRa-Visualization: Web application for visualizing the dataset([frontend](https://github.com/simra-project/simra-visualization-web), [backend](https://github.com/simra-project/simra-visualizations-server)).

In this project, we collect – with a strong focus on data protection and privacy – data on such near crashes to identify when and where bicyclists are especially at risk. We also aim to identify the main routes of bicycle traffic in Berlin. To obtain such data, we have developed a smartphone app that uses GPS information to track routes of bicyclists and the built-in acceleration sensors to pre-categorize near crashes. After their trip, users are asked to annotate and upload the collected data, pseudonymized per trip. For more information see [our website](https://www.digital-future.berlin/en/research/projects/simra/).

## Configuration / Install

1. Copy a gzip-ed database to `database/simra.sql.gz`
2. (Optionally) change ports in `docker-compose.yml``
3. Run `docker-compose up -d`. This might take forever and even afterwards you need to wait until the database is fully imported.
4. Setup the frontend so that it uses these services (`.env` in the frontend project)

## Project Architecture

This project consists of the following directories:

- `api/`: Provide RESTful functionality, e.g. to deliver detailed incident information.
- `doc/`: Contains the projects documentation.
- `graphhopper/`: Configuration files and scripts for the Graphhopper service.
- `importer/`: Import csv files, generated by the SimRa smartphone applications into an postgreSQL database.
- `tileserver/`: Tirex and Mapnik realted configuration and map description files, relevant for these services.
- `util/`: Bash scripts for ease of development and setup.

## Setup

Detailed setup guides can be found here:
- [Arch](doc/SETUP_ARCH.md)
- [Ubuntu 18.04 LTS](doc/SETUP_UBUNTU.md)
13 changes: 0 additions & 13 deletions TIREX-README

This file was deleted.

2 changes: 1 addition & 1 deletion api/SimRaAPI/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@


class SimraapiConfig(AppConfig):
name = 'SimRaAPI'
name = "SimRaAPI"
24 changes: 0 additions & 24 deletions api/SimRaAPI/migrations/0001_initial.py

This file was deleted.

50 changes: 0 additions & 50 deletions api/SimRaAPI/migrations/0002_incident_parsedfiles_ride.py

This file was deleted.

This file was deleted.

Empty file.
Loading