Merge pull request #17 from OSM-Catalan/pre-commit

Arregla precommit

Conflicte d'estils entre lintr i styler en condicions d'`if` de múltiples línies. No es pot arreglar :_(

.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

.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]
@@ -13,7 +13,6 @@ repos:
           )$
     -   id: roxygenize
         additional_dependencies:
-        - git2r
         - compareDF
         - osmapiR
         - osmdata
@@ -64,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']

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

data-raw/mars.R

@@ -58,6 +58,7 @@ q <- opq(bbox = c(xmin = -180, ymin = -90, xmax = 180, ymax = 90), osm_types = "
   add_osm_feature(key = "place", value = c("ocean", "sea")) |>
   add_osm_feature(key = "name")
 # q <-  opq_csv(q, fields = c(etiquetes, "::type", "::id"))
+
 cat(opq_string(q))
 mars <- osmdata_data_frame(q)
 # mars <- mars[, sapply(mars, function(x) !all(is.na(x)))]

pkgdown/favicon/site.webmanifest

@@ -18,4 +18,4 @@
   "theme_color": "#ffffff",
   "background_color": "#ffffff",
   "display": "standalone"
-}
+}

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")`

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)
 ```