Skip to content

Commit 80bb972

Browse files
jirikadlec2jirikadlec2
committed
Merge branch 'dev' into rc
2 parents 55cb3dd + 686624e commit 80bb972

11 files changed

Lines changed: 845 additions & 31 deletions

‎docker/docker-compose.eea.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3'
22

33
services:
44
frontend:
5-
image: eeacms/copernicus-qctool-frontend:${VERSION}
5+
image: eeacms/copernicus-qctool-frontend:1.6.0rc1
66
ports:
77
- 8000:8000
88
environment:
@@ -22,7 +22,7 @@ services:
2222
- qc_tool_frontend:/mnt/qc_tool_frontend
2323

2424
worker:
25-
image: eeacms/copernicus-qctool-worker:${VERSION}
25+
image: eeacms/copernicus-qctool-worker:1.6.0rc1
2626
environment:
2727
- PRODUCT_DIRS
2828
- BOUNDARY_DIR=/mnt/qc_tool_boundary/boundaries

‎docker/docker-compose.service_provider.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3'
22

33
services:
44
frontend:
5-
image: eeacms/copernicus-qctool-frontend:${VERSION}
5+
image: eeacms/copernicus-qctool-frontend:1.6.0rc1
66
ports:
77
- 8000:8000
88
environment:
@@ -18,7 +18,7 @@ services:
1818
- qc_tool_volume:/mnt/qc_tool_volume
1919

2020
worker:
21-
image: eeacms/copernicus-qctool-worker:${VERSION}
21+
image: eeacms/copernicus-qctool-worker:1.6.0rc1
2222
environment:
2323
- PRODUCT_DIRS
2424
- BOUNDARY_DIR=/mnt/qc_tool_volume/boundaries

‎product_definitions/cz_2012.json‎

Lines changed: 241 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,241 @@
1+
{
2+
"description": "Coastal Zones 2012 status",
3+
"steps": [
4+
{
5+
"check_ident": "qc_tool.vector.unzip",
6+
"required": true
7+
},
8+
{
9+
"check_ident": "qc_tool.vector.naming",
10+
"required": true,
11+
"parameters": {
12+
"reference_year": "2012",
13+
"formats": [".gdb", ".gpkg"],
14+
"layer_names": {
15+
"status": "^cz_2012_(?P<aoi_code>[a-z0-9]+)_3035_"
16+
},
17+
"excessive_layers_allowed": false,
18+
"boundary_source": "aoi_cz_2018.gpkg"
19+
}
20+
},
21+
{
22+
"check_ident": "qc_tool.vector.attribute",
23+
"required": true,
24+
"parameters": {
25+
"layers": ["status"],
26+
"required": {"id": "string",
27+
"du": "string",
28+
"code_1_12": "integer",
29+
"code_2_12": "integer",
30+
"code_3_12": "integer",
31+
"code_4_12": "integer",
32+
"nodata_12": "integer",
33+
"comment_12": "string",
34+
"area_ha": "real"},
35+
"ignored": ["shape_area", "shape_length"]
36+
}
37+
},
38+
{
39+
"check_ident": "qc_tool.vector.epsg",
40+
"required": true,
41+
"parameters": {
42+
"layers": ["status"],
43+
"epsg": 3035,
44+
"auto_identify_epsg": false
45+
}
46+
},
47+
{
48+
"check_ident": "qc_tool.vector.import2pg",
49+
"required": true
50+
},
51+
{
52+
"check_ident": "qc_tool.vector.inspire",
53+
"required": false,
54+
"parameters": {
55+
"layers": ["status"]
56+
}
57+
},
58+
{
59+
"check_ident": "qc_tool.vector.unique",
60+
"required": false,
61+
"parameters": {
62+
"layers": ["status"],
63+
"unique_keys": ["id"]
64+
}
65+
},
66+
{
67+
"check_ident": "qc_tool.vector.enum",
68+
"required": false,
69+
"parameters": {
70+
"layers": ["status"],
71+
"column_defs": [["nodata_12", [0, 1]],
72+
["code_1_12", [0, 1, 2, 3, 4, 5, 6, 7, 8]],
73+
["code_2_12", [0,
74+
11, 12, 13, 14,
75+
21, 22, 23,
76+
31, 32, 33, 34, 35, 36,
77+
41, 42,
78+
51, 52, 53,
79+
61, 62, 63,
80+
71, 72,
81+
81, 82, 83, 84]],
82+
["code_3_12", [0,
83+
111, 112,
84+
121, 122, 123, 124,
85+
131, 132, 133, 134,
86+
140,
87+
211, 212,
88+
221, 222,
89+
231, 232, 233, 234,
90+
311, 312,
91+
321, 322,
92+
331, 332,
93+
340,
94+
350,
95+
360,
96+
410,
97+
421, 422,
98+
510,
99+
520,
100+
530,
101+
611, 612,
102+
621, 622, 623,
103+
631, 632, 633,
104+
711, 712,
105+
721, 722, 723,
106+
811, 812, 813,
107+
821, 822, 823, 824,
108+
831, 832, 833,
109+
841, 842]],
110+
["code_4_12", [0,
111+
1111, 1112, 1113, 1121, 1122,
112+
1210, 1220,
113+
1231, 1232, 1233, 1234, 1235, 1236, 1237,
114+
1240,
115+
1310, 1320, 1330, 1340,
116+
1400,
117+
2110, 2120,
118+
2210, 2220,
119+
2310, 2320, 2330, 2340,
120+
3110, 3120,
121+
3210, 3220,
122+
3310, 3320,
123+
3400,
124+
3500,
125+
3600,
126+
4100,
127+
4210, 4220,
128+
5100,
129+
5200,
130+
5300,
131+
6110, 6120,
132+
6211, 6212,
133+
6220, 6230,
134+
6311, 6312,
135+
6320, 6330,
136+
7110, 7121, 7122,
137+
7210, 7220, 7230,
138+
8110, 8120, 8130,
139+
8210, 8220, 8230, 8240,
140+
8310, 8320, 8330,
141+
8410, 8420]]]
142+
}
143+
},
144+
{
145+
"check_ident": "qc_tool.vector.nodata",
146+
"required": false,
147+
"parameters": {
148+
"layers": ["status"],
149+
"nodata_column_name": "nodata_12",
150+
"nodata_value": 1,
151+
"dep_column_names": ["code_1_12", "code_2_12", "code_3_12", "code_4_12"],
152+
"dep_value": 0
153+
}
154+
},
155+
{
156+
"check_ident": "qc_tool.vector.singlepart",
157+
"required": false,
158+
"parameters": {
159+
"layers": ["status"]
160+
}
161+
},
162+
{
163+
"check_ident": "qc_tool.vector.geometry",
164+
"required": false,
165+
"parameters": {
166+
"layers": ["status"]
167+
}
168+
},
169+
{
170+
"check_ident": "qc_tool.vector.area",
171+
"required": false,
172+
"parameters": {
173+
"layers": ["status"],
174+
"area_column_name": "area_ha",
175+
"unit": 10000,
176+
"tolerance": 0.5
177+
}
178+
},
179+
{
180+
"check_ident": "qc_tool.vector.gap_unit",
181+
"required": false,
182+
"parameters": {
183+
"layers": ["status"],
184+
"boundary_unit_column_name": "du"
185+
}
186+
},
187+
{
188+
"check_ident": "qc_tool.vector.mmu",
189+
"required": false,
190+
"parameters": {
191+
"layers": ["status"],
192+
"area_column_name": "area_ha",
193+
"code_column_name": "code_4_12",
194+
"area_ha": 0.5,
195+
"coastal_intertidal_area_ha": 25,
196+
"coastal_intertidal_feature_codes": [7230, 8420],
197+
"marginal_area_ha": 0.1,
198+
"urban_area_ha": 0.25,
199+
"urban_feature_codes": [1111, 1112, 1113, 1121, 1122, 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1240, 1210, 1320, 1330, 1340, 1400],
200+
"linear_area_ha": 0.1,
201+
"linear_feature_codes": [1210, 1220, 8110, 8120],
202+
"road_railway_feature_codes": [1210, 1220],
203+
"comment_column_name": "comment_12",
204+
"exception_comments": [
205+
"Area size exception (at Coastal Zones AoI boundary)",
206+
"Area size exception (inside Coastal Zones AoI boundary)",
207+
"Splitted change",
208+
"Areas related to change",
209+
"Flooded area 2012",
210+
"Flooded area 2018",
211+
"Different water level"
212+
]
213+
}
214+
},
215+
{
216+
"check_ident": "qc_tool.vector.mmw",
217+
"required": false,
218+
"parameters": {
219+
"layers": ["status"],
220+
"code_column_name": "code_4_12",
221+
"filter_codes": [1210, 1220, 8110, 8120],
222+
"mmw": 10.0
223+
}
224+
},
225+
{
226+
"check_ident": "qc_tool.vector.neighbour",
227+
"required": false,
228+
"parameters": {
229+
"layers": ["status"],
230+
"code_column_names": ["code_4_18"]
231+
}
232+
},
233+
{
234+
"check_ident": "qc_tool.vector.overlap",
235+
"required": false,
236+
"parameters": {
237+
"layers": ["status"]
238+
}
239+
}
240+
]
241+
}

0 commit comments

Comments
 (0)