Merge branch 'master' of https://github.com/fraunhoferfokus/ogd-metadata

fraunhoferfokus · Aug 27, 2015 · d06e54d · d06e54d
2 parents aab6bd4 + 64cd058
commit d06e54d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/OGPD_JSON_Schema.json b/OGPD_JSON_Schema.json
@@ -110,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", "cc-by-4.0", "cc-by-nc-4.0", "cc-by-sa-4.0", "cc-by-nd-4.0", "dl-de-by-1.0", "dl-de-by-nc-1.0", "dl-de-zero-2.0", "dl-de-by-2.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"], 
+ "enum": ["apache", "app_commercial", "app_freeware", "app_opensource", "bsd-license", "cc-by", "cc-by-sa", "cc-nc", "cc-by-nd", "cc-zero", "cc-by-4.0", "cc-by-nc-4.0", "cc-by-sa-4.0", "cc-by-nd-4.0", "dl-de-by-1.0", "dl-de-by-nc-1.0", "dl-de-zero-2.0", "dl-de-by-2.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", "geonutz-be-2013-10-01", "cc-pdm-1.0"], 
  "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>"

diff --git a/lizenzen/deutschland.json b/lizenzen/deutschland.json
@@ -497,5 +497,33 @@
  "status": "active", 
  "title": "Andere eingeschränkte Lizenz", 
  "url": ""
- }
+ },
+ {
+"domain_content": true,
+"domain_data": true,
+"domain_software": false,
+"family": "",
+"id": "geonutz-be-2013-10-01",
+"is_generic": true,
+"is_okd_compliant": true,
+"is_osi_compliant": false,
+"maintainer": "",
+"status": "active",
+"title": "Nutzungsbestimmungen für die Bereitstellung von Geodaten des Landes Berlin",
+"url": "http:https://www.stadtentwicklung.berlin.de/geoinformation/download/nutzIII.pdf"
+},
+{
+"domain_content": true,
+"domain_data": true,
+"domain_software": false,
+"family": "",
+"id": "cc-pdm-1.0",
+"is_generic": true,
+"is_okd_compliant": true,
+"is_osi_compliant": false,
+"maintainer": "",
+"status": "active",
+"title": " Public Domain Mark 1.0 (PDM)",
+"url": "http:https://creativecommons.org/publicdomain/mark/1.0/"
+}
 ]