Skip to content

Commit 43eaad3

Browse files
igokrigokr
committed
vector.attribute check has got ignored parameter.
The attributes parameter has been renamed to required parameter. All definitions of vector products have been adjusted.
1 parent c0aab89 commit 43eaad3

11 files changed

Lines changed: 186 additions & 164 deletions

File tree

‎product_definitions/clc2012.json‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,41 +43,44 @@
4343
"required": true,
4444
"parameters": {
4545
"layers": ["reference"],
46-
"attributes": {"id": "string",
47-
"remark": "string",
48-
"area_ha": "real",
49-
"shape_area": "real",
50-
"shape_length": "real",
51-
"code_12": "string"}
46+
"required": {"id": "string",
47+
"remark": "string",
48+
"area_ha": "real",
49+
"shape_area": "real",
50+
"shape_length": "real",
51+
"code_12": "string"},
52+
"ignored": []
5253
}
5354
},
5455
{
5556
"check_ident": "qc_tool.vector.attribute",
5657
"required": true,
5758
"parameters": {
5859
"layers": ["initial"],
59-
"attributes": {"id": "string",
60-
"remark": "string",
61-
"area_ha": "real",
62-
"shape_area": "real",
63-
"shape_length": "real",
64-
"code_06": "string"}
60+
"required": {"id": "string",
61+
"remark": "string",
62+
"area_ha": "real",
63+
"shape_area": "real",
64+
"shape_length": "real",
65+
"code_06": "string"},
66+
"ignored": []
6567
}
6668
},
6769
{
6870
"check_ident": "qc_tool.vector.attribute",
6971
"required": true,
7072
"parameters": {
7173
"layers": ["change"],
72-
"attributes": {"id": "string",
73-
"remark": "string",
74-
"area_ha": "real",
75-
"shape_area": "real",
76-
"shape_length": "real",
77-
"change": "string",
78-
"code_06": "string",
79-
"code_12": "string",
80-
"chtype": "string"}
74+
"required": {"id": "string",
75+
"remark": "string",
76+
"area_ha": "real",
77+
"shape_area": "real",
78+
"shape_length": "real",
79+
"change": "string",
80+
"code_06": "string",
81+
"code_12": "string",
82+
"chtype": "string"},
83+
"ignored": []
8184
}
8285
},
8386
{

‎product_definitions/clc2018.json‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,41 +43,44 @@
4343
"required": true,
4444
"parameters": {
4545
"layers": ["reference"],
46-
"attributes": {"id": "string",
47-
"remark": "string",
48-
"area_ha": "real",
49-
"shape_area": "real",
50-
"shape_length": "real",
51-
"code_18": "string"}
46+
"required": {"id": "string",
47+
"remark": "string",
48+
"area_ha": "real",
49+
"shape_area": "real",
50+
"shape_length": "real",
51+
"code_18": "string"},
52+
"ignored": []
5253
}
5354
},
5455
{
5556
"check_ident": "qc_tool.vector.attribute",
5657
"required": true,
5758
"parameters": {
5859
"layers": ["initial"],
59-
"attributes": {"id": "string",
60-
"remark": "string",
61-
"area_ha": "real",
62-
"shape_area": "real",
63-
"shape_length": "real",
64-
"code_12": "string"}
60+
"required": {"id": "string",
61+
"remark": "string",
62+
"area_ha": "real",
63+
"shape_area": "real",
64+
"shape_length": "real",
65+
"code_12": "string"},
66+
"ignored": []
6567
}
6668
},
6769
{
6870
"check_ident": "qc_tool.vector.attribute",
6971
"required": true,
7072
"parameters": {
7173
"layers": ["change"],
72-
"attributes": {"id": "string",
73-
"remark": "string",
74-
"area_ha": "real",
75-
"shape_area": "real",
76-
"shape_length": "real",
77-
"change": "string",
78-
"code_12": "string",
79-
"code_18": "string",
80-
"chtype": "string"}
74+
"required": {"id": "string",
75+
"remark": "string",
76+
"area_ha": "real",
77+
"shape_area": "real",
78+
"shape_length": "real",
79+
"change": "string",
80+
"code_12": "string",
81+
"code_18": "string",
82+
"chtype": "string"},
83+
"ignored": []
8184
}
8285
},
8386
{
@@ -231,14 +234,14 @@
231234
"layers": ["reference"]
232235
}
233236
},
234-
{
237+
{
235238
"check_ident": "qc_tool.vector.overlap",
236239
"required": false,
237240
"parameters": {
238241
"layers": ["initial"]
239242
}
240243
},
241-
{
244+
{
242245
"check_ident": "qc_tool.vector.overlap",
243246
"required": false,
244247
"parameters": {

‎product_definitions/n2k.json‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,25 @@
2222
"required": true,
2323
"parameters": {
2424
"layers": ["n2k"],
25-
"attributes": {"id": "integer",
26-
"uid": "string",
27-
"sitecode": "string",
28-
"grasstype": "string",
29-
"maes_1_06": "integer",
30-
"maes_2_06": "integer",
31-
"maes_3_06": "integer",
32-
"maes_4_06": "integer",
33-
"comment_06": "string",
34-
"nodata_06": "integer",
35-
"maes_1_12": "integer",
36-
"maes_2_12": "integer",
37-
"maes_3_12": "integer",
38-
"maes_4_12": "integer",
39-
"comment_12": "string",
40-
"nodata_12": "integer",
41-
"changecode": "string",
42-
"area_ha": "real"}
25+
"required": {"id": "integer",
26+
"uid": "string",
27+
"sitecode": "string",
28+
"grasstype": "string",
29+
"maes_1_06": "integer",
30+
"maes_2_06": "integer",
31+
"maes_3_06": "integer",
32+
"maes_4_06": "integer",
33+
"comment_06": "string",
34+
"nodata_06": "integer",
35+
"maes_1_12": "integer",
36+
"maes_2_12": "integer",
37+
"maes_3_12": "integer",
38+
"maes_4_12": "integer",
39+
"comment_12": "string",
40+
"nodata_12": "integer",
41+
"changecode": "string",
42+
"area_ha": "real"},
43+
"ignored": []
4344
}
4445
},
4546
{

‎product_definitions/rpz.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,17 @@
2727
"required": true,
2828
"parameters": {
2929
"layers": ["rpz"],
30-
"attributes": {"id": "integer",
31-
"du_id": "string",
32-
"maes_1": "integer",
33-
"maes_2": "integer",
34-
"maes_3": "integer",
35-
"maes_4": "integer",
36-
"ua": "string",
37-
"area_ha": "real",
38-
"nodata": "integer",
39-
"comment": "string"}
30+
"required": {"id": "integer",
31+
"du_id": "string",
32+
"maes_1": "integer",
33+
"maes_2": "integer",
34+
"maes_3": "integer",
35+
"maes_4": "integer",
36+
"ua": "string",
37+
"area_ha": "real",
38+
"nodata": "integer",
39+
"comment": "string"},
40+
"ignored": []
4041
}
4142
},
4243
{

‎product_definitions/swf_2015_vec_ras.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,10 @@
143143
"required": true,
144144
"parameters": {
145145
"layers": ["swf_vec"],
146-
"attributes": {"code": "string",
147-
"area": "real",
148-
"class_name": "string"}
146+
"required": {"code": "string",
147+
"area": "real",
148+
"class_name": "string"},
149+
"ignored": ["shape_length", "shape_area"]
149150
}
150151
},
151152
{

‎product_definitions/ua_2012_gdb.json‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,35 @@
2727
"required": true,
2828
"parameters": {
2929
"layers": ["reference"],
30-
"attributes": {"country": "string",
31-
"cities": "string",
32-
"fua_or_cit": "string",
33-
"prod_date": "string",
34-
"shape_length": "real",
35-
"shape_area": "real",
36-
"code2012": "string",
37-
"item2012": "string",
38-
"ident": "string"}
30+
"required": {"country": "string",
31+
"cities": "string",
32+
"fua_or_cit": "string",
33+
"prod_date": "string",
34+
"shape_length": "real",
35+
"shape_area": "real",
36+
"code2012": "string",
37+
"item2012": "string",
38+
"ident": "string"},
39+
"ignored": []
3940
}
4041
},
4142
{
4243
"check_ident": "qc_tool.vector.attribute",
4344
"required": true,
4445
"parameters": {
4546
"layers": ["combined", "change"],
46-
"attributes": {"country": "string",
47-
"cities": "string",
48-
"fua_or_cit": "string",
49-
"prod_date": "string",
50-
"shape_length": "real",
51-
"shape_area": "real",
52-
"code2006": "string",
53-
"item2006": "string",
54-
"code2012": "string",
55-
"item2012": "string",
56-
"ident": "string"}
47+
"required": {"country": "string",
48+
"cities": "string",
49+
"fua_or_cit": "string",
50+
"prod_date": "string",
51+
"shape_length": "real",
52+
"shape_area": "real",
53+
"code2006": "string",
54+
"item2006": "string",
55+
"code2012": "string",
56+
"item2012": "string",
57+
"ident": "string"},
58+
"ignored": []
5759
}
5860
},
5961
{

‎product_definitions/ua_2012_gdb_wo_change.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@
2424
"required": true,
2525
"parameters": {
2626
"layers": ["reference"],
27-
"attributes": {"country": "string",
28-
"cities": "string",
29-
"fua_or_cit": "string",
30-
"prod_date": "string",
31-
"shape_length": "real",
32-
"shape_area": "real",
33-
"code2012": "string",
34-
"item2012": "string",
35-
"ident": "string"}
27+
"required": {"country": "string",
28+
"cities": "string",
29+
"fua_or_cit": "string",
30+
"prod_date": "string",
31+
"shape_length": "real",
32+
"shape_area": "real",
33+
"code2012": "string",
34+
"item2012": "string",
35+
"ident": "string"},
36+
"ignored": []
3637
}
3738
},
3839
{

‎product_definitions/ua_2012_shp.json‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,35 @@
2525
"required": true,
2626
"parameters": {
2727
"layers": ["reference"],
28-
"attributes": {"country": "string",
29-
"cities": "string",
30-
"fua_or_cit": "string",
31-
"prod_date": "string",
32-
"shape_leng": "real",
33-
"shape_area": "real",
34-
"code2012": "string",
35-
"item2012": "string",
36-
"ident": "string"}
28+
"required": {"country": "string",
29+
"cities": "string",
30+
"fua_or_cit": "string",
31+
"prod_date": "string",
32+
"shape_leng": "real",
33+
"shape_area": "real",
34+
"code2012": "string",
35+
"item2012": "string",
36+
"ident": "string"},
37+
"ignored": []
3738
}
3839
},
3940
{
4041
"check_ident": "qc_tool.vector.attribute",
4142
"required": true,
4243
"parameters": {
4344
"layers": ["combined", "change"],
44-
"attributes": {"country": "string",
45-
"cities": "string",
46-
"fua_or_cit": "string",
47-
"prod_date": "string",
48-
"perimeter": "real",
49-
"area": "real",
50-
"code2006": "string",
51-
"item2006": "string",
52-
"code2012": "string",
53-
"item2012": "string",
54-
"ident": "string"}
45+
"required": {"country": "string",
46+
"cities": "string",
47+
"fua_or_cit": "string",
48+
"prod_date": "string",
49+
"perimeter": "real",
50+
"area": "real",
51+
"code2006": "string",
52+
"item2006": "string",
53+
"code2012": "string",
54+
"item2012": "string",
55+
"ident": "string"},
56+
"ignored": []
5557
}
5658
},
5759
{

‎product_definitions/ua_2012_shp_wo_change.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@
2323
"required": true,
2424
"parameters": {
2525
"layers": ["reference"],
26-
"attributes": {"country": "string",
27-
"cities": "string",
28-
"fua_or_cit": "string",
29-
"prod_date": "string",
30-
"shape_leng": "real",
31-
"shape_area": "real",
32-
"code2012": "string",
33-
"item2012": "string",
34-
"ident": "string"}
26+
"required": {"country": "string",
27+
"cities": "string",
28+
"fua_or_cit": "string",
29+
"prod_date": "string",
30+
"shape_leng": "real",
31+
"shape_area": "real",
32+
"code2012": "string",
33+
"item2012": "string",
34+
"ident": "string"},
35+
"ignored": []
3536
}
3637
},
3738
{

0 commit comments

Comments
 (0)