adiwg-mdjson_schemas 2.0.3 → 2.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +25 -3
  3. data/examples/keyword.json +13 -0
  4. data/lib/adiwg/mdjson_schemas/version.rb +1 -1
  5. data/schema/keyword.json +73 -2
  6. data/schema/resourceInfo.json +2 -1
  7. data/schema/schema.json +1 -1
  8. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d56eeb16bd147b77ac702ef7119ed3d3ce1cc796
4
- data.tar.gz: 2d1d72f13d604bc76242d675d98eda72e3f745f9
3
+ metadata.gz: 5587e51d247bc11bb7dca78375228e27823ae44f
4
+ data.tar.gz: ed6b4043cce2b0b0fcf393e848e2ae793bca1488
5
5
  SHA512:
6
- metadata.gz: c898703e65eaa886a753bd6b78057a383c4d56c29913f9e4783aa0d2dc3959c341bda28941a58286cb50e16583f7a9d5962b932ca0840cc8f0a4405958da406a
7
- data.tar.gz: e401ff4b5282cced39a41331151b7d344bbdfd3a3512032076f8bb0c11bde7d5469a7d120340f54ce0ccba02ca14800c08529bd68bdaf6581cf4a51a55130e9d
6
+ metadata.gz: 640ed7a2fbba6aeed0aa6d9cc686f358a79638f804e19ecaea5fc2c7a8bd3267b476aa802920f4392d39a29c5c779fc9ab08b79726f625d7bfa382c178459588
7
+ data.tar.gz: 82a2dc6696e8b1b958242baeaca60d25d8af4d75f8628e43a4fa2e0720b67ef022f140b57db6e976363a66a7919e138554fe51011d3e133ea4607703afd33900
data/CHANGELOG.md CHANGED
@@ -1,8 +1,30 @@
1
1
  # mdJson-schemas Changelog
2
2
 
3
- ### Master
3
+ ## [v2.0.3](https://github.com/adiwg/mdJson-schemas/tree/v2.0.3) (2017-03-21)
4
+ [Full Changelog](https://github.com/adiwg/mdJson-schemas/compare/v2.0.2...v2.0.3)
4
5
 
5
- ### Release 2.0.1 (March 15, 2017)
6
+ **Fixed bugs:**
7
+
8
+ - georectifiedRepresentation not allowing empty [\#141](https://github.com/adiwg/mdJson-schemas/issues/141)
9
+ - vectorRepresentation not allowing empty [\#142](https://github.com/adiwg/mdJson-schemas/issues/142)
10
+
11
+ ## [v2.0.2](https://github.com/adiwg/mdJson-schemas/tree/v2.0.2) (2017-03-21)
12
+ [Full Changelog](https://github.com/adiwg/mdJson-schemas/compare/v2.0.1...v2.0.2)
13
+
14
+ **Fixed bugs:**
15
+
16
+ - Maintenance 'frequency' is required element [\#140](https://github.com/adiwg/mdJson-schemas/issues/140)
17
+ - Constraint 'type' is required [\#139](https://github.com/adiwg/mdJson-schemas/issues/139)
18
+ - Taxonomy identificationReference is identifier [\#138](https://github.com/adiwg/mdJson-schemas/issues/138)
19
+ - Default Boolean elements to 'false' [\#137](https://github.com/adiwg/mdJson-schemas/issues/137)
20
+ - Typo in description for matching [\#136](https://github.com/adiwg/mdJson-schemas/issues/136)
21
+ - Fix citation date [\#134](https://github.com/adiwg/mdJson-schemas/issues/134)
22
+ - Fix georeferenceableRepresentation gridRepresentation [\#135](https://github.com/adiwg/mdJson-schemas/issues/135)
23
+
24
+ ## [v2.0.1](https://github.com/adiwg/mdJson-schemas/tree/v2.0.1) (2017-03-15)
25
+ [Full Changelog](https://github.com/adiwg/mdJson-schemas/compare/v2.0.0...v2.0.1)
26
+
27
+ **Fixed bugs:**
6
28
 
7
29
  - Removed old template
8
- - [1833df8](https://github.com/adiwg/mdJson-schemas/commit/1833df80b9324dfbc5eb067821bde4a8011ccc08) [FIX] Fixed spatialRepresentation
30
+ - Fixed spatialRepresentation ([1833df8](https://github.com/adiwg/mdJson-schemas/commit/1833df80b9324dfbc5eb067821bde4a8011ccc08) )
data/examples/keyword.json CHANGED
@@ -11,4 +11,17 @@
11
11
  "thesaurus": {
12
12
  "title": "title"
13
13
  }
14
+ }, {
15
+ "keyword": [{
16
+ "keyword": "farming",
17
+ "keywordId": "keywordId0"
18
+ },
19
+ {
20
+ "keyword": "biota"
21
+ }
22
+ ],
23
+ "keywordType": "isoTopicCategory",
24
+ "thesaurus": {
25
+ "title": "title"
26
+ }
14
27
  }]
data/lib/adiwg/mdjson_schemas/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module ADIWG
2
2
  module MdjsonSchemas
3
3
  # Current schema version number
4
- VERSION = "2.0.3"
4
+ VERSION = "2.1.0"
5
5
  end
6
6
  end
data/schema/keyword.json CHANGED
@@ -12,7 +12,11 @@
12
12
  "description": "Commonly used word(s) or formalized word(s) or phrase(s) used to describe the subject.",
13
13
  "translation": {
14
14
  "ISO 19115-2": ["MD_Keywords > keyword"],
15
- "FGDC CSDGM": ["idinfo>keywords>theme>themekey", "idinfo>keywords>place>placekey", "idinfo>keywords>temporal>tempkey", "idinfo>keywords>stratum>stratkey"]
15
+ "FGDC CSDGM": ["idinfo>keywords>theme>themekey",
16
+ "idinfo>keywords>place>placekey",
17
+ "idinfo>keywords>temporal>tempkey",
18
+ "idinfo>keywords>stratum>stratkey"
19
+ ]
16
20
  },
17
21
  "items": {
18
22
  "$ref": "#/definitions/keywordObject"
@@ -30,14 +34,32 @@
30
34
  "description": "Name of the formally registered thesaurus or a similar authoritative source of keywords.",
31
35
  "translation": {
32
36
  "ISO 19115-2": ["MD_Keywords > thesaurusName > CI_Citation"],
33
- "FGDC CSDGM": ["idinfo>keywords>theme>themekt", "idinfo>keywords>place>placekt", "idinfo>keywords>temporal>tempkt", "idinfo>keywords>stratum>stratkt"]
37
+ "FGDC CSDGM": ["idinfo>keywords>theme>themekt",
38
+ "idinfo>keywords>place>placekt", "idinfo>keywords>temporal>tempkt",
39
+ "idinfo>keywords>stratum>stratkt"
40
+ ]
34
41
  },
35
42
  "$ref": "citation.json#"
36
43
  }
37
44
  },
45
+ "oneOf": [{
46
+ "$ref": "#/definitions/isoTopicCategory"
47
+ }, {
48
+ "title": "not an isoTopicCategory",
49
+ "not": {
50
+ "type": "object",
51
+ "properties": {
52
+ "keywordType": {
53
+ "enum": ["isoTopicCategory"]
54
+ }
55
+ }
56
+ }
57
+
58
+ }],
38
59
  "definitions": {
39
60
  "keywordObject": {
40
61
  "type": "object",
62
+ "title": "keywordObject",
41
63
  "example": "../examples/keyword.json#/0/keyword/0",
42
64
  "required": ["keyword"],
43
65
  "additionalProperties": true,
@@ -51,6 +73,55 @@
51
73
  "description": "Identifier for the keyword."
52
74
  }
53
75
  }
76
+ },
77
+ "isoTopicCategory": {
78
+ "type": "object",
79
+ "title": "type is isoTopicCategory",
80
+ "required": ["keyword", "keywordType"],
81
+ "properties": {
82
+ "keywordType": {
83
+ "enum": ["isoTopicCategory"],
84
+ "description": "ISO Topic Category keywords. Keywords must match list defined by ISO 19115.",
85
+ "translation": {
86
+ "ISO 19115-2": ["MD_Keywords > type"]
87
+ }
88
+ },
89
+ "keyword": {
90
+ "type": "array",
91
+ "description": "Array of ISO Topic Category keywords.",
92
+ "translation": {
93
+ "ISO 19115-2": ["MD_Keywords > keyword"],
94
+ "FGDC CSDGM": ["idinfo>keywords>theme>themekey",
95
+ "idinfo>keywords>place>placekey",
96
+ "idinfo>keywords>temporal>tempkey",
97
+ "idinfo>keywords>stratum>stratkey"
98
+ ]
99
+ },
100
+ "items": {
101
+ "type": "object",
102
+ "title": "isoTopicCategory",
103
+ "properties": {
104
+ "keyword": {
105
+ "enum": ["farming", "biota", "boundaries",
106
+ "climatologyMeteorologyAtmosphere", "economy",
107
+ "elevation", "environment",
108
+ "geoscientificInformation",
109
+ "health", "imageryBaseMapsEarthCover",
110
+ "intelligenceMilitary", "inlandWaters", "location",
111
+ "oceans", "planningCadastre", "society", "structure",
112
+ "transportation", "utilitiesCommunication",
113
+ "extraTerrestrial", "disaster"
114
+ ],
115
+ "description": "ISO Topic Category keyword."
116
+ }
117
+ },
118
+ "oneOf": [{
119
+ "$ref": "#/definitions/keywordObject"
120
+ }]
121
+ },
122
+ "uniqueItems": true
123
+ }
124
+ }
54
125
  }
55
126
  }
56
127
  }
data/schema/resourceInfo.json CHANGED
@@ -82,7 +82,8 @@
82
82
  },
83
83
  "topicCategory": {
84
84
  "type": "array",
85
- "description": "General theme keyword of the resource, such as: oceans, biota atmosphere, etc.",
85
+ "deprecated": true,
86
+ "description": "**This property is deprecated in favor of using a keyword entry with a type of \"isoTopicCategory\".**\n\nGeneral theme keyword of the resource, such as: oceans, biota atmosphere, etc.",
86
87
  "translation": {
87
88
  "ISO 19115-2": ["MD_DataIdentification > topicCategory"]
88
89
  },
data/schema/schema.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "id": "schema.json#",
3
3
  "$schema": "http://json-schema.org/draft-04/schema#",
4
- "version": "2.0.3",
4
+ "version": "2.1.0",
5
5
  "description": "schema for ADIwg mdJSON metadata",
6
6
  "example": "../examples/mdJson.json",
7
7
  "type": "object",
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: adiwg-mdjson_schemas
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.3
4
+ version: 2.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josh Bradley, Stan Smith
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-03-21 00:00:00.000000000 Z
11
+ date: 2017-05-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -324,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
324
324
  version: '0'
325
325
  requirements: []
326
326
  rubyforge_project:
327
- rubygems_version: 2.5.2
327
+ rubygems_version: 2.4.5
328
328
  signing_key:
329
329
  specification_version: 4
330
330
  summary: JSON schemas for the ADIwg metadata standard