diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d77aadfa..9fe797a4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
@@ -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
@@ -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
diff --git a/.github/workflows/publish-doc.yml b/.github/workflows/publish-doc.yml
index f2675bbf..da357cb2 100644
--- a/.github/workflows/publish-doc.yml
+++ b/.github/workflows/publish-doc.yml
@@ -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'
diff --git a/.github/workflows/transifex-stats.yml b/.github/workflows/transifex-stats.yml
index 903d5c36..c1107c9a 100644
--- a/.github/workflows/transifex-stats.yml
+++ b/.github/workflows/transifex-stats.yml
@@ -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
diff --git a/.github/workflows/transifex.yml b/.github/workflows/transifex.yml
index 50b106f3..5aae9ee2 100644
--- a/.github/workflows/transifex.yml
+++ b/.github/workflows/transifex.yml
@@ -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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 347ed18f..18c16fed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/QuickOSM/core/process.py b/QuickOSM/core/process.py
index 9bedf747..2cb86f12 100644
--- a/QuickOSM/core/process.py
+++ b/QuickOSM/core/process.py
@@ -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):
diff --git a/QuickOSM/resources/json/i18n.json b/QuickOSM/resources/json/i18n.json
index 165d2282..69c7f6ad 100644
--- a/QuickOSM/resources/json/i18n.json
+++ b/QuickOSM/resources/json/i18n.json
@@ -5,7 +5,7 @@
},
"zh_TW": {
"name": "Chinese (Taiwan)",
- "percentage": 56.61
+ "percentage": 100.0
},
"da": {
"name": "Danish",
@@ -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",
@@ -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",
@@ -68,8 +72,8 @@
"percentage": 81.69
},
"en": {
- "nb_languages": 17,
+ "nb_languages": 18,
"stringcount": 295,
- "percentage": 73.18
+ "percentage": 76.76
}
}
\ No newline at end of file
diff --git a/QuickOSM/resources/map_preset/Urban/Urban_Road_lines.qml b/QuickOSM/resources/map_preset/Urban/Urban_Road_lines.qml
index 97ac62c4..e8f0a79c 100644
--- a/QuickOSM/resources/map_preset/Urban/Urban_Road_lines.qml
+++ b/QuickOSM/resources/map_preset/Urban/Urban_Road_lines.qml
@@ -5,22 +5,25 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
+
+
@@ -55,7 +58,7 @@
-
+
@@ -117,7 +120,7 @@
-
+
@@ -148,7 +151,7 @@
-
+
@@ -210,7 +213,7 @@
-
+
@@ -272,7 +275,7 @@
-
+
@@ -303,7 +306,7 @@
-
+
@@ -334,7 +337,69 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -396,7 +461,7 @@
-
+
@@ -428,7 +493,7 @@
-
+
@@ -490,7 +555,131 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -552,7 +741,7 @@
-
+
@@ -614,7 +803,7 @@
-
+
@@ -676,7 +865,7 @@
-
+
@@ -738,7 +927,7 @@
-
+
@@ -800,7 +989,7 @@
-
+
@@ -862,7 +1051,7 @@
-
+
@@ -924,7 +1113,7 @@
-
+
diff --git a/docs/translation-stats.md b/docs/translation-stats.md
index 1305533b..9bb503e0 100755
--- a/docs/translation-stats.md
+++ b/docs/translation-stats.md
@@ -11,29 +11,30 @@ It is generated automatically by transifex_stats.py in the scripts folder.
The translation is available on [Transifex](https://www.transifex.com/quickosm/gui/), no development
knowledge is required.
-*Statistics updated: 2021-12-28*
+*Statistics updated: 2022-03-29*
| Number of strings | Number of target languages | Overall Translation ratio |
|:-:|:-:|:-:|
-295|17|73.18
+295|18|76.76
| Language | Translation ratio (%) |
|:-:|:-:|
Chinese|[=100.0% "100.0"]|
+Chinese (Taiwan)|[=100.0% "100.0"]|
Dutch|[=100.0% "100.0"]|
-French|[=100.0% "100.0"]|
-German|[=100.0% "100.0"]|
Italian|[=100.0% "100.0"]|
-Korean|[=100.0% "100.0"]|
-Portuguese (Brazil)|[=100.0% "100.0"]|
-Romanian|[=100.0% "100.0"]|
+Finnish|[=99.66% "99.66"]|
+French|[=99.66% "99.66"]|
+German|[=99.66% "99.66"]|
+Korean|[=99.66% "99.66"]|
+Portuguese (Brazil)|[=99.66% "99.66"]|
+Romanian|[=99.66% "99.66"]|
Indonesian|[=98.64% "98.64"]|
Polish|[=95.93% "95.93"]|
Vietnamese|[=81.69% "81.69"]|
-Chinese (Taiwan)|[=56.61% "56.61"]|
Russian|[=53.9% "53.9"]|
Spanish|[=52.2% "52.2"]|
-Finnish|[=3.73% "3.73"]|
Danish|[=1.36% "1.36"]|
+Portuguese|[=0.0% "0.0"]|
Swedish|[=0.0% "0.0"]|
diff --git a/mkdocs.yml b/mkdocs.yml
index 071dc7ae..01813501 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -65,6 +65,7 @@ markdown_extensions:
class: mermaid
format: !!python/name:pymdownx.superfences.fence_div_format
- pymdownx.tabbed:
+ alternate_style: true
- pymdownx.tasklist:
- pymdownx.snippets:
- toc:
diff --git a/requirements/doc.txt b/requirements/doc.txt
index 00b6ea46..d606339b 100644
--- a/requirements/doc.txt
+++ b/requirements/doc.txt
@@ -1,3 +1,3 @@
-mkdocs-material>=7.0.0,<8.0.0
+mkdocs-material>=8.0.0,<9.0.0
mkdocs-git-revision-date-localized-plugin
# mkdocstrings
diff --git a/requirements/packaging.txt b/requirements/packaging.txt
index f5d0441a..7e4d15bb 100644
--- a/requirements/packaging.txt
+++ b/requirements/packaging.txt
@@ -1 +1 @@
-qgis-plugin-ci>=2.0.1,<2.1.0
+qgis-plugin-ci>=2.1.1,<3.0.0
\ No newline at end of file