Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arregla precommit #17

Merged
merged 6 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -13,7 +13,6 @@ repos:
)$
- id: roxygenize
additional_dependencies:
- git2r
- compareDF
- osmapiR
- osmdata
Expand Down Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions data-raw/mars.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)))]
Expand Down
2 changes: 1 addition & 1 deletion man/figures/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pkgdown/favicon/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pkgdown/favicon/site.webmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}
}
3 changes: 2 additions & 1 deletion web/limits.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
```{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")`
Expand Down Expand Up @@ -86,7 +87,7 @@
})

if (any(n_canvis > 0) &&
Sys.getenv("GITHUB_EVENT_NAME") == "schedule" &&

Check warning on line 90 in web/limits.qmd

View workflow job for this annotation

GitHub Actions / pre-commit

file=/home/runner/work/monitorOSM/monitorOSM/web/limits.qmd,line=90,col=2,[indentation_linter] Indentation should be 4 spaces but is 2 spaces.
# format(Sys.Date(), format = "%u") %in% "5" && # Només els divendres
Sys.getenv("GITHUB_WORKFLOW") == "Render and Publish"
) {
Expand Down
11 changes: 6 additions & 5 deletions web/localitats.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
```{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")`
Expand All @@ -20,18 +21,18 @@
[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)
```


Expand All @@ -41,7 +42,7 @@
})

if (any(n_canvis > 0) &&
Sys.getenv("GITHUB_EVENT_NAME") == "schedule" &&

Check warning on line 45 in web/localitats.qmd

View workflow job for this annotation

GitHub Actions / pre-commit

file=/home/runner/work/monitorOSM/monitorOSM/web/localitats.qmd,line=45,col=2,[indentation_linter] Indentation should be 4 spaces but is 2 spaces.
# format(Sys.Date(), format = "%u") %in% "5" && # Només els divendres
Sys.getenv("GITHUB_WORKFLOW") == "Render and Publish"
) {
Expand Down
Loading