Skip to content

Commit

Permalink
Merge branch '3liz:master' into add_logical_operators_to_processing_a…
Browse files Browse the repository at this point in the history
…lgos
  • Loading branch information
chrstnbwnkl authored Mar 29, 2022
2 parents 663d80b + 8385bbb commit 2ac7fc0
Show file tree
Hide file tree
Showing 12 changed files with 259 additions and 59 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
steps:

- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: 3.8
architecture: x64
Expand All @@ -49,7 +49,7 @@ jobs:
steps:

- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: 3.8
architecture: x64
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
- uses: actions/checkout@v2

- name: Set up Python 3.8
uses: actions/setup-python@v1
uses: actions/setup-python@v3
with:
python-version: 3.8

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
fetch-depth: 0

- name: Set up Python 3.8
uses: actions/setup-python@v2.2.1
uses: actions/setup-python@v3
with:
python-version: 3.8

- name: Set up NodeJS (for search index prebuilding)
uses: actions/setup-node@v2.5.0
uses: actions/setup-node@v3
with:
node-version: '12'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/transifex-stats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
token: ${{ secrets.BOT_HUB_TOKEN }} # Important to launch CI on a commit from a bot

- name: Set up Python 3.8
uses: actions/setup-python@v1
uses: actions/setup-python@v3
with:
python-version: 3.8

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/transifex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v2

- name: Set up Python 3.8
uses: actions/setup-python@v1
uses: actions/setup-python@v3
with:
python-version: 3.8

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## Unreleased

## 2.0.1 - 2022-02-07

* Fix trunk roads to Urban visualization preset (contribution from @Rikuoja)
* Fix an error when running Python 3.10

## 2.0.0 - 2021-09-09

* Release of QuickOSM 2.0.0
Expand Down
2 changes: 1 addition & 1 deletion QuickOSM/core/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def open_file(

for i, (layer, item) in enumerate(layers.items()):
if dialog:
dialog.set_progress_percentage(i / len(layers) * 100)
dialog.set_progress_percentage(int(i / len(layers) * 100))
QApplication.processEvents()
if item['featureCount'] and (
LayerType(layer.capitalize()) in output_geom_types):
Expand Down
22 changes: 13 additions & 9 deletions QuickOSM/resources/json/i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"zh_TW": {
"name": "Chinese (Taiwan)",
"percentage": 56.61
"percentage": 100.0
},
"da": {
"name": "Danish",
Expand All @@ -17,15 +17,15 @@
},
"fi": {
"name": "Finnish",
"percentage": 3.73
"percentage": 99.66
},
"fr": {
"name": "French",
"percentage": 100.0
"percentage": 99.66
},
"de": {
"name": "German",
"percentage": 100.0
"percentage": 99.66
},
"id": {
"name": "Indonesian",
Expand All @@ -37,19 +37,23 @@
},
"ko": {
"name": "Korean",
"percentage": 100.0
"percentage": 99.66
},
"pl": {
"name": "Polish",
"percentage": 95.93
},
"pt": {
"name": "Portuguese",
"percentage": 0.0
},
"pt_BR": {
"name": "Portuguese (Brazil)",
"percentage": 100.0
"percentage": 99.66
},
"ro": {
"name": "Romanian",
"percentage": 100.0
"percentage": 99.66
},
"ru": {
"name": "Russian",
Expand All @@ -68,8 +72,8 @@
"percentage": 81.69
},
"en": {
"nb_languages": 17,
"nb_languages": 18,
"stringcount": 295,
"percentage": 73.18
"percentage": 76.76
}
}
Loading

0 comments on commit 2ac7fc0

Please sign in to comment.