Skip to content

Commit 7898b79

Browse files
committed
Update to Vecorel
1 parent 6008968 commit 7898b79

File tree

8 files changed

+28
-32
lines changed

8 files changed

+28
-32
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

CONTRIBUTING.md

Lines changed: 3 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

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

1816
- 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
17+
- To check the schema run: `pipenv run test-schema`
18+
- To check the examples run: `pipenv run test-examples`
2319
- 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.3"
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 -c examples/geojson/collection.json -e https://fiboa.github.io/flik-extension/v0.1.0/schema.yaml,schema/schema.yaml --data"
14-
test-geoparquet = "fiboa validate examples/geoparquet -e https://fiboa.github.io/flik-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/flik-extension/v0.1.0/schema.yaml,schema/schema.yaml"
13+
test-examples = "fiboa validate examples/geojson examples/geoparquet -s https://fiboa.org/flik-extension/v0.1.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/flik-extension/v0.1.0/schema.yaml,schema/schema.yaml"

README.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# FLIK Extension Specification
22

3-
- **Title:** FLIK (DE)
4-
- **Identifier:** <https://fiboa.github.io/flik-extension/v0.1.0/schema.yaml>
3+
- **Title:** FLIK
4+
- **Identifier:** <https://fiboa.org/flik-extension/v0.2.0/schema.yaml>
55
- **Property Name Prefix:** none
66
- **Extension Maturity Classification:** Proposal
77
- **Owner**: @m-mohr
88

99
This document explains the FLIK 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
The area identifier (FLIK) is a unique identifier key to clearly identify field blocks and similar entities,
1314
which is currently only used in Germany in this way but could be used internationally.
@@ -20,16 +21,12 @@ which is currently only used in Germany in this way but could be used internatio
2021

2122
## Properties
2223

23-
The properties in the table below can be used in these parts of fiboa documents:
24-
25-
- [ ] Collection
26-
- [x] Feature Properties
27-
2824
| Property Name | Type | Description |
2925
| --------------- | ------ | ----------- |
30-
| flik | string | **REQUIRED**. The (German) area identifier (FLIK code) is a 16-character string. |
26+
| flik | string | **REQUIRED**. The area identifier (FLIK code) is a 16-character string. |
27+
28+
In Germany, the FLIK identifier consists of:
3129

32-
IN Germany, the FLIK identifier consists of:
3330
- 2-letter country code (e.g. `DE` for Germany)
3431
- 2-letter state code (e.g. `BB` for Branbenburg)
3532
- 2-letter element type which is assigned on the state level (e.g. `LI`, `LE`, `NF` or `PS`)
@@ -38,6 +35,7 @@ IN Germany, the FLIK identifier consists of:
3835
So an example FLIK code could be: `DEBBLI0260100301`
3936

4037
More information can be found in German language at:
38+
4139
- <https://profilglossar.data-experts.de/mediawiki/index.php/Fl%C3%A4chenidentifikator>
4240
- <https://www.amic.de/hilfe/_flik.htm>
4341
- Search by FLIK in Germany: <https://flik-suche.de/>

examples/geojson/collection.json

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

examples/geojson/example.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
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/flik-extension/v0.1.0/schema.yaml"
7+
]
8+
},
29
"type": "Feature",
310
"id": "DEBBLI0260100301",
411
"bbox": [
@@ -35,7 +42,8 @@
3542
]
3643
},
3744
"properties": {
38-
"determination_datetime": "2020-01-01T00:00:00Z",
45+
"collection": "example",
46+
"determination:datetime": "2020-01-01T00:00:00Z",
3947
"flik": "DEBBLI0260100301"
4048
}
4149
}
1.74 KB
Binary file not shown.

schema/schema.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
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
- flik
4+
collection:
5+
flik: false
46
properties:
57
flik:
68
type: string

0 commit comments

Comments
 (0)