Skip to content

Commit 45afd82

Browse files
m-mohrm-mohr
committed
Update for vecorel
1 parent c1116ce commit 45afd82

8 files changed

Lines changed: 54 additions & 180 deletions

File tree

‎.github/workflows/test.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ 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: |
1515
pip install pipenv
1616
pipenv install
1717
- run: pipenv run test-docs
1818
- run: pipenv run test-schema
19-
- run: pipenv run test-geojson
20-
- run: pipenv run test-geoparquet
19+
- run: pipenv run test-examples

‎CHANGELOG.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2727

2828
- ...
2929

30-
## [v0.1.0] - 2024-03-01
30+
## [v0.1.0] - 2025-08-15
3131

3232
- First release
3333

34-
[Unreleased]: <https://github.com/fiboa/administrative-division-extension/compare/v0.1.0...main>
35-
[v0.1.0]: <https://github.com/fiboa/administrative-division-extension/tree/v0.1.0>
34+
This extension is based on the [fiboa administrative-division extension v0.1.0](https://github.com/fiboa/administrative-division-extension/).
35+
36+
[Unreleased]: <https://github.com/vecorel/administrative-division-extension/compare/v0.1.0...main>
37+
[v0.1.0]: <https://github.com/vecorel/administrative-division-extension/tree/v0.1.0>

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Contributing
22

33
All contributions are subject to the
4-
[fiboa Code of Conduct](https://github.com/fiboa/specification/blob/main/CODE_OF_CONDUCT.md).
4+
[Vecorel Code of Conduct](https://github.com/vecorel/specification/blob/main/CODE_OF_CONDUCT.md).
55
For contributions, please follow the
6-
[fiboa contributing guideline](https://github.com/fiboa/specification/blob/main/CONTRIBUTING.md).
6+
[Vecorel contributing guideline](https://github.com/vecorel/specification/blob/main/CONTRIBUTING.md).
77

88
## Running tests
99

@@ -16,8 +16,6 @@ Start with the following command in the folder where this README is located:
1616
Finally, you can run the tests as follows:
1717

1818
- To check the markdown run: `pipenv run test-docs`
19-
- To check the fiboa schema run: `pipenv run test-schema`
20-
- To check the examples run:
21-
- `pipenv run test-geojson` for GeoJSON
22-
- `pipenv run test-geoparquet` for GeoParquet
19+
- To check the Vecorel schema run: `pipenv run test-schema`
20+
- To check the examples run: `pipenv run test-examples`
2321
- To create a GeoParquet from the GeoJSON examples: `pipenv run create-geoparquet`

‎Pipfile‎

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

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

1010
[scripts]
1111
test-docs = "pymarkdown -d md024,md013 scan ."
12-
test-schema = "fiboa validate-schema schema/schema.yaml"
13-
test-geojson = "fiboa validate examples/geojson -e https://fiboa.github.io/administrative-division-extension/v0.1.0/schema.yaml,schema/schema.yaml --data"
14-
test-geoparquet = "fiboa validate examples/geoparquet -e https://fiboa.github.io/administrative-division-extension/v0.1.0/schema.yaml,schema/schema.yaml --data"
15-
create-geoparquet = "fiboa create-geoparquet examples/geojson -o examples/geoparquet/example.parquet -e https://fiboa.github.io/administrative-division-extension/v0.1.0/schema.yaml,schema/schema.yaml"
12+
test-schema = "vec validate-schema schema/schema.yaml"
13+
test-examples = "vec validate examples/geojson examples/geoparquet -s https://vecorel.github.io/administrative-division-extension/v0.1.0/schema.yaml,schema/schema.yaml -n -1"
14+
create-geoparquet = "vec create-geoparquet examples/geojson -o examples/geoparquet/example.parquet -s https://vecorel.github.io/administrative-division-extension/v0.1.0/schema.yaml,schema/schema.yaml"

‎README.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Administrative Division Extension Specification
22

33
- **Title:** Administrative Division
4-
- **Identifier:** <https://fiboa.github.io/administrative-division-extension/v0.1.0/schema.yaml>
4+
- **Identifier:** <https://vecorel.github.io/administrative-division-extension/v0.1.0/schema.yaml>
55
- **Property Name Prefix:** admin
66
- **Extension Maturity Classification:** Proposal
77
- **Owner**: @m-mohr
88

99
This document explains the Administrative Division Extension to the
10-
[Field Boundaries for Agriculture (fiboa) Specification](https://github.com/fiboa/specification).
10+
[Vecorel specification](https://github.com/vecorel/specification).
1111

1212
It defines administrative divisions on the country and subdivision level based on
1313
[ISO-3166](https://www.iso.org/iso-3166-country-codes.html).
@@ -20,11 +20,6 @@ It defines administrative divisions on the country and subdivision level based o
2020

2121
## Properties
2222

23-
The properties in the table below can be used in these parts of fiboa documents:
24-
25-
- [x] Collection
26-
- [x] Feature Properties
27-
2823
| Property Name | Type | Description |
2924
| ---------------------- | ------ | ----------- |
3025
| admin:country_code | string | **REQUIRED.** ISO 3166-1 alpha-2 country code (aka admin0). Two-letter country code for the country that contains the field. |

‎examples/geojson/example.json‎

Lines changed: 36 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -1,161 +1,42 @@
11
{
2-
"fiboa": {
3-
"fiboa_version": "0.2.0",
4-
"fiboa_extensions": [
5-
"https://fiboa.github.io/administrative-division-extension/v0.1.0/schema.yaml"
6-
]
7-
},
82
"type": "FeatureCollection",
3+
"schemas": {
4+
"de_nrw": [
5+
"https://vecorel.github.io/specification/v0.1.0/schema.yaml",
6+
"https://vecorel.github.io/administrative-division-extension/v0.1.0/schema.yaml"
7+
]
8+
},
9+
"admin:country_code": "DE",
910
"features": [
10-
{
11-
"type": "Feature",
12-
"properties": {
13-
"area": 0.011851919813431496,
14-
"perimeter": 49.937117861428113,
15-
"determination_method": "administrative",
16-
"determination_datetime": "2022-11-30T00:00:00Z",
17-
"admin:country_code": "NL",
18-
"admin:subdivision_code": "UT"
19-
},
20-
"geometry": {
21-
"type": "Polygon",
22-
"coordinates": [
23-
[
24-
[
25-
5.262086192661527,
26-
51.98448212523148
27-
],
28-
[
29-
5.262272357940674,
30-
51.984596263974161
31-
],
32-
[
33-
5.262272357940674,
34-
51.984429429686728
35-
],
36-
[
37-
5.262086192661527,
38-
51.98448212523148
39-
]
40-
]
41-
]
42-
},
43-
"id": "NL1"
11+
{
12+
"id": "12324",
13+
"type": "Feature",
14+
"properties": {
15+
"admin:subdivision_code": "NW",
16+
"collection": "de_nrw"
17+
},
18+
"geometry": {
19+
"type": "Point",
20+
"coordinates": [
21+
7.628809195253012,
22+
51.966334135641944
23+
]
24+
}
25+
},
26+
{
27+
"id": "2713",
28+
"type": "Feature",
29+
"properties": {
30+
"admin:subdivision_code": "BY",
31+
"collection": "de_nrw"
4432
},
45-
{
46-
"type": "Feature",
47-
"properties": {
48-
"area": 2.469126372139848,
49-
"perimeter": 807.12286339794275,
50-
"determination_method": "administrative",
51-
"determination_datetime": "2022-11-30T00:00:00Z",
52-
"admin:country_code": "NL",
53-
"admin:subdivision_code": "UT"
54-
},
55-
"geometry": {
56-
"type": "Polygon",
57-
"coordinates": [
58-
[
59-
[
60-
5.250133332185963,
61-
51.984465340614804
62-
],
63-
[
64-
5.250130144114962,
65-
51.984470141985831
66-
],
67-
[
68-
5.250126952334039,
69-
51.98447711220026
70-
],
71-
[
72-
5.250089335436934,
73-
51.984559202405578
74-
],
75-
[
76-
5.250071982888167,
77-
51.984597066483921
78-
],
79-
[
80-
5.250059089994158,
81-
51.984660859460519
82-
],
83-
[
84-
5.250037961418451,
85-
51.984765399745768
86-
],
87-
[
88-
5.250010739527665,
89-
51.984976545320961
90-
],
91-
[
92-
5.250004717175737,
93-
51.985143325658328
94-
],
95-
[
96-
5.250003166589374,
97-
51.985186286449931
98-
],
99-
[
100-
5.250005531054459,
101-
51.985214273001006
102-
],
103-
[
104-
5.250006809508697,
105-
51.985229410583727
106-
],
107-
[
108-
5.252247069390644,
109-
51.985551341466071
110-
],
111-
[
112-
5.252237441919522,
113-
51.985554489779801
114-
],
115-
[
116-
5.25226000294407,
117-
51.985557841254433
118-
],
119-
[
120-
5.252253667998422,
121-
51.985549960352579
122-
],
123-
[
124-
5.252781803626587,
125-
51.985388124489489
126-
],
127-
[
128-
5.252783098929159,
129-
51.985387735880785
130-
],
131-
[
132-
5.253754548797305,
133-
51.98510227576994
134-
],
135-
[
136-
5.253755714370074,
137-
51.985101939134893
138-
],
139-
[
140-
5.254520947868031,
141-
51.984885551226427
142-
],
143-
[
144-
5.254517395492782,
145-
51.98485712750221
146-
],
147-
[
148-
5.25023236120371,
149-
51.984316110910413
150-
],
151-
[
152-
5.250133332185963,
153-
51.984465340614804
154-
]
155-
]
156-
]
157-
},
158-
"id": "NL2"
33+
"geometry": {
34+
"type": "Point",
35+
"coordinates": [
36+
11.583212028901471,
37+
48.137224125246036
38+
]
15939
}
40+
}
16041
]
161-
}
42+
}

‎examples/geoparquet/example.parquet‎

-4.14 KB
Binary file not shown.

‎schema/schema.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$schema: https://fiboa.github.io/schema/v0.1.0/schema.json
1+
$schema: https://vecorel.github.io/sdl/v0.2.0/schema.json
22
required:
33
- admin:country_code
44
properties:

0 commit comments

Comments
 (0)