From 079e174512179178819ec9d1e682d610c5ab5309 Mon Sep 17 00:00:00 2001 From: Joan Maspons Date: Tue, 3 Dec 2024 10:39:46 +0100 Subject: [PATCH 1/5] =?UTF-8?q?Sembla=20que=20precommit=20ja=20no=20dep?= =?UTF-8?q?=C3=A8n=20de=20git2r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .pre-commit-config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3406e43b..bbca39c5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,6 @@ repos: )$ - id: roxygenize additional_dependencies: - - git2r - compareDF - osmapiR - osmdata From 28d93bd301e05b9cf94aaa1836d984018f27f5b2 Mon Sep 17 00:00:00 2001 From: Joan Maspons Date: Tue, 3 Dec 2024 10:49:44 +0100 Subject: [PATCH 2/5] precommit::autoupdate() --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bbca39c5..85311cac 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ # R specific hooks: https://github.com/lorenzwalthert/precommit repos: - repo: https://github.com/lorenzwalthert/precommit - rev: v0.4.3 + rev: v0.4.3.9003 hooks: - id: style-files args: [--style_pkg=styler, --style_fun=tidyverse_style] @@ -63,7 +63,7 @@ repos: - id: no-debug-statement - id: deps-in-desc - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-added-large-files args: ['--maxkb=200'] From 0f2a42c196e3f1b59d3725bcd56ef69f846e265e Mon Sep 17 00:00:00 2001 From: Joan Maspons Date: Tue, 3 Dec 2024 12:05:31 +0100 Subject: [PATCH 3/5] =?UTF-8?q?Afegeix=20proj-bin=20a=20les=20depend=C3=A8?= =?UTF-8?q?ncies=20instal=C2=B7lades=20de=20pre-commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pre-commit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml index 98877042..d5eebb9c 100644 --- a/.github/workflows/pre-commit.yaml +++ b/.github/workflows/pre-commit.yaml @@ -14,7 +14,7 @@ jobs: - name: Install system dependencies if: runner.os == 'Linux' run: | - sudo apt-get install -y hunspell-ca libcurl4-openssl-dev + sudo apt-get install -y hunspell-ca libcurl4-openssl-dev proj-bin - name: Set up Python uses: actions/setup-python@v3 From 176caa17a5b3e42ea89116f2fd4494e3169ec920 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:20:47 +0000 Subject: [PATCH 4/5] [pre-commit.ci lite] apply automatic fixes --- DESCRIPTION | 2 +- data-raw/mars.R | 2 +- man/figures/logo.svg | 2 +- pkgdown/favicon/favicon.svg | 2 +- pkgdown/favicon/site.webmanifest | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index ed784717..c1764b43 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -32,5 +32,5 @@ Language: ca LazyData: true LazyDataCompression: xz Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 X-schema.org-keywords: open street map, openstreetmap, OSM, topònims, monitor diff --git a/data-raw/mars.R b/data-raw/mars.R index 03045b6b..f268cc1d 100644 --- a/data-raw/mars.R +++ b/data-raw/mars.R @@ -57,7 +57,7 @@ etiquetes <- c("name:ca", "name", "alt_name", "alt_name:ca", "place", "wikidata" q <- opq(bbox = c(xmin = -180, ymin = -90, xmax = 180, ymax = 90), osm_types = "nwr", out = "tags", timeout = 1000) |> add_osm_feature(key = "place", value = c("ocean", "sea")) |> add_osm_feature(key = "name") # |> - # opq_csv(fields = c(etiquetes, "::type", "::id")) +# opq_csv(fields = c(etiquetes, "::type", "::id")) cat(opq_string(q)) mars <- osmdata_data_frame(q) # mars <- mars[, sapply(mars, function(x) !all(is.na(x)))] diff --git a/man/figures/logo.svg b/man/figures/logo.svg index a236847d..fa3697c1 100644 --- a/man/figures/logo.svg +++ b/man/figures/logo.svg @@ -335,4 +335,4 @@ Catalan flag : wikimedia 010110010011010110010011  - \ No newline at end of file + diff --git a/pkgdown/favicon/site.webmanifest b/pkgdown/favicon/site.webmanifest index 4ebda26b..ac9612cf 100644 --- a/pkgdown/favicon/site.webmanifest +++ b/pkgdown/favicon/site.webmanifest @@ -18,4 +18,4 @@ "theme_color": "#ffffff", "background_color": "#ffffff", "display": "standalone" -} \ No newline at end of file +} From 71966374fe9a8e4979dea4b3792d3d88f4fc8bb9 Mon Sep 17 00:00:00 2001 From: Joan Maspons Date: Tue, 3 Dec 2024 12:47:33 +0100 Subject: [PATCH 5/5] Arregla errors lintr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Conflicte d'estils entre lintr i styler en condicions d'if de multiples línies. --- web/limits.qmd | 3 ++- web/localitats.qmd | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/web/limits.qmd b/web/limits.qmd index 54e7934b..a580f91f 100644 --- a/web/limits.qmd +++ b/web/limits.qmd @@ -10,7 +10,8 @@ execute: ```{r biblioteques} suppressPackageStartupMessages(library(monitorOSM, quietly = TRUE)) -# TODO: Sys.setlocale("LC_TIME", "ca_AD.UTF-8") # requereix configurar locale a gh action https://github.com/actions/runner-images/issues/762 +# TODO: Sys.setlocale("LC_TIME", "ca_AD.UTF-8") +# requereix configurar locale a gh action https://github.com/actions/runner-images/issues/762 ``` Última actualització: `r format(Sys.time(), "%a %d %b %Y - %X")` diff --git a/web/localitats.qmd b/web/localitats.qmd index 268b4791..91a3a003 100644 --- a/web/localitats.qmd +++ b/web/localitats.qmd @@ -10,7 +10,8 @@ execute: ```{r biblioteques} suppressPackageStartupMessages(library(monitorOSM, quietly = TRUE)) -# TODO: Sys.setlocale("LC_TIME", "ca_AD.UTF-8") # requereix configurar locale a gh action https://github.com/actions/runner-images/issues/762 +# TODO: Sys.setlocale("LC_TIME", "ca_AD.UTF-8") +# requereix configurar locale a gh action https://github.com/actions/runner-images/issues/762 ``` Última actualització: `r format(Sys.time(), "%a %d %b %Y - %X")` @@ -20,18 +21,18 @@ suppressPackageStartupMessages(library(monitorOSM, quietly = TRUE)) [BD de referència](https://github.com/OSM-Catalan/monitorOSM/blob/main/data-raw/loc_admin_centre_municipis.tsv) ```{r admin_centre municipis} -canvis_loc_admin_centre_municipis <- comprova_canvis_osm( +canvis_loc_capital_municipis <- comprova_canvis_osm( loc_admin_centre_municipis[, setdiff(names(loc_admin_centre_municipis), c("regio", "comarca", "municipi"))], centre = TRUE ) -canvis_html(canvis_loc_admin_centre_municipis) +canvis_html(canvis_loc_capital_municipis) ``` `r if(nrow(canvis_loc_admin_centre_municipis$comparison_df) > 0){"### Conjunts de canvis"}` ```{r localitats_admin_centre_municipis_canvis, results='asis'} -versio_canvis_loc_admin_centre_municipis <- cerca_versio_canvis(canvis_loc_admin_centre_municipis) -versio_canvis_html(versio_canvis_loc_admin_centre_municipis) +versio_canvis_loc_capital <- cerca_versio_canvis(canvis_loc_capital_municipis) +versio_canvis_html(versio_canvis_loc_capital) ```