Merge branch 'master' into origin/feature/spatial-extensions

Signed-off-by: Konrad Reiche <[email protected]> Conflicts: OGPD_JSON_Schema.html beispiele/beispiel1.json
fraunhoferfokus · Dec 6, 2013 · 7383d8b · 7383d8b
2 parents 361b861 + 4f5533f
commit 7383d8b
Show file tree

Hide file tree

Showing 7 changed files with 230 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+ - "0.10"
+before_install:
+ - npm install JSV
+script: cd validation/ && node validate.js ../beispiele/beispiel1.json
diff --git a/OGPD_JSON_Schema.html b/OGPD_JSON_Schema.html
diff --git a/OGPD_JSON_Schema.json b/OGPD_JSON_Schema.json
@@ -1,5 +1,6 @@
 {
-"type": "object", 
+ "type": "object", 
+ "$schema": "https://json-schema.org/draft-03/schema#", 
  "description": "JSON Schema Representation of an OGPD prototype dataset/document/app aligned with theCKAN metadata schema", 
  "properties": {
  "name": {
@@ -109,7 +110,7 @@
  } 
  },
  "license_id": {
- "enum": ["apache", "app_commercial", "app_freeware", "app_opensource", "bsd-license", "cc-by", "cc-by-sa", "cc-nc", "cc-by-nd", "cc-zero", "dl-de-by-1.0", "dl-de-by-nc-1.0", "geolizenz-closed", "geolizenz-i-a", "gfdl", "gpl-3.0", "mozilla", "odc-by", "odc-odbl", "odc-pddl", "official-work", "other-closed", "other-open"], 
+ "enum": ["apache", "app_commercial", "app_freeware", "app_opensource", "bsd-license", "cc-by", "cc-by-sa", "cc-nc", "cc-by-nd", "cc-zero", "dl-de-by-1.0", "dl-de-by-nc-1.0", "geolizenz-v1.2.1-open", "geolizenz-v1.2-1a", "geolizenz-v1.2-1b", "geolizenz-v1.2-2a", "geolizenz-v1.2-2b", "geolizenz-v1.2-3a", "geolizenz-v1.2-3b", "geolizenz-v1.2-4a", "geolizenz-v1.2-4b", "geonutzv-de-2013-03-19", "gfdl", "gpl-3.0", "mozilla", "odc-by", "odc-odbl", "odc-pddl", "official-work", "other-closed", "other-open"], 
  "type": "string", 
  "required": true, 
  "description": "Lizenz-ID: Lizenz aus einer festen Liste, s.u. bzw. <a href='https://github.com/fraunhoferfokus/ogd-metadata/blob/master/lizenzen/deutschland.json'>Liste</a>"
@@ -189,6 +190,11 @@
  "description": "URL: URL, auf der die Lizenz des Datensatzes, Dokuments oder der App beschrieben und erklärt ist.", 
  "format": "uri"
  },
+ "attribution_text": {
+ "type": "string", 
+ "required": false, 
+ "description": "Namensnennungs-Text: Der exakte Text, der im Rahmen der Namensnennung anzugeben ist."
+ },
  "is_free_to_use": {
  "type": "boolean", 
  "required": false, 
@@ -240,12 +246,17 @@
  }, 
  "coordinates": {
  "type": "array",
- "description": "Koordinaten Liste der Koordinaten",
+ "description": "Liste der LinearRing Koordinaten-Liste",
  "items": {
  "type": "array", 
- "description": "Koordinaten in der Reihenfolge x, y",
+ "description": "Koordinatenliste die einen LinearRing bildet",
  "items": {
- "type": "number"
+ "type": "array",
+ "description": "Koordinatenliste bestehend aus x,y Koordinaten",
+ "items": {
+ "type": "number",
+ "description": "x bzw. y Koordinate"
+ }
  }
  }
  },

diff --git a/OGPD_JSON_Schema_changelog.txt b/OGPD_JSON_Schema_changelog.txt
@@ -1,3 +1,13 @@
+2013-12-06 Änderungen aus der Datenbereitsteller-Telko und weiteres
+ - Feld Namensnennung zu extras.terms_of_use hinzugefügt
+ - neue Geolizenzen aufgenommen
+ - Lizenzversionierung für neue und bestehende (Creative Commons) Lizenzen mit in den Identifier aufnehmen
+
+2013-12-04 GeoJSON Koordinatenformat angepasst
+ - das aktuelle GeoJSON Format für Polygon ist ein zweifach geschachteltes Array und nicht einfach
+ - siehe: https://www.geojson.org/geojson-spec.html#id4
+ - dementsprechend wurde extras.spatial.coordinates angepasst
+
 2012-09-25 /prototyp/doc/metadaten/120925-post-harvesting-workshop.pdf eingearbeitet, insb.
  - kontakte als liste mit rollenbezeichner
  - nicht-ckan-core-felder in extras verschoben
@@ -53,4 +63,4 @@
 - CC-BY-ND aufgenommen
 
 2013-03-27
-- Geodaten-Nutzungsverordnung hinzugefügt.
+- Geodaten-Nutzungsverordnung hinzugefügt.
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
-ogd-metadata
-==================
+# ogd-metadata
+
+[![Build Status](https://travis-ci.org/fraunhoferfokus/ogd-metadata.png?branch=master)](https://travis-ci.org/fraunhoferfokus/ogd-metadata)
 
 Metadata structure and documentation to be used by the German Open Government Platform and as input to the standardization of a common metadata structure for open government data in German speaking countries
 
@@ -11,8 +12,8 @@ Relevante Links zur CKAN-Dokumentation:
  * [Domain Model][ckan-dm]
  * [CKAN Logic Code][ckan-lc]
 
-[ogdm-html]: https://htmlpreview.github.com/?https://github.com/fraunhoferfokus/ogd-metadata/blob/master/OGPD_JSON_Schema.html
+[ogdm-html]: https://htmlpreview.github.com/?https://github.com/fraunhoferfokus/ogd-metadata/blob/attrib_field/OGPD_JSON_Schema.html
 [ogdm-blog]: https://open-data.fokus.fraunhofer.de/?p=643
 [ckan-dm]: https://docs.ckan.org/en/ckan-1.8/domain-model.html
 [ckan-lc]: https://github.com/okfn/ckan/blob/master/ckan/logic/schema.py
-
+
diff --git a/beispiele/beispiel1.json b/beispiele/beispiel1.json
@@ -69,7 +69,7 @@
  "metadata_original_html": "https://www.example.com/bundesamt/beispieldaten/01043a74-ca8c-783b-5541",
  "spatial": {
  "type": "polygon",
- "coordinates": [
+ "coordinates": [[
  [
  15.02,
  47.16
@@ -90,7 +90,7 @@
  15.02,
  47.16
  ]
- ],
+ ]],
  "ags": "12064",
  "nuts": "DE413",
  "uri": "https://dbpedia.org/resource/Landkreis_M%C3%A4rkisch-Oderland"

diff --git a/lizenzen/deutschland.json b/lizenzen/deutschland.json
@@ -54,6 +54,19 @@
  "title": "Creative Commons Namensnennung (CC-BY)", 
  "url": "https://www.opendefinition.org/licenses/cc-by"
  }, 
+ {
+ "domain_content": true, 
+ "domain_data": true, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "cc-by-4.0", 
+ "is_okd_compliant": true, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "Creative Commons Namensnennung (CC BY 4.0)", 
+ "url": "https://creativecommons.org/licenses/by/4.0/"
+ }, 
  {
  "domain_content": true, 
  "domain_data": true, 
@@ -80,6 +93,19 @@
  "title": "Creative Commons Attribution Weitergabe unter gleichen Bedingungen (CC-BY-SA)", 
  "url": "https://www.opendefinition.org/licenses/cc-by-sa"
  }, 
+ {
+ "domain_content": true, 
+ "domain_data": false, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "cc-by-sa-4.0", 
+ "is_okd_compliant": true, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "Creative Commons Attribution Weitergabe unter gleichen Bedingungen (CC BY-SA 4.0)", 
+ "url": "https://creativecommons.org/licenses/by-sa/4.0/"
+ }, 
  {
  "domain_content": false, 
  "domain_data": true, 
@@ -146,6 +172,19 @@
  "title": "Creative Commons Nicht-Kommerziell (CC-NC)", 
  "url": "https://creativecommons.org/licenses/by-nc/2.0/"
  }, 
+ {
+ "domain_content": true, 
+ "domain_data": true, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "cc-by-nc-4.0", 
+ "is_okd_compliant": false, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "Creative Commons Nicht-Kommerziell (CC BY-NC 4.0)", 
+ "url": "https://creativecommons.org/licenses/by-nc/4.0/"
+ }, 
  {
  "domain_content": true, 
  "domain_data": true, 
@@ -158,6 +197,19 @@
  "status": "active", 
  "title": "Creative Commons Keine Bearbeitung (CC-BY-ND)", 
  "url": "https://creativecommons.org/licenses/by-nd/3.0/"
+ }, 
+ {
+ "domain_content": true, 
+ "domain_data": true, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "cc-by-nd-4.0", 
+ "is_okd_compliant": false, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "Creative Commons Keine Bearbeitung (CC BY-ND)", 
+ "url": "https://creativecommons.org/licenses/by-nd/4.0/"
  }, 
  {
  "domain_content": true, 
@@ -192,14 +244,126 @@
  "domain_data": true, 
  "domain_software": false, 
  "family": "", 
- "id": "geolizenz-closed", 
+ "id": "geolizenz-v1.2.1-open", 
+ "is_generic": true, 
+ "is_okd_compliant": true, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "GeoLizenz V1.2.1 Open-räumlich und zeitlich unbeschränkte Einräumung aller Nutzungsrechte", 
+ "url": "https://www.geolizenz.org/modules/geolizenz/docs/1.2.1/GeoLizenz_V1.2.1_Open_082213_V1.pdf"
+ }, 
+ {
+ "domain_content": true, 
+ "domain_data": true, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "geolizenz-v1.2-1a", 
+ "is_generic": true, 
+ "is_okd_compliant": false, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "GeoLizenz V1-2 Ia-kommerziell-Weiterverarbeitung-oeffentliche_Netzwerke", 
+ "url": "https://www.geolizenz.org"
+ },
+ {
+ "domain_content": true, 
+ "domain_data": true, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "geolizenz-v1.2-1b", 
+ "is_generic": true, 
+ "is_okd_compliant": false, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "GeoLizenz V1-2 Ib-nicht-kommerziell-Weiterverarbeitung-oeffentliche_Netzwerke", 
+ "url": "https://www.geolizenz.org"
+ },
+ {
+ "domain_content": true, 
+ "domain_data": true, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "geolizenz-v1.2-2a", 
+ "is_generic": true, 
+ "is_okd_compliant": false, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "GeoLizenz V1-2 IIa-kommerziell-keine Weiterverarbeitung-oeffentliche_Netzwerke", 
+ "url": "https://www.geolizenz.org"
+ },
+ {
+ "domain_content": true, 
+ "domain_data": true, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "geolizenz-v1.2-2b", 
+ "is_generic": true, 
+ "is_okd_compliant": false, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "GeoLizenz V1-2 IIb-nicht-kommerziell-keine Weiterverarbeitung-oeffentliche_Netzwerke", 
+ "url": "https://www.geolizenz.org"
+ },
+ {
+ "domain_content": true, 
+ "domain_data": true, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "geolizenz-v1.2-3a", 
+ "is_generic": true, 
+ "is_okd_compliant": false, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "GeoLizenz V1-2 IIIa-kommerziell-Weiterverarbeitung-nicht-oeffentliche_Netzwerke", 
+ "url": "https://www.geolizenz.org"
+ },
+ {
+ "domain_content": true, 
+ "domain_data": true, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "geolizenz-v1.2-3b", 
+ "is_generic": true, 
+ "is_okd_compliant": false, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "GeoLizenz V1-2 IIIb-nicht-kommerziell-Weiterverarbeitung-nicht-oeffentliche_Netzwerke", 
+ "url": "https://www.geolizenz.org"
+ },
+ {
+ "domain_content": true, 
+ "domain_data": true, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "geolizenz-v1.2-4a", 
+ "is_generic": true, 
+ "is_okd_compliant": false, 
+ "is_osi_compliant": false, 
+ "maintainer": "", 
+ "status": "active", 
+ "title": "GeoLizenz V1-2 IVa-kommerziell-keine Weiterverarbeitung-nicht-oeffentliche_Netzwerke", 
+ "url": "https://www.geolizenz.org"
+ },
+ {
+ "domain_content": true, 
+ "domain_data": true, 
+ "domain_software": false, 
+ "family": "", 
+ "id": "geolizenz-v1.2-4b", 
  "is_generic": true, 
  "is_okd_compliant": false, 
  "is_osi_compliant": false, 
  "maintainer": "", 
  "status": "active", 
- "title": "eingeschränkte Geolizenz", 
- "url": "https://www.geolizenz.org/index/lizenzen.php"
+ "title": "GeoLizenz V1-2 IVb-nicht-kommerziell-keine Weiterverarbeitung-nicht-oeffentliche_Netzwerke", 
+ "url": "https://www.geolizenz.org"
  },
  {
  "domain_content": false, 
@@ -320,4 +484,4 @@
  "title": "Andere eingeschränkte Lizenz", 
  "url": ""
  }
-]
+]