Skip to content

Commit 43dba09

Browse files
committed
Update to Vecorel and fiboa 0.3, v0.2.0
1 parent 2ab3858 commit 43dba09

File tree

9 files changed

+32
-39
lines changed

9 files changed

+32
-39
lines changed

.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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2727

2828
- ...
2929

30+
## [v0.2.0] - 2025-08-26
31+
32+
- Update to Vecorel and fiboa 0.3
33+
3034
## [v0.1.0] - 2024-03-01
3135

3236
- First release
3337

34-
[Unreleased]: <https://github.com/fiboa/crop-extension/compare/v0.1.0...main>
38+
[Unreleased]: <https://github.com/fiboa/crop-extension/compare/v0.2.0...main>
39+
[v0.2.0]: <https://github.com/fiboa/crop-extension/compare/v0.1.0...v0.2.0>
3540
[v0.1.0]: <https://github.com/fiboa/crop-extension/tree/v0.1.0>

CONTRIBUTING.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
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).
5-
For contributions, please follow the
6-
[fiboa contributing guideline](https://github.com/fiboa/specification/blob/main/CONTRIBUTING.md).
4+
[Code of Conduct](https://vecorel.org/code-of-conduct/).
75

86
## Running tests
97

@@ -13,11 +11,12 @@ We use pipenv to execute the tests.
1311
Start with the following command in the folder where this README is located:
1412
`pip install pipenv --user`
1513

14+
Install the dependencies for the test:
15+
`pipenv install`
16+
1617
Finally, you can run the tests as follows:
1718

1819
- 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
20+
- To check the schema run: `pipenv run test-schema`
21+
- To check the examples run: `pipenv run test-examples`
2322
- To create a GeoParquet from the GeoJSON examples: `pipenv run create-geoparquet`

Pipfile

Lines changed: 3 additions & 4 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.0"
7+
fiboa-cli = ">=0.20"
88
pymarkdownlnt = ">=0.9"
99

1010
[scripts]
1111
test-docs = "pymarkdown -d md024,md013 scan ."
1212
test-schema = "fiboa validate-schema schema/schema.yaml"
13-
test-geojson = "fiboa validate examples/geojson -e https://fiboa.github.io/crop-extension/v0.1.0/schema.yaml,schema/schema.yaml --data"
14-
test-geoparquet = "fiboa validate examples/geoparquet -e https://fiboa.github.io/crop-extension/v0.1.0/schema.yaml,schema/schema.yaml --data"
15-
create-geoparquet = "fiboa create-geoparquet examples/geojson -o examples/geoparquet/example.parquet -c examples/geojson/collection.json -e https://fiboa.github.io/crop-extension/v0.1.0/schema.yaml,schema/schema.yaml"
13+
test-examples = "fiboa validate examples/geojson examples/geoparquet -s https://fiboa.org/crop-extension/v0.2.0/schema.yaml,schema/schema.yaml -n -1"
14+
create-geoparquet = "fiboa create-geoparquet examples/geojson -o examples/geoparquet/example.parquet -s https://fiboa.org/crop-extension/v0.2.0/schema.yaml,schema/schema.yaml"

README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# Crop Extension Specification
22

33
- **Title:** Crop
4-
- **Identifier:** <https://fiboa.github.io/crop-extension/v0.1.0/schema.yaml>
4+
- **Identifier:** <https://fiboa.org/crop-extension/v0.2.0/schema.yaml>
55
- **Property Name Prefix:** crop
66
- **Extension Maturity Classification:** Proposal
77
- **Owner**: @ivorbosloper
88

99
This document explains the Crop extension to the
10-
[Field Boundaries for Agriculture (fiboa) Specification](https://github.com/fiboa/specification).
10+
[Field Boundaries for Agriculture (fiboa)](https://fiboa.org) and
11+
[Vecorel](https://vecorel.org) specifications.
1112

1213
Many published crop field datasets use a crop code list to identify the crop on each crop field. This extension
1314
harmonizes the columns to describe a coding list, a crop code and a crop name.
@@ -24,11 +25,6 @@ A valid value for `crop:code_list` would be `https://github.com/maja601/EuroCrop
2425

2526
## Properties
2627

27-
The properties in the table below can be used in these parts of fiboa documents:
28-
29-
- [x] Collection
30-
- [x] Feature Properties
31-
3228
| Property Name | Type | Description |
3329
| -------------- | ------ | ------------------------------------ |
3430
| crop:code_list | string | **REQUIRED** A link to the code list |

examples/geojson/collection.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

examples/geojson/example.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
{
2+
"schemas": {
3+
"example": [
4+
"https://vecorel.org/specification/v0.1.0/schema.yaml",
5+
"https://fiboa.org/specification/v0.3.0/schema.yaml",
6+
"https://fiboa.org/crop-extension/v0.2.0/schema.yaml"
7+
]
8+
},
29
"type": "Feature",
3-
"id": "example",
10+
"id": "DEBBLI0260100301",
411
"bbox": [
512
172.91173669923782,
613
1.3438851951615003,
@@ -35,17 +42,11 @@
3542
]
3643
},
3744
"properties": {
38-
"determination_datetime": "2023-01-01T00:00:00Z",
45+
"collection": "example",
46+
"determination:datetime": "2023-01-01T00:00:00Z",
3947
"crop:code_list": "https://github.com/maja601/EuroCrops/blob/main/csvs/country_mappings/dk_2019.csv",
4048
"crop:name": "Vårbyg",
4149
"crop:code": "1",
4250
"crop:name_en": "Spring barley"
43-
},
44-
"links": [
45-
{
46-
"rel": "collection",
47-
"href": "collection.json",
48-
"type": "application/json"
49-
}
50-
]
51+
}
5152
}
814 Bytes
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.org/sdl/v0.2.0/schema.json
22
required:
33
- crop:code_list
44
- crop:code

0 commit comments

Comments
 (0)