Skip to content

Commit

Permalink
Merge pull request #349 from LuposX/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
LuposX authored Mar 17, 2023
2 parents bca97fb + 021b5d2 commit 2adeaf6
Show file tree
Hide file tree
Showing 221 changed files with 22,846 additions and 3,421 deletions.
25 changes: 25 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[paths]
source =
src/osm_configurator

[run]
branch = true
parallel = true
source =
src_tests

[report]
show_missing = true
precision = 2
# Regexes for lines to exclude from consideration
exclude_lines =
# Have to re-enable the standard pragma
pragma: no cover
import .*
from .* import .*
# abstractmethod are for us never implemented
@abstract
@abstractmethod

[html]
directory = coverage_html_report
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Conda
uses: conda-incubator/setup-miniconda@v2
with:
environment-file: PSE.yml
environment-file: enviroment.yml
miniforge-version: latest
miniforge-variant: Mambaforge
use-mamba: true
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
__pycache__
src_tests/build

# the project
venv

## Core latex/pdflatex auxiliary files:
*.aux
*.lof
Expand Down
33 changes: 13 additions & 20 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,14 @@ For each of the phases of the watferfall model you can find the documentation in


For a more specific description of the code, check the ``README.md`` in
the subfolder `pythoncode`.
the subfolder ``src``.

Installation
------------

.. note
Not implemented yet.
We recommend installing KonfiguratorFuerOSMDaten
using one of the available built distributions,
for example using ``pip`` or ``conda``:

.. code-block:: console
Here will stand sth. in the future
You can download the binary(which is for windows only) from the release tab.
If you want to built the program from source check out the `README.md <https://github.com/LuposX/KonfiguratorFuerOSMDaten/blob/main/src/README.md>`__ in
the subfolder ``src``.

Usage
-----
Expand All @@ -61,13 +53,14 @@ License
KonfiguratorFuerOSMDaten is licensed under the GPLv3 `License
<https://github.com/LuposX/KonfiguratorFuerOSMDaten/blob/main/LICENSE>`__.

Contribution
------------

To contribute to the project:
Contributions
-------------

This project was made in collaberation with these amazing people:

1. Fork it (https://github.com/LuposX/KonfiguratorFuerOSMDaten/fork)
2. Create your feature branch (``git checkout -b feature/fooBar``)
3. Commit your changes (``git commit -am 'Add some fooBar'``)
4. Push to the branch (``git push origin feature/fooBar``)
5. Create a new Pull Request
- `Felix Weik <https://github.com/FelixWeik>`__
- `Jan-Philipp Hansen <https://github.com/ujrlh>`__
- `Karl Bernhard <https://github.com/GloeStoe>`__
- `Pascal Dawideit <https://github.com/calliminator>`__
- `Simon Schupp <https://github.com/LuposX>`__
Binary file added data/osmium/boost_program_options.dll
Binary file not shown.
8 changes: 8 additions & 0 deletions data/osmium/info_on_osmium.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
## About this folder

The tool [osmium](https://github.com/osmcode/osmium-tool) in this folder is used to split up one big osm data file into
multiple smaller ones, for better further processing.

## Source

Source for the [build files](https://github.com/pango3001/Osmium_1_14).
Binary file added data/osmium/libbz2.dll
Binary file not shown.
Binary file added data/osmium/libexpat.dll
Binary file not shown.
Binary file added data/osmium/liblz4.dll
Binary file not shown.
Binary file added data/osmium/osmium.exe
Binary file not shown.
Binary file added data/osmium/zlib.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion PSE.yml → enviroment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -266,4 +266,4 @@ dependencies:
- wcwidth==0.2.6
- webcolors==1.12
- webencodings==0.5.1
- websocket-client==1.4.2
- websocket-client==1.4.2
Binary file added icon_for_project.ico
Binary file not shown.
Binary file added icon_for_project.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2adeaf6

Please sign in to comment.