Skip to content

Commit

Permalink
examples/geojson: Use libcoveofds, not ofdskit
Browse files Browse the repository at this point in the history 
#19
  • Loading branch information
@odscjames
odscjames committed Dec 1, 2022
1 parent 53c8191 commit c3dbd8d
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 11 deletions.
36 changes: 32 additions & 4 deletions examples/geojson/nodes.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@
"funders": [
{
"id": "1",
"name": "Ghana Infrastructure Investment Fund"
"name": "Ghana Infrastructure Investment Fund",
"country": "GH",
"roles": [
"funder"
],
"roleDetails": "The Ghana Infrastructure Investment Fund provided equity financing for the construction of phase 1 of the NextGen network.",
"website": "https://www.example.com",
"logo": "https://www.example.com/logo.png"
}
]
},
Expand Down Expand Up @@ -110,7 +117,14 @@
"funders": [
{
"id": "1",
"name": "Ghana Infrastructure Investment Fund"
"name": "Ghana Infrastructure Investment Fund",
"country": "GH",
"roles": [
"funder"
],
"roleDetails": "The Ghana Infrastructure Investment Fund provided equity financing for the construction of phase 1 of the NextGen network.",
"website": "https://www.example.com",
"logo": "https://www.example.com/logo.png"
}
]
}
Expand Down Expand Up @@ -168,7 +182,14 @@
"funders": [
{
"id": "1",
"name": "Ghana Infrastructure Investment Fund"
"name": "Ghana Infrastructure Investment Fund",
"country": "GH",
"roles": [
"funder"
],
"roleDetails": "The Ghana Infrastructure Investment Fund provided equity financing for the construction of phase 1 of the NextGen network.",
"website": "https://www.example.com",
"logo": "https://www.example.com/logo.png"
}
]
},
Expand Down Expand Up @@ -252,7 +273,14 @@
"funders": [
{
"id": "1",
"name": "Ghana Infrastructure Investment Fund"
"name": "Ghana Infrastructure Investment Fund",
"country": "GH",
"roles": [
"funder"
],
"roleDetails": "The Ghana Infrastructure Investment Fund provided equity financing for the construction of phase 1 of the NextGen network.",
"website": "https://www.example.com",
"logo": "https://www.example.com/logo.png"
}
]
}
Expand Down
18 changes: 16 additions & 2 deletions examples/geojson/spans.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,14 @@
"funders": [
{
"id": "1",
"name": "Ghana Infrastructure Investment Fund"
"name": "Ghana Infrastructure Investment Fund",
"country": "GH",
"roles": [
"funder"
],
"roleDetails": "The Ghana Infrastructure Investment Fund provided equity financing for the construction of phase 1 of the NextGen network.",
"website": "https://www.example.com",
"logo": "https://www.example.com/logo.png"
}
]
},
Expand Down Expand Up @@ -256,7 +263,14 @@
"funders": [
{
"id": "1",
"name": "Ghana Infrastructure Investment Fund"
"name": "Ghana Infrastructure Investment Fund",
"country": "GH",
"roles": [
"funder"
],
"roleDetails": "The Ghana Infrastructure Investment Fund provided equity financing for the construction of phase 1 of the NextGen network.",
"website": "https://www.example.com",
"logo": "https://www.example.com/logo.png"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion manage.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ def pre_commit():
update_schema_docs(schema)

# Update examples/geojson/nodes.geojson and examples/geojson/spans.geojson
subprocess.run(['ofdskit', 'jsontogeojson', 'examples/json/network-package.json', 'examples/geojson/nodes.geojson', 'examples/geojson/spans.geojson'])
subprocess.run(['libcoveofds', 'jsontogeojson', 'examples/json/network-package.json', 'examples/geojson/nodes.geojson', 'examples/geojson/spans.geojson'])

@cli.command()
@click.argument('filename', type=click.Path(exists=True))
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ pyairtable
PyGithub
ocdskit
sphinx-design
ofdskit
libcoveofds
flattentool
15 changes: 12 additions & 3 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ appdirs==1.4.4
attrs==22.1.0
# via
# cattrs
# jsonschema
# requests-cache
babel==2.10.3
# via
Expand Down Expand Up @@ -72,7 +73,9 @@ jinja2==3.1.2
# myst-parser
# sphinx
json-merge-patch==0.2
# via ocdsextensionregistry
# via
# libcoveofds
# ocdsextensionregistry
jsonpointer==2.3
# via
# sphinxcontrib-opendataservices
Expand All @@ -81,10 +84,15 @@ jsonref==0.2
# via
# -r requirements.in
# flattentool
# libcoveofds
# ocdsextensionregistry
# ocdskit
# ocdsmerge
# sphinxcontrib-opendataservices-jsonschema
jsonschema==4.17.3
# via libcoveofds
libcoveofds==0.5.0
# via -r requirements.in
livereload==2.6.3
# via sphinx-autobuild
lxml==4.9.1
Expand Down Expand Up @@ -112,8 +120,6 @@ ocdsmerge==0.6.6
# via ocdskit
odfpy==1.4.1
# via flattentool
ofdskit==0.0.0
# via -r requirements.in
openpyxl==3.0.10
# via flattentool
packaging==21.3
Expand All @@ -136,6 +142,8 @@ pynacl==1.5.0
# via pygithub
pyparsing==3.0.9
# via packaging
pyrsistent==0.19.2
# via jsonschema
python-slugify==4.0.1
# via transifex-client
pytz==2022.1
Expand All @@ -146,6 +154,7 @@ pyyaml==6.0
# via myst-parser
requests==2.28.1
# via
# libcoveofds
# ocdsextensionregistry
# ocdsmerge
# pyairtable
Expand Down

0 comments on commit c3dbd8d

Please sign in to comment.