adiwg-mdjson_schemas 2.5.1 → 2.6.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 210524881f60b4064492a4b480dd53de4f8c2cc8
4
- data.tar.gz: 214c5f7fe2472a6a25e7ee305875dce341460487
3
+ metadata.gz: bfed072b2f0e866495d8bfd4b7fc41c99929f88d
4
+ data.tar.gz: 7d824dbb118d63ffef09c318a54c273bdb9c7912
5
5
  SHA512:
6
- metadata.gz: 59b9ee2d72e9f5e23c5802b042b344e268fcbbdf04fbb318c723beea390c6af344031d3c69e41ce61be6614c3bc296320d3d50341058f9df9009e7776c46a0d5
7
- data.tar.gz: f565fb2bc11e4c6014930359903ec7576e96f8f79143d8c31a4564ad376a40b4b827514776f3bc94b8d0ad479bcf54dbfe7f89a94baa43190998adcf81647581
6
+ metadata.gz: 37f374d59db6b48e31da8756f475f69f3fe3663b2a6f1c6fd3d283f2cd0f644ab836d1d65deb501adab40594e09742caa9e2e8a7b99bd94552d0bfa30798672f
7
+ data.tar.gz: 4d7a00d69f9e76c03658eb32e902605f444c46873c7579413204dabf9035f9dc96ab9e0b22cbef2e517c49a00f66a127494e49c840fc0fb236c42443e46bad0f
data/CHANGELOG.md CHANGED
@@ -1,11 +1,18 @@
1
1
  # Change Log
2
2
 
3
- ## [v2.5.1](https://github.com/adiwg/mdJson-schemas/tree/v2.5.1)
3
+ ## [v2.6.0](https://github.com/adiwg/mdJson-schemas/tree/v2.6.0) (2018-10-14)
4
+ [Full Changelog](https://github.com/adiwg/mdJson-schemas/compare/v2.5.1...v2.6.0)
4
5
 
6
+ **Fixed bugs:**
7
+
8
+ - taxonomy rule change [\#202](https://github.com/adiwg/mdJson-schemas/issues/202)
9
+
10
+ ## [v2.5.1](https://github.com/adiwg/mdJson-schemas/tree/v2.5.1) (2018-10-10)
5
11
  [Full Changelog](https://github.com/adiwg/mdJson-schemas/compare/v2.5.0...v2.5.1)
6
12
 
7
13
  **Implemented enhancements:**
8
14
 
15
+ - projection new object [\#157](https://github.com/adiwg/mdJson-schemas/issues/157)
9
16
  - geographicExtent 'description' rule change [\#153](https://github.com/adiwg/mdJson-schemas/issues/153)
10
17
 
11
18
  ## [v2.5.0](https://github.com/adiwg/mdJson-schemas/tree/v2.5.0) (2018-10-03)
@@ -209,4 +216,4 @@
209
216
  - Fixed spatialRepresentation ([1833df8](https://github.com/adiwg/mdJson-schemas/commit/1833df80b9324dfbc5eb067821bde4a8011ccc08) )
210
217
 
211
218
 
212
- \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
219
+ \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
data/examples/mdJson.json CHANGED
@@ -1512,42 +1512,48 @@
1512
1512
  ],
1513
1513
  "generalScope": "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
1514
1514
  "identificationReference": [{
1515
- "identifier": "identifier0",
1516
- "namespace": "namespace0",
1517
- "version": "version0",
1518
- "description": "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
1519
- "authority": {
1520
- "title": "title0",
1521
- "date": [{
1522
- "date": "2013-06-22",
1523
- "dateType": "publication"
1524
- }],
1525
- "responsibleParty": [{
1526
- "role": "originator",
1527
- "party": [{
1528
- "contactId": "CID004"
1515
+ "title": "citation",
1516
+ "identifier": [{
1517
+ "identifier": "identifier0",
1518
+ "namespace": "namespace0",
1519
+ "version": "version0",
1520
+ "description": "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
1521
+ "authority": {
1522
+ "title": "title0",
1523
+ "date": [{
1524
+ "date": "2013-06-22",
1525
+ "dateType": "publication"
1526
+ }],
1527
+ "responsibleParty": [{
1528
+ "role": "originator",
1529
+ "party": [{
1530
+ "contactId": "CID004"
1531
+ }]
1529
1532
  }]
1530
- }]
1531
- }
1533
+ }
1534
+ }]
1532
1535
  },
1533
1536
  {
1534
- "identifier": "identifier1",
1535
- "namespace": "namespace1",
1536
- "version": "version1",
1537
- "description": "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
1538
- "authority": {
1539
- "title": "title1",
1540
- "date": [{
1541
- "date": "2013-06-22",
1542
- "dateType": "publication"
1543
- }],
1544
- "responsibleParty": [{
1545
- "role": "originator",
1546
- "party": [{
1547
- "contactId": "CID004"
1537
+ "title": "citation1",
1538
+ "identifier": [{
1539
+ "identifier": "identifier1",
1540
+ "namespace": "namespace1",
1541
+ "version": "version1",
1542
+ "description": "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
1543
+ "authority": {
1544
+ "title": "title1",
1545
+ "date": [{
1546
+ "date": "2013-06-22",
1547
+ "dateType": "publication"
1548
+ }],
1549
+ "responsibleParty": [{
1550
+ "role": "originator",
1551
+ "party": [{
1552
+ "contactId": "CID004"
1553
+ }]
1548
1554
  }]
1549
- }]
1550
- }
1555
+ }
1556
+ }]
1551
1557
  }
1552
1558
  ],
1553
1559
  "observer": [{
@@ -1588,70 +1594,75 @@
1588
1594
  }
1589
1595
  }
1590
1596
  ],
1591
- "taxonomicClassification": {
1592
- "taxonomicLevel": "taxonomicLevel0",
1593
- "taxonomicName": "taxonomicName",
1594
- "commonName": [
1595
- "commonName0",
1596
- "commonName1"
1597
- ],
1598
- "subClassification": [{
1599
- "taxonomicSystemId": "taxonomicSystemId00",
1600
- "taxonomicLevel": "taxonomicLevel00",
1601
- "taxonomicName": "taxonomicName",
1602
- "commonName": [
1603
- "commonName0",
1604
- "commonName1"
1605
- ],
1606
- "subClassification": [{
1607
- "taxonomicLevel": "taxonomicLevel000",
1597
+ "taxonomicClassification": [{
1598
+ "taxonomicLevel": "taxonomicLevel0",
1599
+ "taxonomicName": "taxonomicName",
1600
+ "commonName": [
1601
+ "commonName0",
1602
+ "commonName1"
1603
+ ],
1604
+ "subClassification": [{
1605
+ "taxonomicSystemId": "taxonomicSystemId00",
1606
+ "taxonomicLevel": "taxonomicLevel00",
1608
1607
  "taxonomicName": "taxonomicName",
1609
1608
  "commonName": [
1610
1609
  "commonName0",
1611
1610
  "commonName1"
1612
1611
  ],
1613
1612
  "subClassification": [{
1614
- "taxonomicSystemId": "taxonomicSystemId0000.1",
1615
- "taxonomicLevel": "taxonomicLevel0000.1",
1616
- "taxonomicName": "taxonomicName",
1617
- "commonName": [
1618
- "commonName0",
1619
- "commonName1"
1620
- ],
1621
- "subClassification": []
1622
- },
1623
- {
1624
- "taxonomicSystemId": "taxonomicSystemId0000.2",
1625
- "taxonomicLevel": "taxonomicLevel0000.2",
1626
- "taxonomicName": "taxonomicName",
1627
- "commonName": [
1628
- "commonName0",
1629
- "commonName1"
1630
- ],
1631
- "subClassification": []
1632
- }
1633
- ]
1634
- }]
1635
- },
1636
- {
1637
- "taxonomicLevel": "taxonomicLevel01",
1638
- "taxonomicName": "taxonomicName",
1639
- "commonName": [
1640
- "commonName0",
1641
- "commonName1"
1642
- ],
1643
- "subClassification": [{
1644
- "taxonomicLevel": "taxonomicLevel010",
1613
+ "taxonomicLevel": "taxonomicLevel000",
1614
+ "taxonomicName": "taxonomicName",
1615
+ "commonName": [
1616
+ "commonName0",
1617
+ "commonName1"
1618
+ ],
1619
+ "subClassification": [{
1620
+ "taxonomicSystemId": "taxonomicSystemId0000.1",
1621
+ "taxonomicLevel": "taxonomicLevel0000.1",
1622
+ "taxonomicName": "taxonomicName",
1623
+ "commonName": [
1624
+ "commonName0",
1625
+ "commonName1"
1626
+ ],
1627
+ "subClassification": []
1628
+ },
1629
+ {
1630
+ "taxonomicSystemId": "taxonomicSystemId0000.2",
1631
+ "taxonomicLevel": "taxonomicLevel0000.2",
1632
+ "taxonomicName": "taxonomicName",
1633
+ "commonName": [
1634
+ "commonName0",
1635
+ "commonName1"
1636
+ ],
1637
+ "subClassification": []
1638
+ }
1639
+ ]
1640
+ }]
1641
+ },
1642
+ {
1643
+ "taxonomicLevel": "taxonomicLevel01",
1645
1644
  "taxonomicName": "taxonomicName",
1646
1645
  "commonName": [
1647
1646
  "commonName0",
1648
1647
  "commonName1"
1649
1648
  ],
1650
- "subClassification": []
1651
- }]
1652
- }
1653
- ]
1654
- }
1649
+ "subClassification": [{
1650
+ "taxonomicLevel": "taxonomicLevel010",
1651
+ "taxonomicName": "taxonomicName",
1652
+ "commonName": [
1653
+ "commonName0",
1654
+ "commonName1"
1655
+ ],
1656
+ "subClassification": []
1657
+ }]
1658
+ }
1659
+ ]
1660
+ },
1661
+ {
1662
+ "taxonomicLevel": "taxonomicLevel0201",
1663
+ "taxonomicName": "taxonomicName"
1664
+ }
1665
+ ]
1655
1666
  }],
1656
1667
  "graphicOverview": [{
1657
1668
  "fileName": "fileName 0",
@@ -22,13 +22,16 @@
22
22
  }
23
23
  },
24
24
  {
25
- "identifier": "identifier1",
26
- "namespace": "namespace1",
27
- "version": "version1",
28
- "description": "description1",
29
- "authority": {
30
- "title": "title1"
31
- }
25
+ "title": "title",
26
+ "identifier": [{
27
+ "identifier": "identifier1",
28
+ "namespace": "namespace1",
29
+ "version": "version1",
30
+ "description": "description1",
31
+ "authority": {
32
+ "title": "title1"
33
+ }
34
+ }]
32
35
  }
33
36
  ],
34
37
  "observer": [{
@@ -93,12 +96,24 @@
93
96
  }
94
97
  }
95
98
  ],
96
- "taxonomicClassification": {
99
+ "taxonomicClassification": [{
100
+ "taxonomicSystemId": "taxonomicSystemId0",
97
101
  "commonName": [
98
102
  "commonName0",
99
103
  "commonName1"
100
104
  ],
101
105
  "taxonomicLevel": "taxonomicLevel0",
102
- "taxonomicName": "taxonomicName0"
103
- }
106
+ "taxonomicName": "taxonomicName0",
107
+ "subClassification": [{
108
+ "taxonomicSystemId": "taxonomicSystemId1",
109
+ "commonName": [
110
+ "commonName0",
111
+ "commonName1"
112
+ ],
113
+ "taxonomicLevel": "taxonomicLevel1",
114
+ "taxonomicName": "taxonomicName1",
115
+ "latinName": "latinName",
116
+ "taxonomicRank": "taxonomicName1"
117
+ }]
118
+ }]
104
119
  }]
@@ -1,6 +1,6 @@
1
1
  module ADIWG
2
2
  module MdjsonSchemas
3
3
  # Current schema version number
4
- VERSION = "2.5.1"
4
+ VERSION = "2.6.0"
5
5
  end
6
6
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mdjson-schemas",
3
- "version": "2.5.1",
3
+ "version": "2.6.0",
4
4
  "description": "JSON schemas, examples, and templates for ADIwg metadata standards",
5
5
  "main": "index.js",
6
6
  "directories": {
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.5.1",
4
+ "version": "2.6.0",
5
5
  "description": "schema for ADIwg mdJSON metadata",
6
6
  "example": "../examples/mdJson.json",
7
7
  "type": "object",
data/schema/taxonomy.json CHANGED
@@ -35,7 +35,14 @@
35
35
  "description": "Information on any non-authoritative materials (e.g. field guides) useful for reconstructing the actual process.",
36
36
  "translation": {},
37
37
  "items": {
38
- "$ref": "./identifier.json#"
38
+ "oneOf": [{
39
+ "$ref": "./citation.json#"
40
+ },
41
+ {
42
+ "$ref": "./identifier.json#",
43
+ "deprecated": true
44
+ }
45
+ ]
39
46
  }
40
47
  },
41
48
  "observer": {
@@ -73,7 +80,18 @@
73
80
  }
74
81
  },
75
82
  "taxonomicClassification": {
76
- "$ref": "#/definitions/taxonomicClassification"
83
+ "oneOf": [{
84
+ "type": "array",
85
+ "minItems": 1,
86
+ "items": {
87
+ "$ref": "#/definitions/taxonomicClassification"
88
+ }
89
+ },
90
+ {
91
+ "$ref": "#/definitions/taxonomicClassification",
92
+ "deprecated": true
93
+ }
94
+ ]
77
95
  }
78
96
  },
79
97
  "definitions": {
@@ -100,6 +118,7 @@
100
118
  },
101
119
  "taxonomicClassification": {
102
120
  "type": "object",
121
+ "title": "taxonomicClassification",
103
122
  "description": "Information about the range of taxa addressed in the data set or collection. NOTE It is recommended that one provide information starting from the taxonomic rank of kingdom, to a level which reflects the data set or collection being documented.",
104
123
  "example": "../examples/taxonomicClassification.json",
105
124
  "translation": {
@@ -107,7 +126,7 @@
107
126
  "FGDC CSDGM": ["idinfo > taxonomy > taxoncl"]
108
127
  },
109
128
  "additionalProperties": true,
110
- "oneOf": [{
129
+ "anyOf": [{
111
130
  "title": "Requires taxonomicName and taxonomicLevel",
112
131
  "required": ["taxonomicName", "taxonomicLevel"]
113
132
  }, {
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.5.1
4
+ version: 2.6.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: 2018-10-10 00:00:00.000000000 Z
11
+ date: 2018-10-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler