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.

Sign up for GitHub

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

Fix problems with HQ2190_terr in namelist #152

Merged
merged 3 commits into from
Sep 23, 2021
Merged

Fix problems with HQ2190_terr in namelist #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdf84f4
use 2190 as attribute value for HQ2190 instead of 2190_terr
ToonHub Sep 23, 2021
dba9c3d
define that col_types are characters when reading google sheet;
ToonHub Sep 23, 2021
ca8ee8c
change name and short name of HQ2190_terr
ToonHub Sep 23, 2021
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
111 changes: 56 additions & 55 deletions inst/textdata/namelist.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,33 +147,34 @@ HC12 en Dry to moist + Temporarily to permanently wet Dry + Wet
HC2 en Temporarily to permanently wet Wet
HC23 en Temporarily to permanently wet + Surface water Wet + Surface water
HC3 en Surface water Surface water
HQ1330 en Habitat quality scheme: Atlantic salt meadows Habitat quality scheme 1330
HQ2120 en Habitat quality scheme: White dunes Habitat quality scheme 2120
HQ2130 en Habitat quality scheme: Grey dunes Habitat quality scheme 2130
HQ2160 en Habitat quality scheme: Hippophae rhamnoides dunes Habitat quality scheme 2160
HQ2170 en Habitat quality scheme: Salix repens dunes Habitat quality scheme 2170
HQ2180 en Habitat quality scheme: Wooded dunes Habitat quality scheme 2180
HQ2190_aq en Habitat quality scheme: Dune slack ponds Habitat quality scheme 2190_a
HQ2310 en Habitat quality scheme: Psammophylic heath Habitat quality scheme 2310
HQ2330 en Habitat quality scheme: Inland shifting dunes Habitat quality scheme 2330
HQ3110 en Habitat quality scheme: Barely buffered standing waters Habitat quality scheme 3110
HQ3130 en Habitat quality scheme: Poorly buffered standing waters Habitat quality scheme 3130
HQ3140 en Habitat quality scheme: Standing waters with Chara Habitat quality scheme 3140
HQ3150 en Habitat quality scheme: Lakes with Stratiotes and Potamogeton Habitat quality scheme 3150
HQ3160 en Habitat quality scheme: Dystrophic standing waters Habitat quality scheme 3160
HQ3270 en Habitat quality scheme: Rivers with muddy banks Habitat quality scheme 3270
HQ4010 en Habitat quality scheme: Wet heaths Habitat quality scheme 4010
HQ4030 en Habitat quality scheme: Dry heaths Habitat quality scheme 4030
HQ6120 en Habitat quality scheme: Pioneer calcareous sand swards Habitat quality scheme 6120
HQ6230 en Habitat quality scheme: Nardus grasslands Habitat quality scheme 6230
HQ6410 en Habitat quality scheme: Molinion grasslands Habitat quality scheme 6410
HQ6510 en Habitat quality scheme: Arrhenaterion and Alopecurion grasslands Habitat quality scheme 6510
HQ7140 en Habitat quality scheme: Transition mires and quaking bogs Habitat quality scheme 7140
HQ9120 en Habitat quality scheme: Beech-oak forests with Ilex Habitat quality scheme 9120
HQ9130 en Habitat quality scheme: Neutrophilic beech forest Habitat quality scheme 9130
HQ9160 en Habitat quality scheme: Oak-hornbeam forests Habitat quality scheme 9160
HQ9190 en Habitat quality scheme: Old oak forests Habitat quality scheme 9190
HQ91E0 en Habitat quality scheme: Alluvial forests Habitat quality scheme 91E0
HQ1330 en Habitat quality scheme: Atlantic salt meadows Habitat quality scheme 1330
HQ2120 en Habitat quality scheme: White dunes Habitat quality scheme 2120
HQ2130 en Habitat quality scheme: Grey dunes Habitat quality scheme 2130
HQ2160 en Habitat quality scheme: Hippophae rhamnoides dunes Habitat quality scheme 2160
HQ2170 en Habitat quality scheme: Salix repens dunes Habitat quality scheme 2170
HQ2180 en Habitat quality scheme: Wooded dunes Habitat quality scheme 2180
HQ2190_aq en Habitat quality scheme: Dune slack ponds Habitat quality scheme 2190_a
HQ2190_terr en Habitat quality scheme: Humid dune slacks (terrestrial) Habitat quality scheme 2190 (terr)
HQ2310 en Habitat quality scheme: Psammophylic heath Habitat quality scheme 2310
HQ2330 en Habitat quality scheme: Inland shifting dunes Habitat quality scheme 2330
HQ3110 en Habitat quality scheme: Barely buffered standing waters Habitat quality scheme 3110
HQ3130 en Habitat quality scheme: Poorly buffered standing waters Habitat quality scheme 3130
HQ3140 en Habitat quality scheme: Standing waters with Chara Habitat quality scheme 3140
HQ3150 en Habitat quality scheme: Lakes with Stratiotes and Potamogeton Habitat quality scheme 3150
HQ3160 en Habitat quality scheme: Dystrophic standing waters Habitat quality scheme 3160
HQ3270 en Habitat quality scheme: Rivers with muddy banks Habitat quality scheme 3270
HQ4010 en Habitat quality scheme: Wet heaths Habitat quality scheme 4010
HQ4030 en Habitat quality scheme: Dry heaths Habitat quality scheme 4030
HQ6120 en Habitat quality scheme: Pioneer calcareous sand swards Habitat quality scheme 6120
HQ6230 en Habitat quality scheme: Nardus grasslands Habitat quality scheme 6230
HQ6410 en Habitat quality scheme: Molinion grasslands Habitat quality scheme 6410
HQ6510 en Habitat quality scheme: Arrhenaterion and Alopecurion grasslands Habitat quality scheme 6510
HQ7140 en Habitat quality scheme: Transition mires and quaking bogs Habitat quality scheme 7140
HQ9120 en Habitat quality scheme: Beech-oak forests with Ilex Habitat quality scheme 9120
HQ9130 en Habitat quality scheme: Neutrophilic beech forest Habitat quality scheme 9130
HQ9160 en Habitat quality scheme: Oak-hornbeam forests Habitat quality scheme 9160
HQ9190 en Habitat quality scheme: Old oak forests Habitat quality scheme 9190
HQ91E0 en Habitat quality scheme: Alluvial forests Habitat quality scheme 91E0
HS en Temperate heath and scrub NA
ID en Inland dunes NA
INUN en Inundationwater monitoring NA
Expand Down Expand Up @@ -438,33 +439,34 @@ HC12 nl Droog tot vochtig + Tijdelijk tot permanent nat Droog + Nat
HC2 nl Tijdelijk tot permanent nat Nat
HC23 nl Tijdelijk tot permanent nat + Oppervlaktewater Nat + Oppervlaktewater
HC3 nl Oppervlaktewater Oppervlaktewater
HQ1330 nl Meetnet habitatkwaliteit: Atlantische schorren Meetnet habitatkwaliteit 1330
HQ2120 nl Meetnet habitatkwaliteit: wandelende duinen Meetnet habitatkwaliteit 2120
HQ2130 nl Meetnet habitatkwaliteit: vastgelegde duinen Meetnet habitatkwaliteit 2130
HQ2160 nl Meetnet habitatkwaliteit: duindoornstruwelen Meetnet habitatkwaliteit 2160
HQ2170 nl Meetnet habitatkwaliteit: kruipwilgstruwelen Meetnet habitatkwaliteit 2170
HQ2180 nl Meetnet habitatkwaliteit: duinbossen Meetnet habitatkwaliteit 2180
HQ2190_aq nl Meetnet habitatkwaliteit: duinplassen Meetnet habitatkwaliteit 2190_a
HQ2310 nl Meetnet habitatkwaliteit: droge heide op landduinen Meetnet habitatkwaliteit 2310
HQ2330 nl Meetnet habitatkwaliteit: open grasland op landduinen Meetnet habitatkwaliteit 2330
HQ3110 nl Meetnet habitatkwaliteit: zeer zwakgebufferde vennen Meetnet habitatkwaliteit 3110
HQ3130 nl Meetnet habitatkwaliteit: zwakgebufferde vennen Meetnet habitatkwaliteit 3130
HQ3140 nl Meetnet habitatkwaliteit: kranswierwateren Meetnet habitatkwaliteit 3140
HQ3150 nl Meetnet habitatkwaliteit: van nature eutrofe wateren Meetnet habitatkwaliteit 3150
HQ3160 nl Meetnet habitatkwaliteit: dystrofe vennen Meetnet habitatkwaliteit 3160
HQ3270 nl Meetnet habitatkwaliteit: voedselrijke slikoevers met bepaalde eenjarige planten Meetnet habitatkwaliteit 3270
HQ4010 nl Meetnet habitatkwaliteit: vochtige heide Meetnet habitatkwaliteit 4010
HQ4030 nl Meetnet habitatkwaliteit: droge heide Meetnet habitatkwaliteit 4030
HQ6120 nl Meetnet habitatkwaliteit: stroomdalgraslanden Meetnet habitatkwaliteit 6120
HQ6230 nl Meetnet habitatkwaliteit: heischrale graslanden Meetnet habitatkwaliteit 6230
HQ6410 nl Meetnet habitatkwaliteit: blauwgraslanden Meetnet habitatkwaliteit 6410
HQ6510 nl Meetnet habitatkwaliteit: soortenrijke glanshavergraslanden Meetnet habitatkwaliteit 6510
HQ7140 nl Meetnet habitatkwaliteit: overgangs- en trilveen Meetnet habitatkwaliteit 7140
HQ9120 nl Meetnet habitatkwaliteit: beuken-eikenbossen op zure bodem Meetnet habitatkwaliteit 9120
HQ9130 nl Meetnet habitatkwaliteit: eiken-beukenbossen met wilde hyacint en parelgras-beukenbossen Meetnet habitatkwaliteit 9130
HQ9160 nl Meetnet habitatkwaliteit: eiken-haagbeukenbossen Meetnet habitatkwaliteit 9160
HQ9190 nl Meetnet habitatkwaliteit: oude eiken-berkenbossen Meetnet habitatkwaliteit 9190
HQ91E0 nl Meetnet habitatkwaliteit: vochtige alluviale bossen Meetnet habitatkwaliteit 91E0
HQ1330 nl Meetnet habitatkwaliteit: Atlantische schorren Meetnet habitatkwaliteit 1330
HQ2120 nl Meetnet habitatkwaliteit: wandelende duinen Meetnet habitatkwaliteit 2120
HQ2130 nl Meetnet habitatkwaliteit: vastgelegde duinen Meetnet habitatkwaliteit 2130
HQ2160 nl Meetnet habitatkwaliteit: duindoornstruwelen Meetnet habitatkwaliteit 2160
HQ2170 nl Meetnet habitatkwaliteit: kruipwilgstruwelen Meetnet habitatkwaliteit 2170
HQ2180 nl Meetnet habitatkwaliteit: duinbossen Meetnet habitatkwaliteit 2180
HQ2190_aq nl Meetnet habitatkwaliteit: duinplassen Meetnet habitatkwaliteit 2190_a
HQ2190_terr nl Meetnet habitatkwaliteit: vochtige duinvalleien (terrestrisch) Meetnet habitatkwaliteit 2190 (terr)
HQ2310 nl Meetnet habitatkwaliteit: droge heide op landduinen Meetnet habitatkwaliteit 2310
HQ2330 nl Meetnet habitatkwaliteit: open grasland op landduinen Meetnet habitatkwaliteit 2330
HQ3110 nl Meetnet habitatkwaliteit: zeer zwakgebufferde vennen Meetnet habitatkwaliteit 3110
HQ3130 nl Meetnet habitatkwaliteit: zwakgebufferde vennen Meetnet habitatkwaliteit 3130
HQ3140 nl Meetnet habitatkwaliteit: kranswierwateren Meetnet habitatkwaliteit 3140
HQ3150 nl Meetnet habitatkwaliteit: van nature eutrofe wateren Meetnet habitatkwaliteit 3150
HQ3160 nl Meetnet habitatkwaliteit: dystrofe vennen Meetnet habitatkwaliteit 3160
HQ3270 nl Meetnet habitatkwaliteit: voedselrijke slikoevers met bepaalde eenjarige planten Meetnet habitatkwaliteit 3270
HQ4010 nl Meetnet habitatkwaliteit: vochtige heide Meetnet habitatkwaliteit 4010
HQ4030 nl Meetnet habitatkwaliteit: droge heide Meetnet habitatkwaliteit 4030
HQ6120 nl Meetnet habitatkwaliteit: stroomdalgraslanden Meetnet habitatkwaliteit 6120
HQ6230 nl Meetnet habitatkwaliteit: heischrale graslanden Meetnet habitatkwaliteit 6230
HQ6410 nl Meetnet habitatkwaliteit: blauwgraslanden Meetnet habitatkwaliteit 6410
HQ6510 nl Meetnet habitatkwaliteit: soortenrijke glanshavergraslanden Meetnet habitatkwaliteit 6510
HQ7140 nl Meetnet habitatkwaliteit: overgangs- en trilveen Meetnet habitatkwaliteit 7140
HQ9120 nl Meetnet habitatkwaliteit: beuken-eikenbossen op zure bodem Meetnet habitatkwaliteit 9120
HQ9130 nl Meetnet habitatkwaliteit: eiken-beukenbossen met wilde hyacint en parelgras-beukenbossen Meetnet habitatkwaliteit 9130
HQ9160 nl Meetnet habitatkwaliteit: eiken-haagbeukenbossen Meetnet habitatkwaliteit 9160
HQ9190 nl Meetnet habitatkwaliteit: oude eiken-berkenbossen Meetnet habitatkwaliteit 9190
HQ91E0 nl Meetnet habitatkwaliteit: vochtige alluviale bossen Meetnet habitatkwaliteit 91E0
HS nl Heiden NA
ID nl Binnenlandse duinen NA
INUN nl Inundatiemeetnet NA
Expand Down Expand Up @@ -609,4 +611,3 @@ rbbzil nl zilverschoongrasland zilverschoongrasland
rbbzil+ nl soortenrijk zilverschoongrasland soortenrijk zilverschoongrasland
secondary nl Secundair meetnet NA
terr nl terrestrisch NA
HQ2190_terr NA NA NA NA 2190_terr
2 changes: 1 addition & 1 deletion inst/textdata/namelist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- lang
- code
hash: 3345146f5a5902a684bc1b965f00486c82952d94
data_hash: 58d7ef69f04229b92d03b892ba079f4616e4b4ca
data_hash: 83489b3b819896d9a4c9591b477d7702290cfca5
code:
class: character
lang:
Expand Down
2 changes: 1 addition & 1 deletion inst/textdata/schemes.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ scheme programme attribute_1 attribute_2 attribute_3 spatial_restriction notes t
38 2 9 NA NA NA NA 4 NA NA
39 2 10 NA NA NA NA 4 NA NA
61 2 33 NA NA NA NA 3 NA NA
65 2 34 NA NA NA NA 4 NA NA
65 2 11 NA NA NA NA 4 NA NA
41 2 12 NA NA NA NA 4 NA NA
42 2 13 NA NA NA NA 4 NA NA
43 2 14 NA NA NA NA 3 NA NA
Expand Down
8 changes: 4 additions & 4 deletions inst/textdata/schemes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
sorting:
- programme
- scheme
hash: b28a62b443678796a29db126dcb4b1e774c20377
data_hash: ed075ef64e0a7fbf4ab772afd586e02e2d2e2b87
hash: a7161d9fe68befeb9feec626e0d5b0e3710eca97
data_hash: 031ed7c381ae9a8bc4c70dab750d4b4b24a1e2ae
scheme:
class: factor
labels:
Expand Down Expand Up @@ -163,8 +163,8 @@ attribute_1:
- '2160'
- '2170'
- '2180'
- '2190'
- 2190_a
- 2190_terr
- '2310'
- '2330'
- '3110'
Expand Down Expand Up @@ -197,8 +197,8 @@ attribute_1:
- 8
- 9
- 10
- 11
- 33
- 34
- 12
- 13
- 14
Expand Down
15 changes: 12 additions & 3 deletions misc/generate_textdata/30_schemes_and_scheme_types.Rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ Writing `schemes`.
```{r message=FALSE}
schemes_MHQ <-
mhq_gs_id %>%
read_sheet(sheet = 1) %>%
read_sheet(sheet = 1, col_types = "c") %>%
mutate(attribute_1 = ifelse(attribute_1 == 91,
"91E0",
as.character(attribute_1)),
Expand Down Expand Up @@ -577,11 +577,20 @@ schemes_MHQ_names <- schemes_MHQ %>%
mutate(name = paste(ifelse(lang == "en",
"Habitat quality scheme:",
"Meetnet habitatkwaliteit:"),
shortname),
shortname,
ifelse(scheme == "HQ2190_terr",
ifelse(lang == "en",
"(terrestrial)", "(terrestrisch)"),
"")
),
shortname = paste(ifelse(lang == "en",
"Habitat quality scheme",
"Meetnet habitatkwaliteit"),
attribute_1)) %>%
attribute_1,
ifelse(scheme == "HQ2190_terr",
"(terr)",
""))
) %>%
select(code = scheme, lang, name, shortname)

namelist %>%
Expand Down