scheme_types & namelist: add typegroups for 2 schemes *

I.e. for schemes SOIL_03.2 & SURF_03.4_lotic.

It is better to always have typegroups for consistency, even when these have
only one type.

This was already the case in GW_05.1_aq.

inst/textdata/namelist.tsv

@@ -90,6 +90,10 @@ SOIL	en	Soil monitoring	NA
 SOIL_012	en	Soil monitoring: 12 Soil dynamics increase (erosion, soil turbation, sand drift)	SOIL: 012_soildyn_incr
 SOIL_013	en	Soil monitoring: 13 Soil dynamics decrease (erosion, soil turbation, sand drift)	SOIL: 013_soildyn_decr
 SOIL_03.2	en	Soil monitoring: 3.2 Eutrophication through soil	SOIL: 03.2_eutr_soil
+SOIL_03.2_group1	en	types from oligotrophic environments	oligotrophic
+SOIL_03.2_group2	en	types from mesotrophic environments	mesotrophic
+SOIL_03.2_group3	en	types from weakly eutrophic environments	weakly eutrophic
+SOIL_03.2_group4	en	types from moderately eutrophic to eutrophic environments	(moderately) eutrophic
 SOIL_08.2	en	Soil monitoring: 8.2 Pollution through soil	SOIL: 08.2_poll_soil
 SURF	en	Surfacewater monitoring	NA
 SURF_012	en	Surfacewater monitoring: 12 Soil dynamics increase (erosion, soil turbation, sand drift)	SURF: 012_soildyn_incr
@@ -100,6 +104,10 @@ SURF_03.4_lentic_group2	en	types from mesotrophic environments	mesotrophic
 SURF_03.4_lentic_group3	en	types from weakly eutrophic environments	weakly eutrophic
 SURF_03.4_lentic_group4	en	types from moderately eutrophic to eutrophic environments	(moderately) eutrophic
 SURF_03.4_lotic	en	Surfacewater monitoring: 3.4 Eutrophication through surface water (including inundation): partim lotic waters	SURF: 03.4_eutr_sw: lotic
+SURF_03.4_lotic_group1	en	types from oligotrophic environments	oligotrophic
+SURF_03.4_lotic_group2	en	types from mesotrophic environments	mesotrophic
+SURF_03.4_lotic_group3	en	types from weakly eutrophic environments	weakly eutrophic
+SURF_03.4_lotic_group4	en	types from moderately eutrophic to eutrophic environments	(moderately) eutrophic
 SURF_064	en	Surfacewater monitoring: 64 Decrease in surface water velocity, level or its fluctuation	SURF: 064_swlevel_decr
 SURF_066	en	Surfacewater monitoring: 66 Decrease of wave impact	SURF: 066_wave_decr
 SURF_07.2	en	Surfacewater monitoring: 7.2 Desalination through surface water (including inundation)	SURF: 07.2_desal_sw
@@ -197,6 +205,10 @@ SOIL	nl	Bodemmeetnet	NA
 SOIL_012	nl	Bodemmeetnet: 12 Toename bodemdynamiek (erosie, omwoeling, verstuiving)	SOIL: 012_boddyn_plus
 SOIL_013	nl	Bodemmeetnet: 13 Afname bodemdynamiek (erosie, omwoeling, verstuiving)	SOIL: 013_boddyn_min
 SOIL_03.2	nl	Bodemmeetnet: 3.2 Eutrofiëring via de bodem	SOIL: 03.2_eutr_bod
+SOIL_03.2_group1	nl	types van oligotroof milieu	oligotroof
+SOIL_03.2_group2	nl	types van mesotroof milieu	mesotroof
+SOIL_03.2_group3	nl	types van zwak eutroof milieu	zwak eutroof
+SOIL_03.2_group4	nl	types van matig eutroof tot eutroof milieu	(matig) eutroof
 SOIL_08.2	nl	Bodemmeetnet: 8.2 Verontreiniging via de bodem	SOIL: 08.2_verontr_bod
 SURF	nl	Oppervlaktewatermeetnet	NA
 SURF_012	nl	Oppervlaktewatermeetnet: 12 Toename bodemdynamiek (erosie, omwoeling, verstuiving)	SURF: 012_boddyn_plus
@@ -207,6 +219,10 @@ SURF_03.4_lentic_group2	nl	types van mesotroof milieu	mesotroof
 SURF_03.4_lentic_group3	nl	types van zwak eutroof milieu	zwak eutroof
 SURF_03.4_lentic_group4	nl	types van matig eutroof tot eutroof milieu	(matig) eutroof
 SURF_03.4_lotic	nl	Oppervlaktewatermeetnet: 3.4 Eutrofiëring via het oppervlaktewater (incl. overstromingswater en afspoeling): partim stromende wateren	SURF: 03.4_eutr_ow: lotic
+SURF_03.4_lotic_group1	nl	types van oligotroof milieu	oligotroof
+SURF_03.4_lotic_group2	nl	types van mesotroof milieu	mesotroof
+SURF_03.4_lotic_group3	nl	types van zwak eutroof milieu	zwak eutroof
+SURF_03.4_lotic_group4	nl	types van matig eutroof tot eutroof milieu	(matig) eutroof
 SURF_064	nl	Oppervlaktewatermeetnet: 64 Afname van stroomsnelheid, waterpeil en/of de fluctuatie ervan	SURF: 064_owpeil_min
 SURF_066	nl	Oppervlaktewatermeetnet: 66  Afname golfslagwerking	SURF: 066_golf_min
 SURF_07.2	nl	Oppervlaktewatermeetnet: 7.2 Verzoeting via het oppervlaktewater (incl. overstromingswater)	SURF: 07.2_verzoet_ow

inst/textdata/namelist.yml

@@ -6,7 +6,7 @@
   - lang
   - code
   hash: 3345146f5a5902a684bc1b965f00486c82952d94
-  data_hash: 71e5d9193a525143b5acf8e7b44cc3bd1f1a38c6
+  data_hash: 7c3bb83b09e5613712999d40029af0170cbbd90e
 code:
   class: character
 lang:

inst/textdata/scheme_types.tsv

@@ -585,70 +585,70 @@ scheme	type	typegroup
 24	35	NA
 24	36	NA
 24	76	NA
-25	2	NA
-25	7	NA
-25	8	NA
-25	9	NA
-25	10	NA
-25	11	NA
-25	12	NA
-25	17	NA
-25	18	NA
-25	19	NA
-25	20	NA
-25	21	NA
-25	31	NA
-25	32	NA
-25	33	NA
-25	34	NA
-25	35	NA
-25	36	NA
-25	37	NA
-25	38	NA
-25	39	NA
-25	40	NA
-25	41	NA
-25	42	NA
-25	43	NA
-25	44	NA
-25	45	NA
-25	46	NA
-25	49	NA
-25	50	NA
-25	51	NA
-25	52	NA
-25	53	NA
-25	54	NA
-25	55	NA
-25	57	NA
-25	58	NA
-25	59	NA
-25	60	NA
-25	61	NA
-25	62	NA
-25	63	NA
-25	64	NA
-25	65	NA
-25	67	NA
-25	68	NA
-25	69	NA
-25	70	NA
-25	72	NA
-25	73	NA
-25	74	NA
-25	75	NA
-25	76	NA
-25	77	NA
-25	78	NA
-25	79	NA
-25	80	NA
-25	81	NA
-25	82	NA
-25	84	NA
-25	86	NA
-25	87	NA
-25	88	NA
-25	89	NA
+25	2	33
+25	7	33
+25	8	32
+25	9	32
+25	10	30
+25	11	31
+25	12	30
+25	17	31
+25	18	31
+25	19	30
+25	20	30
+25	21	30
+25	31	30
+25	32	30
+25	33	31
+25	34	31
+25	35	30
+25	36	31
+25	37	31
+25	38	31
+25	39	30
+25	40	30
+25	41	30
+25	42	31
+25	43	31
+25	44	31
+25	45	33
+25	46	33
+25	49	32
+25	50	32
+25	51	32
+25	52	32
+25	53	31
+25	54	32
+25	55	33
+25	57	32
+25	58	33
+25	59	33
+25	60	31
+25	61	31
+25	62	32
+25	63	30
+25	64	30
+25	65	31
+25	67	31
+25	68	33
+25	69	33
+25	70	31
+25	72	32
+25	73	31
+25	74	32
+25	75	32
+25	76	33
+25	77	32
+25	78	31
+25	79	33
+25	80	33
+25	81	33
+25	82	32
+25	84	31
+25	86	32
+25	87	33
+25	88	32
+25	89	33
 26	2	NA
 26	7	NA
 26	36	NA
@@ -696,8 +696,8 @@ scheme	type	typegroup
 62	26	24
 62	27	21
 62	30	24
-63	28	NA
-63	66	NA
+63	28	37
+63	66	35
 30	28	NA
 30	66	NA
 31	23	NA

inst/textdata/scheme_types.yml

@@ -5,8 +5,8 @@
   sorting:
   - scheme
   - type
-  hash: ecce26a9ca9d0771192724b4d53e4b8655058a3d
-  data_hash: 9d78ce63f8d2de15ab908b38d062edaa773e7cde
+  hash: fd5e35e7671efa6e0d9a6fc691da0ac4c745d2fe
+  data_hash: fc922afef448dda550b49c0d0ac2debc985de441
 scheme:
   class: factor
   labels:
@@ -393,10 +393,18 @@ typegroup:
   - GW_05.1_terr_group3
   - GW_05.1_terr_group4
   - GW_05.1_terr_group5
+  - SOIL_03.2_group1
+  - SOIL_03.2_group2
+  - SOIL_03.2_group3
+  - SOIL_03.2_group4
   - SURF_03.4_lentic_group1
   - SURF_03.4_lentic_group2
   - SURF_03.4_lentic_group3
   - SURF_03.4_lentic_group4
+  - SURF_03.4_lotic_group1
+  - SURF_03.4_lotic_group2
+  - SURF_03.4_lotic_group3
+  - SURF_03.4_lotic_group4
   index:
   - 1
   - 2
@@ -423,8 +431,16 @@ typegroup:
   - 18
   - 19
   - 20
+  - 30
+  - 31
+  - 32
+  - 33
   - 21
   - 22
   - 23
   - 24
+  - 34
+  - 35
+  - 36
+  - 37
   ordered: no

misc/generate_textdata/10_schemes_and_scheme_types.Rmd

@@ -267,7 +267,9 @@ typegroups <-
                .name_repair = make.names) %>% 
     slice(2:n()) %>% 
     expand_grid(scheme = c("GW_03.3",
-                           "SURF_03.4_lentic")
+                           "SURF_03.4_lentic",
+                           "SURF_03.4_lotic",
+                           "SOIL_03.2")
                 ) %>% 
     select(scheme,
            type = Type,
@@ -477,7 +479,12 @@ tribble(~nr, ~lang, ~name, ~shortname,
         4, "en", "types from moderately eutrophic to eutrophic environments", "(moderately) eutrophic",
         4, "nl", "types van matig eutroof tot eutroof milieu", "(matig) eutroof"
         ) %>% 
-      crossing(prefix = c("GW_03.3_group", "SURF_03.4_lentic_group")) %>% 
+      crossing(prefix = c(
+          "GW_03.3_group", 
+          "SURF_03.4_lentic_group",
+          "SURF_03.4_lotic_group",
+          "SOIL_03.2_group"
+      )) %>% 
       mutate(code = str_c(prefix, nr)) %>% 
       select(code, lang, name, shortname)
   ) %>%