Skip to content

Commit

Permalink
Merge branch 'develop' into HARJA-816
Browse files Browse the repository at this point in the history
  • Loading branch information
solita-staskila committed Feb 28, 2025
2 parents c14b21a + a6ceb57 commit a4bdf47
Show file tree
Hide file tree
Showing 11 changed files with 286 additions and 289 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@
"Tasausjyrsintä",
"Laatikkojyrsintä",
"Reunajyrsintä",
"PAB-B",
"PAB-V",
"UREM-TAS",
"Muu stabilointi",
"Muu RP",
"ei tietoa"
]
},
Expand Down Expand Up @@ -337,6 +342,7 @@
"PAB-B, Pehmeät asfalttibetonit",
"PAB-V, Pehmeät asfalttibetonit",
"PAB-O, Pehmeät asfalttibetonit",
"Sirotepintaus",
"Ei tietoa",
"EAB, Asfalttibetoni",
"ABtiivis",
Expand Down Expand Up @@ -456,8 +462,8 @@
"Bitumiemulsiot, BE-SOP",
"Bitumiemulsiot, BE-AB",
"Bitumiemulsiot, BE-PAB",
"KF, Kalkkifilleri",
"Muu, erikoisbitumi"
"Muu erikoisbitumi",
"Bitumia korvaava uusiomateriaali"
]
},
"lisaainetyyppi": {
Expand Down
10 changes: 9 additions & 1 deletion resources/api/schemas/entities/paallyste.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,15 @@
"pehmeä asfalttibetoni (o)",
"sirotepintaus",
"soratien pintaus",
"sora"
"sora",
"EAB, asfalttibetoni",
"AB tiivis",
"EABK, Kantavan kerroksen EAB",
"EPAB-B, Pehmeät asfalttibetonit",
"EPAB-V, Pehmeät asfalttibetonit",
"komposiittiasfaltti",
"teräs",
"puu"
]
}

266 changes: 0 additions & 266 deletions resources/api/schemas/entities/paallystysilmoitus.schema.json

This file was deleted.

Loading

0 comments on commit a4bdf47

Please sign in to comment.