Skip to content

Commit

Permalink
Merge pull request #46 from waterthetrees/camille-le/feature/update-i…
Browse files Browse the repository at this point in the history
…taly

Update Bologna, Guingamp, Luxembourg and Cary data sources due to errors
  • Loading branch information
zoobot committed Aug 12, 2022
2 parents 3e8c404 + b6b7475 commit c15b0be
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 16 deletions.
7 changes: 4 additions & 3 deletions sources/france.js
Original file line number Diff line number Diff line change
Expand Up @@ -694,16 +694,17 @@ export default [
longitude: null,
info: "https://datarmor.cotesdarmor.fr/data-presentation-ux/#/cg22/datasets/Arbres_Guingamp/views/grid?primary-bg-color=@046D8B&primary-font-color=@fff",
srs: null,
brokenDownload: false,
brokenDownload: true,
brokenNotes: "No common field",
download:
"https://datarmor.cotesdarmor.fr:443/dataserver/cg22/data/Arbres_Guingamp?&$format=csv",
format: null,
format: "csv",
filename: null,
gdal_options: null,
license: null,
email: null,
contact: null,
crosswalk: { genus: "Genre", species: "Espce", variety: "VArit" },
crosswalk: { genus: "Genre", species: "Espce", variety: "Varit" },
},
{
country: "France",
Expand Down
16 changes: 9 additions & 7 deletions sources/italy.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,22 @@ export default [
center: null,
latitude: null,
longitude: null,
info: "http:https://dati.comune.bologna.it/node/207",
info: "https:https://opendata.comune.bologna.it/explore/dataset/alberi-manutenzioni/information/?disjunctive.classe&disjunctive.cl_h&disjunctive.dimora&disjunctive.d_edif",
srs: null,
brokenDownload: false,
download: "http:https://dati.comune.bologna.it/download/file/fid/3989",
format: "zip",
brokenDownload: true,
brokenNotes: "Data has Specie arborea field but no common field",
download: "https://opendata.comune.bologna.it/explore/dataset/alberi-manutenzioni/download/?format=geojson&timezone=Europe/Rome&lang=it",
format: "geojson",
filename: null,
gdal_options: null,
license: null,
email: null,
contact: null,
crosswalk: {
scientific: "decodifi_4",
circumference: "decodifi_2",
ref: "NUM_PT",
scientific: "Specie arborea",
height: "Classe di altezza",
updated: "Data ultimo aggiornamento",
planted: "Data Impianto",
},
},
{
Expand Down
5 changes: 3 additions & 2 deletions sources/luxembourg.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ export default [
center: null,
latitude: null,
longitude: null,
info: "https://catalog.inspire.geoportail.lu/geonetwork/srv/eng/catalog.search#/metadata/bf367452-c965-4ae1-b652-bd2c86400be5",
info: "https://data.public.lu/en/datasets/inspire-annex-i-theme-protected-sites-remarkable-trees/#_",
srs: null,
brokenDownload: true,
brokenNotes: "Requires outreach to get a compatible file format",
download:
"https://download.data.public.lu/resources/inspire-annex-i-theme-protected-sites-remarkable-trees/20200129-134525/ps.protectedsitesnatureconservation-trees.gml",
"https://download.data.public.lu/resources/inspire-annex-i-theme-protected-sites-remarkable-trees/20220405-122622/ps.protectedsitesnatureconservation-trees.gml",
format: "gml",
filename: null,
gdal_options: null,
Expand Down
8 changes: 4 additions & 4 deletions sources/usa.js
Original file line number Diff line number Diff line change
Expand Up @@ -568,9 +568,10 @@ export default [
center: null,
latitude: null,
longitude: null,
info: "https://catalog.data.gov/dataset/cary-trees",
info: "https://data.townofcary.org/pages/homepage/",
srs: null,
brokenDownload: false,
brokenDownload: true,
brokenNotes: "Broken link, old data source does not have species and common fields. Requires outreach.",
download:
"https://data.townofcary.org/api/v2/catalog/datasets/cary-trees/exports/csv",
format: "csv",
Expand All @@ -582,8 +583,7 @@ export default [
crosswalk: {
updated: "editdate",
common: "name",
scientific: "scientificname",
description: "description",
note: "description",
},
},
{
Expand Down
3 changes: 3 additions & 0 deletions src/core/sources.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Schema (incomplete):
id (required): internal identifier used in naming files and linking things.
short: Short name for the city, shown on the map (eg Melbourne)
long: Full name for the government body (eg City of Melbourne)
brokenDownload: Indicates whether the data source is usable
brokenNotes: Indicates any reasons for why the source is marked a brokenDownload
download (required): URL to get data from
info: URL that is the landing page for more information about dataset
format: The file extension, eg zip/geojson/csv. Not required if present in download URL.
Expand Down Expand Up @@ -34,6 +36,7 @@ spread: crown spread, in metres (TODO reconcile this and crown)
ule: useful life expectancy, in years (TODO a better way of doing this with absolute years)
updated: date that data was last updated (TOOD distinguish between various kinds of updates maybe)
planted: Date that tree was planted as a seed (not used much - need to be clearer about semantics and date format)
note: Any additional notes about the trees
Future fields:
- installation date?
Expand Down

0 comments on commit c15b0be

Please sign in to comment.