Skip to content

Commit 11ded83

Browse files
m-mohrm-mohr
committed
Update specification and tooling
1 parent f6788a0 commit 11ded83

7 files changed

Lines changed: 65 additions & 130 deletions

File tree

‎.github/workflows/test.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
- uses: actions/setup-python@v5
1010
with:
11-
python-version: '>=3.9'
11+
python-version: '>=3.10'
1212
- uses: actions/checkout@v4
1313
- name: Install pipenv
1414
run: |
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- uses: actions/setup-python@v5
2222
with:
23-
python-version: '>=3.9'
23+
python-version: '>=3.10'
2424
- uses: actions/checkout@v4
2525
- name: Install pipenv
2626
run: |
@@ -33,12 +33,10 @@ jobs:
3333
steps:
3434
- uses: actions/setup-python@v5
3535
with:
36-
python-version: '>=3.9'
36+
python-version: '>=3.10'
3737
- uses: actions/checkout@v4
3838
- name: Install pipenv
3939
run: |
4040
pip install pipenv
4141
pipenv install
42-
- run: pipenv run test-geojson-features
43-
- run: pipenv run test-geojson-collection
44-
- run: pipenv run test-geoparquet
42+
- run: pipenv run test-examples

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Releases are cut from main, see the [process](process.md) document for more deta
3434

3535
## Check files
3636

37-
You'll need to install Python >= 3.9 and pip to setup the test environment.
37+
You'll need to install Python >= 3.10 and pip to setup the test environment.
3838
We use pipenv to execute the tests.
3939

4040
Start with the following command in the folder where this README is located:
@@ -47,7 +47,5 @@ Finally, you can run the tests as follows:
4747

4848
- To check the markdown run: `pipenv run test-docs`
4949
- To check the Vecorel schema run: `pipenv run test-schema`
50-
- To check the examples run:
51-
- `pipenv run test-geojson-collection` and `pipenv run test-geojson-features` for GeoJSON
52-
- `pipenv run test-geoparquet` for GeoParquet
50+
- To check the examples run: `pipenv run test-examples`
5351
- To create a GeoParquet from the GeoJSON examples: `pipenv run create-geoparquet`

‎Pipfile‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ verify_ssl = true
44
name = "pypi"
55

66
[packages]
7-
# vecorel-cli = ">=0.1"
7+
vecorel-cli = ">=0.1"
88
pymarkdownlnt = ">=0.9"
99

1010
[scripts]
1111
test-docs = "pymarkdown -d md024,md013 scan ."
12-
test-schema = "vecorel validate-schema core/schema/schema.yaml"
13-
test-geojson-collection = "vecorel validate geojson/examples/featurecollection -s core/schema/schema.yaml --data"
14-
test-geojson-features = "vecorel validate geojson/examples/individual-features -s core/schema/schema.yaml --data"
15-
test-geoparquet = "vecorel validate geoparquet/examples -s core/schema/schema.yaml --data"
16-
create-geoparquet = "vecorel create-geoparquet geojson/examples/featurecollection/features.json -o geoparquet/examples/example.parquet -s core/schema/schema.yaml"
12+
test-schema = "vec validate-schema core/schema/schema.yaml"
13+
test-examples = "vec validate geojson/examples/featurecollection geojson/examples/individual-features geoparquet/examples -s https://vecorel.github.io/specification/v0.1.0/schema.yaml,core/schema/schema.yaml -n -1"
14+
create-geoparquet = "vec create-geoparquet geojson/examples/featurecollection/features.json -s https://vecorel.github.io/specification/v0.1.0/schema.yaml,core/schema/schema.yaml -o geoparquet/examples/example.parquet"

‎geojson/examples/featurecollection/features.json‎

Lines changed: 28 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,55 @@
11
{
2+
"type": "FeatureCollection",
23
"schemas": {
34
"de_nrw": [
45
"https://vecorel.github.io/specification/v0.1.0/schema.yaml",
5-
"https://fiboa.github.io/specification/v0.3.0/schema.yaml",
6-
"https://vecorel.github.io/inspire-extension/v0.2.0/schema.yaml",
7-
"https://fiboa.github.io/flik-extension/v0.1.0/schema.yaml",
8-
"https://fiboa.github.io/crop-extension/v0.1.0/schema.yaml"
6+
"https://vecorel.github.io/administrative-division-extension/v0.1.0/schema.yaml"
97
]
108
},
11-
"collection": "de_nrw",
12-
"license": "dl-de/by-2-0",
13-
"attribution": "Land Nordrhein-Westfalen / Open.NRW - https://www.opengeodata.nrw.de/produkte/umwelt_klima/bodennutzung/landwirtschaft/",
14-
"type": "FeatureCollection",
9+
"schemas:custom": {
10+
"properties": {
11+
"determination_datetime": {
12+
"type": "date-time"
13+
},
14+
"license": {
15+
"type": "string"
16+
}
17+
}
18+
},
19+
"license": "CC-BY-4.0",
20+
"admin:country_code": "DE",
1521
"features": [
1622
{
1723
"id": "12324",
1824
"type": "Feature",
1925
"properties": {
20-
"inspire:id": "https://geodaten.nrw.de/id/inspire-lc-fb/landcoverunit/12324",
21-
"flik": "DENWLI0542130247",
22-
"determination_datetime": "2005-02-28T00:00:00Z",
23-
"crop:code": "A",
24-
"crop:name": "Ackerland",
25-
"area": 1.6311
26+
"admin:subdivision_code": "NW",
27+
"collection": "de_nrw",
28+
"determination_datetime": "2005-02-28T00:00:00Z"
2629
},
2730
"geometry": {
28-
"type": "Polygon",
31+
"type": "Point",
2932
"coordinates": [
30-
[
31-
[7.8752433, 51.7469574],
32-
[7.8754156, 51.7486557],
33-
[7.8755951, 51.7486575],
34-
[7.8757271, 51.7486476],
35-
[7.8758657, 51.7486117],
36-
[7.8761609, 51.7485365],
37-
[7.8762749, 51.7485265],
38-
[7.8766462, 51.7485226],
39-
[7.8766691, 51.7475958],
40-
[7.8766832, 51.7470291],
41-
[7.8752433, 51.7469574]
42-
]
33+
7.628809195253012,
34+
51.966334135641944
4335
]
44-
},
45-
"bbox": [7.8752433, 51.7469574, 7.8766832, 51.7486575]
36+
}
4637
},
4738
{
4839
"id": "2713",
4940
"type": "Feature",
5041
"properties": {
51-
"inspire:id": "https://geodaten.nrw.de/id/inspire-lc-fb/landcoverunit/2713",
52-
"flik": "DENWLI0540210084",
53-
"determination_datetime": "2005-02-22T00:00:00Z",
54-
"crop:code": "W",
55-
"crop:name": "Weide",
56-
"area": 1.8975
42+
"admin:subdivision_code": "BY",
43+
"collection": "de_nrw",
44+
"determination_datetime": "2005-02-22T00:00:00Z"
5745
},
5846
"geometry": {
59-
"type": "Polygon",
47+
"type": "Point",
6048
"coordinates": [
61-
[
62-
[9.2790722, 51.9255088],
63-
[9.2798481, 51.9258291],
64-
[9.280173, 51.925963],
65-
[9.2805999, 51.9261403],
66-
[9.2806601, 51.9260287],
67-
[9.280886, 51.9256102],
68-
[9.2813352, 51.9247781],
69-
[9.2813057, 51.9247258],
70-
[9.280917, 51.9245829],
71-
[9.2799035, 51.9242133],
72-
[9.2798176, 51.9242331],
73-
[9.2793983, 51.9250101],
74-
[9.2792413, 51.925301],
75-
[9.2790722, 51.9255088]
76-
]
49+
11.583212028901471,
50+
48.137224125246036
7751
]
78-
},
79-
"bbox": [9.2790722, 51.9242133, 9.2813352, 51.9261403]
52+
}
8053
}
8154
]
8255
}

‎geojson/examples/individual-features/12324.json‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,24 @@
11
{
2+
"id": "12324",
3+
"type": "Feature",
24
"schemas": {
3-
"example": [
5+
"de_nrw": [
46
"https://vecorel.github.io/specification/v0.1.0/schema.yaml",
5-
"https://fiboa.github.io/specification/v0.3.0/schema.yaml",
6-
"https://fiboa.github.io/flik-extension/v0.1.0/schema.yaml"
7+
"https://vecorel.github.io/administrative-division-extension/v0.1.0/schema.yaml"
78
]
89
},
9-
"id": "12324",
10-
"type": "Feature",
1110
"properties": {
12-
"collection": "example",
13-
"flik": "DENWLI0542130247",
14-
"determination_datetime": "2005-02-28T00:00:00Z",
15-
"nutz_code": "A",
16-
"nutz_txt": "Ackerland",
17-
"area": 1.6311
11+
"collection": "de_nrw",
12+
"license": "CC-BY-4.0",
13+
"admin:country_code": "DE",
14+
"admin:subdivision_code": "NW",
15+
"determination_datetime": "2005-02-28T00:00:00Z"
1816
},
1917
"geometry": {
20-
"type": "Polygon",
18+
"type": "Point",
2119
"coordinates": [
22-
[
23-
[7.8752433, 51.7469574],
24-
[7.8754156, 51.7486557],
25-
[7.8755951, 51.7486575],
26-
[7.8757271, 51.7486476],
27-
[7.8758657, 51.7486117],
28-
[7.8761609, 51.7485365],
29-
[7.8762749, 51.7485265],
30-
[7.8766462, 51.7485226],
31-
[7.8766691, 51.7475958],
32-
[7.8766832, 51.7470291],
33-
[7.8752433, 51.7469574]
34-
]
20+
7.628809195253012,
21+
51.966334135641944
3522
]
3623
}
37-
}
24+
}

‎geojson/examples/individual-features/2713.json‎

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,24 @@
11
{
2+
"id": "2713",
3+
"type": "Feature",
24
"schemas": {
3-
"example": [
5+
"de_nrw": [
46
"https://vecorel.github.io/specification/v0.1.0/schema.yaml",
5-
"https://fiboa.github.io/specification/v0.3.0/schema.yaml",
6-
"https://fiboa.github.io/flik-extension/v0.1.0/schema.yaml"
7+
"https://vecorel.github.io/administrative-division-extension/v0.1.0/schema.yaml"
78
]
89
},
9-
"id": "2713",
10-
"type": "Feature",
1110
"properties": {
12-
"collection": "example",
13-
"flik": "DENWLI0540210084",
14-
"determination_datetime": "2005-02-28T00:00:00Z",
15-
"nutz_code": "A",
16-
"nutz_txt": "Ackerland",
17-
"area": 1.8975000
11+
"collection": "de_nrw",
12+
"license": "CC-BY-4.0",
13+
"admin:country_code": "DE",
14+
"admin:subdivision_code": "BY",
15+
"determination_datetime": "2005-02-22T00:00:00Z"
1816
},
1917
"geometry": {
20-
"type": "Polygon",
18+
"type": "Point",
2119
"coordinates": [
22-
[
23-
[9.2790722, 51.9255088],
24-
[9.2798481, 51.9258291],
25-
[9.2801730, 51.9259630],
26-
[9.2805999, 51.9261403],
27-
[9.2806601, 51.9260287],
28-
[9.2808860, 51.9256102],
29-
[9.2813352, 51.9247781],
30-
[9.2813057, 51.9247258],
31-
[9.2809170, 51.9245829],
32-
[9.2799035, 51.9242133],
33-
[9.2798176, 51.9242331],
34-
[9.2793983, 51.9250101],
35-
[9.2792413, 51.9253010],
36-
[9.2790722, 51.9255088]
37-
]
20+
11.583212028901471,
21+
48.137224125246036
3822
]
39-
},
40-
"bbox": [
41-
9.2790722, 51.9242133, 9.2813352, 51.9261403
42-
]
43-
}
23+
}
24+
}

‎geoparquet/examples/example.parquet‎

-916 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)