adiwg-mdtranslator 2.19.0.pre.beta.31 → 2.20.0.pre.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9406ad642dbfb6ed729457467f9573ebed130405d655f45aada389001d229438
-  data.tar.gz: 92ae72e50afa64c174bcf0f26fa2e1ec646b3e22458d3116dbfcf41bf5dcd099
+  metadata.gz: ec23318ef18dc9729c5aaa6c608b55c856234d8e31a893b6c011f02494f75718
+  data.tar.gz: d28e618a12660f940c9fbc4d3ea380c1109cdc2c7756a32872c2f2e84b4e2c64
 SHA512:
-  metadata.gz: 6be6df90c2ad1e6fe0847a2eb5864f7cbb8119c96cc033763e21dc1d650149b9cfa23e476babf1000ff69ea8677d3621d1960d6179bd924c131ac1b5e2692e75
-  data.tar.gz: 89b17ec10d571211af8824b70782721b55e92d6f6f53547535ce3bf55e6c28f5df4781a409a9127cb5880acb6ab7e0b1e52105845e5ae55b621388bcdac86136
+  metadata.gz: 6c81ced313a48931ef23b337d408f512932836b81368c535eb197dc0950795b8510deea40f5a130b4372b3110f1d9020fb943d7537de8e80184dc88b25fe8994
+  data.tar.gz: 0566ba79a6004232a532bd7eda527bb60a90191ea0a0ba47baf38764efa014341074a31418cdc798f82a2fe5a5860f13d9f8a3e9dce8d170389edea39392a47d

data/.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.1" # Not needed with a .ruby-version file
       - run: bundle install

data/DCAT-US.md

@@ -0,0 +1,67 @@
+# DCAT-US - mdTranslator proposed mappings
+## Quick references
+  - DCAT-US [element definitions](https://resources.data.gov/resources/dcat-us/)
+  - DCAT-US v1.1 [catalog.json schema](https://resources.data.gov/schemas/dcat-us/v1.1/schema/catalog.json)
+  - DCAT-US v1.1 [dataset.json schema](https://resources.data.gov/schemas/dcat-us/v1.1/schema/dataset.json)
+  - DCAT-US v1.1 [JSON-LD catalog.json schema](https://resources.data.gov/schemas/dcat-us/v1.1/schema/catalog.jsonld)
+  - [Element crosswalks](https://resources.data.gov/resources/podm-field-mapping/#field-mappings) to other standards
+
+## DCAT-US - mdTranslator
+
+### Always (always required)
+
+| Field Name | DCAT Name | Condition | mdJson Source |
+| --- | --- | --- | --- |
+| Title | title | exists | citation.title |
+| Description | description | exists | resourceInfo.abstract |
+| Tags | keyword | exists | [resourceInfo.keyword.keyword[0, n] *flatten*] |
+| Last Update | modified | if resourceInfo.citation.date[any].dateType = "lastUpdated" or "lastRevised" or "revision" | resourceInfo.citation.date[most recent] |
+| Publisher | publisher{name} | if citation.responsibleParty.[any].role = "publisher" |  contactId -> contact.name where isOrganization IS TRUE |
+| | | if exists resourceDistribution.distributor.contact | [first contact] contactId -> contact.name where isOrganization IS TRUE |
+| Publisher Parent Organization | publisher{subOrganizationOf} | if citation.responsibleParty[any].role = "publisher" and exists contactId -> memberOfOrganization[0] and isOrganization is true | contactId -> contact.name |
+| | | if exists resourceDistribution.distributor.contact and exists contactId -> memberOfOrganization[0] and isOrganization IS TRUE | contactId -> contact.name |
+| Contact Name | contactPoint{fn} | exists | resourceInfo.pointOfContact.parties[0].contactId -> contact.name |
+| Contact Email | contactPoint{email} | exists | resourceInfo.pointOfContact.parties[0].contactId -> contact.eMailList[0] |
+| Unique Identifier | identifier | if resourceInfo.citation.identifier.namespace = "DOI" | resourceInfo.citation.onlineResource.uri |
+| | | if "DOI" within resourceInfo.citation.onlineResource.uri | resourceInfo.citation.onlineResource.uri |
+| Public Access Level | accessLevel | [*extend codelist MD_RestrictionCode to include "public",  "restricted  public", "non-public"*] <br> if resourceInfo.constraints.legal[any] one of {"public", "restricted public", "non-public"} | resourceInfo.constraints.legal[first]. Also resourceInfo.constraint.security.classification [[MD_ClassificationCode](https://mdtools.adiwg.org/#codes-page?c=iso_classification)] |
+| Bureau Code | bureauCode | | [*extend role codelist to include "bureau", extend namespace codelist to include "bureauCode"*] <br> for each resourceInfo.citation.responsibleParty[any] role = "bureau" <br>contactId -> contact.identifier [*identifier must conform to https://resources.data.gov/schemas/dcat-us/v1.1/omb_bureau_codes.csv*] |
+| Program Code | programCode | | [*add new element of program resourceInfo.programCode, add new codelist of programCode*] <br> resourceInfo.program[0,n] |
+
+### If-Applicable (required if it exists)
+
+| Field Name | DCAT Name | Condition | mdJson Source |
+| --- | --- | --- | --- |
+| Distribution | distribution | if exists resourceDistribution[any] and if exists resourceDistribution.distributor[any].transferOption[any].onlineOption[any].uri <br> for each resourceDistribution[0, n] where exists resourceDistribution.distributor.transferOption.onlineOption.uri then <br> {description, accessURL, downloadURL, mediaType, title} |
+| - Description | distribution.description | exists | resourceDistribution.description |
+| - AccessURL | distribution.accessURL | if citation.onlineResources[first occurence].uri [path ends in ".html"] [*required if applicable*] | resourceDistribution.distributor.transferOption.onlineOption.uri |
+| - DownloadURL | dcat.distribution.downloadURL | if citation.onlineResources[first occurence].uri [path does not end in ".html"] [*required if applicable*] |resourceDistribution.distributor.transferOption.onlineOption.uri |
+| - MediaType | distribution.mediaType | [*add codelist of "dataFormat"*] <br> transferOption.distributionFormat.formatSpecification.title [dataFormat] [*dataFormat should conform to: https://www.iana.org/assignments/media-types/media-types.xhtml*] |
+| - Title | distribution.title | exists | resourceDistribution.distributor.transferOption.onlineOption.name |
+| License | license | [*add resourceInfo.constraint.reference to mdEditor*] <br> if exists resourceInfo.constraint.reference[0] | resourceInfo.constraint.reference[0] <br> |
+| | | else | https://creativecommons.org/publicdomain/zero/1.0/ <br> [*allows author to identify a license to use, or default to CC0 if none provided, CC0 would cover international usage as opposed to publicdomain*] <br> [*others: http://www.usa.gov/publicdomain/label/1.0/, http://opendatacommons.org/licenses/pddl/1.0*] |
+| Rights | rights | if constraint.accessLevel in {"restricted public", "non-public"} | resourceInfo.constraint.releasibility.statement + " " + each constraint.releasibility.dessiminationConstraint[0, n] |
+| Endpoint | *removed* | *ignored* | *ignored* |
+| Spatial | spatial | if exists resourceInfo.extents[0].geographicExtents[0].boundingBox | boundingBox.eastLongitude + "," + boundingBox.southLatitude + "," + boundingBox.westLongitude + "," + boundingBox.northLatitude [*decimal degrees*] |
+| | | else | if exists resourceInfo.extents[0].geographicExtents[0].geographicElement[0].type = "point" then <br> geographicElement[0].coordinate[1] + "," + geographicElement[0].coordinate[0] [*lat, long decimal degrees*] |
+| Temporal | temporal | if exists resourceInfo.extent[0].temporalExtent[0] then <br> if exists tempororalExtent[0].timePeriod.startDate and exists temporaralExtent[0].timePeriod.endDate | timePeriod[0].startDate + "/" + timePeriod.endDate |
+| | | if exists  tempororalExtent[0].timePeriod.startDate and not exists temporaralExtent[0].timePeriod.endDate | tempororalExtent[0].timePeriod.startDate |
+| | | if not exists temporalExtent[0].timePeriod.startDate and exists temporaralExtent[0].timePeriod.endDate | tempororalExtent[0].timePeriod.endDate <br> [*may need revisiting relative to decision on date only formatting*] |
+
+### No (not required)
+
+| Field Name | DCAT Name | Condition | mdJson Source |
+| --- | --- | --- | --- |
+| Release Date | issued | if resourceInfo.citation.date[any].dateType = "publication" or "distributed" | resourceInfo.citation.date[earliest] |
+| Frequency | accrualPeriodicity | | [*ISO codelist MD_maintenanceFrequency can be used and several codes intersect with accrualPeriod codelist they are partially corresponding. A column of ISO8601 code equivalents could be added to MD_maintenanceFrequency to provide the coding expected https://resources.data.gov/schemas/dcat-us/v1.1/iso8601_guidance/#accrualperiodicity, community valuation should be determined*]  |
+| Language | language | | [*language codelist could be used but needs to be bound with country corresponding to the RFC 5646 format https://datatracker.ietf.org/doc/html/rfc5646, such as "en-US", community valuation should be determined* |
+| Data Quality | dataQuality | | [*this is a boolean to indicate whether data "conforms" to agency standards, value seems negligble*] |
+| Category | theme | where resourceInfo.keyword[any].thesaurus.title = "ISO Topic Category" | [resourceInfo.keyword.keyword[0, n] *flatten*]  |
+| Related Documents | references | | associatedResource[all].resourceCitation.onlineResource[all].uri + additionalDocumentation[all].citation[all].onlineResource[all].uri [*comma separated*]|
+| Homepage URL | landingPage | [*Add code "landingPage" to CI_OnlineFunctionCode*] <br> if resourceInfo.citation.onlineResource[any].function = "landingPage" | resourceInfo.citation.onlineResource.uri |
+| Collection | isPartOf | for each associatedResource[0, n].initiativeType = "collection" and associatedResource.associationType = "collectiveTitle" | associatedResource.resourceCitation[0].uri |
+| System of Records | systemOfRecords | [*Add code "sorn" to DS_InitiativeTypeCode*] <br> for each associatedResource[0, n].initiativeType = "sorn"   | associatedResource.resourceCitation[0].uri |
+| Primary IT Investment | primaryITInvestmentUII | | [*Links data to an IT investment identifier relative to Exhibit 53 docs, community valuation should be determined*] |
+| Data Dictionary | describedBy | if dataDictionary.dictionaryIncludedWithResource IS NOT TRUE and citation.onlineResource[0].uri exists | dataDictionary.citation.onlineResource[0].uri |
+| Data Dictionary Type | describedByType | | [*For simplicity, leave blank implying html page, community decision needed whether to support other format types using mime type and in the form of "application/pdf"*]|
+| Data Standard | conformsTo | | [*Currently not able to identify the schema standard the data conforms to, though this has been proposed. Should this be built and there is community decision to support it, then it can be mapped*] |

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    adiwg-mdtranslator (2.19.0.pre.beta.31)
-      adiwg-mdcodes (= 2.10.0)
-      adiwg-mdjson_schemas (= 2.9.5)
+    adiwg-mdtranslator (2.20.0.pre.beta.3)
+      adiwg-mdcodes (= 2.9.4.pre.beta.0)
+      adiwg-mdjson_schemas (= 2.9.3.pre.beta.0)
       builder (~> 3.2)
       coderay (~> 1.1)
       jbuilder (~> 2.5)
@@ -17,59 +17,69 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (5.2.8.1)
-      activesupport (= 5.2.8.1)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.8.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.8.5)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    adiwg-mdcodes (2.10.0)
+    adiwg-mdcodes (2.9.4.pre.beta.0)
       json (~> 2.0)
-    adiwg-mdjson_schemas (2.9.5)
+    adiwg-mdjson_schemas (2.9.3.pre.beta.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     crass (1.0.6)
+    drb (2.2.1)
     erubi (1.12.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.11.5)
+    jbuilder (2.12.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    json (2.6.3)
+    json (2.7.2)
     json-schema (2.8.1)
       addressable (>= 2.4)
     kramdown (2.4.0)
       rexml
-    loofah (2.21.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     minitest (5.20.0)
-    nokogiri (1.15.5-arm64-darwin)
+    mutex_m (0.2.0)
+    nokogiri (1.15.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-linux)
+    nokogiri (1.15.6-x86_64-linux)
       racc (~> 1.4)
-    public_suffix (4.0.7)
+    public_suffix (5.0.5)
     racc (1.7.3)
-    rails-dom-testing (2.1.1)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rake (13.1.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uuidtools (2.2.0)
 
 PLATFORMS

data/README.md

@@ -23,6 +23,27 @@ Or install it yourself as:
 
     $ mdtranslator help translate
 
+## Development
+
+### Requirements
+
+Requires
+- [Ruby](https://www.ruby-lang.org/en/documentation/installation/)
+- bundler (`gem install bundler`)
+- rake (`gem install rake`)
+
+### Tests
+
+In order to run the tests, first install the dependencies
+
+    $ bundle install
+
+Then, run the rake command
+
+    $ bundle exec rake
+
+_TODO: There are currently 4 tests that are not passing, related to mdJSON readers and writers_
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/mdTranslator/fork )

data/Rakefile

@@ -23,6 +23,7 @@ Rake::TestTask.new do |t|
       'test/writers/iso19115-3/tc*.rb',
       'test/writers/mdJson/tc*.rb',
       'test/writers/sbJson/tc*.rb',
+      'test/writers/dcat_us/tc*.rb',
       'test/translator/tc*.rb'
    ]
    t.verbose = true

data/adiwg-mdtranslator.gemspec

@@ -34,8 +34,8 @@ Gem::Specification.new do |spec|
    spec.add_runtime_dependency "thor", "~> 0.19"
    spec.add_runtime_dependency "uuidtools", "~> 2.1"
    spec.add_runtime_dependency "json-schema", "~> 2.7"
-   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.9.5"
-   spec.add_runtime_dependency "adiwg-mdcodes", "2.10.0"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.9.3.pre.beta.0"
+   spec.add_runtime_dependency "adiwg-mdcodes", "2.9.4.pre.beta.0"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", ">= 1.13", "< 3.0"
    spec.add_runtime_dependency "coderay", "~> 1.1"

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_dataQuality.rb

@@ -28,41 +28,24 @@ module ADIWG
 
                   # data quality 2.1 (attracc) - attribute accuracy
                   xAccuracy = xDataQual.xpath('./attracc')
-                  unless xAccuracy.empty?
-                     # data quality 2.1.1 (attraccr) - Attribute Accuracy Report
-                     xAccuracyReport = xAccuracy.xpath('./attraccr')
-                     unless xAccuracyReport.empty?
-                        report = intMetadataClass.newDataQualityReport
-                        report[:type] = 'DQ_NonQuantitativeAttributeCorrectness'
-                        descriptiveResult = intMetadataClass.newDescriptiveResult
-                        descriptiveResult[:name] = 'Attribute Accuracy Report'
-                        descriptiveResult[:statement] = xAccuracyReport.text
-                        report[:descriptiveResult] << descriptiveResult
-                        hDataQuality[:report] << report
-                     end
-                     # data quality 2.1.2 (qattracc) - Quantitative Attribute Accuracy Assessment
-                     xQuantitativeAccuracy = xAccuracy.xpath('./qattracc')
-                     unless xQuantitativeAccuracy.empty?
-                        report = intMetadataClass.newDataQualityReport
-                        report[:type] = 'DQ_QuantitativeAttributeAccuracy'
-                        # data quality 2.1.2.1 (attraccv) - Attribute Accuracy Value
-                        xQuantitativeAccuracyValue = xQuantitativeAccuracy.xpath('./attraccv')
-                        unless xQuantitativeAccuracyValue.empty?
-                           quantitativeResult = intMetadataClass.newQuantitativeResult
-                           quantitativeResult[:name] = 'Attribute Accuracy Value'
-                           quantitativeResult[:values] << xQuantitativeAccuracyValue.text
-                           report[:quantitativeResult] << quantitativeResult
-                        end
-                        # data quality 2.1.2.2 (attracce) - Attribute Accuracy Explanation
-                        xEvaluationMethod = xQuantitativeAccuracy.xpath('./attracce')
-                        unless xEvaluationMethod.empty?
-                           evaluationMethod = intMetadataClass.newEvaluationMethod
-                           evaluationMethod[:name] = 'Attribute Accuracy Explanation'
-                           evaluationMethod[:methodDescription] = xEvaluationMethod.text
-                           report[:evaluationMethod] << evaluationMethod
-                        end
-                        hDataQuality[:report] << report unless report[:quantitativeResult].empty? && report[:evaluationMethod].empty?
-                     end
+                  accuracyReport = xAccuracy.xpath('./attraccr').text
+                  report = intMetadataClass.newDataQualityReport
+                  report[:type] = 'NonQuantitativeAttributeCorrectness'
+                  descriptiveResult = intMetadataClass.newDescriptiveResult
+                  descriptiveResult[:statement] = accuracyReport
+                  report[:descriptiveResult] << descriptiveResult
+                  hDataQuality[:report] << report
+
+                  # data quality 2.1 (qattracc) - Quantitative Attribute Accuracy Assessment
+                  xQuantitativeAccuracy = xDataQual.xpath('./qattracc')
+                  unless xQuantitativeAccuracy.xpath('./attraccv').empty?
+                     value = xQuantitativeAccuracy.xpath('./attraccv').text
+                     report = intMetadataClass.newDataQualityReport
+                     report[:type] = 'QuantitativeAttributeAccuracy'
+                     quantitativeResult = intMetadataClass.newQuantitativeResult
+                     quantitativeResult[:values] << value
+                     report[:quantitativeResult] << quantitativeResult
+                     hDataQuality[:report] << report
                   end
 
                   # data quality 2.2 (logic) - logical consistency (required) (not implemented)
@@ -72,11 +55,9 @@ module ADIWG
                   else
                      logic = xLogic.text
                      report = intMetadataClass.newDataQualityReport
-                     report[:type] = 'DQ_ConceptualConsistency'
-                     descriptiveResult = intMetadataClass.newDescriptiveResult
-                     descriptiveResult[:name] = 'Logical Consistency Report'
-                     descriptiveResult[:statement] = logic
-                     report[:descriptiveResult] << descriptiveResult
+                     report[:type] = 'ConceptualConsistency'
+                     report[:qualityMeasure] = intMetadataClass.newQualityMeasure
+                     report[:qualityMeasure][:description] = logic
                      hDataQuality[:report] << report
                   end
 
@@ -87,74 +68,59 @@ module ADIWG
                   else
                      complete = xComplete.text
                      report = intMetadataClass.newDataQualityReport
-                     report[:type] = 'DQ_CompletenessOmission'
+                     report[:type] = 'Omission'
                      descriptiveResult = intMetadataClass.newDescriptiveResult
-                     descriptiveResult[:name] = 'Completeness Report'
                      descriptiveResult[:statement] = complete
                      report[:descriptiveResult] << descriptiveResult
                      hDataQuality[:report] << report
                   end
 
-                  # data quality 2.4 (posacc) - Positional Accuracy
+                  # data quality 2.4 (position) - positional accuracy
                   xPositionalAccuracy = xDataQual.xpath('./posacc')
                   unless xPositionalAccuracy.empty?
-                     # data quality 2.4.1 (horizpa) - Horizontal Positional Accuracy
-                     xHorizontalAccuracy = xPositionalAccuracy.xpath('./horizpa')
-                     unless xHorizontalAccuracy.empty?
+                     # horizontal positional accuracy
+                     xHorizontal = xPositionalAccuracy.xpath('./horizpa')
+                     unless xHorizontal.empty?
                         report = intMetadataClass.newDataQualityReport
-                        report[:type] = 'DQ_AbsoluteExternalPositionalAccuracy'
-                        # Combine Horizontal Positional Accuracy Report and Explanation
-                        descriptive_result_text = ''
-                        xHorizontalAccuracyReport = xHorizontalAccuracy.xpath('./horizpar')
-                        unless xHorizontalAccuracyReport.empty?
-                           descriptive_result_text += xHorizontalAccuracyReport.text
+                        report[:type] = 'AbsoluteExternalPositionalAccuracy'
+                        unless xHorizontal.xpath('qhorizpa/horizpae').empty?
+                           report[:qualityMeasure] = intMetadataClass.newQualityMeasure
+                           report[:qualityMeasure][:description] = xHorizontal.xpath('qhorizpa/horizpae').text
+                           name = 'Horizontal Positional Accuracy Report'
+                           report[:qualityMeasure][:nameOfMeasure] << name
                         end
-                        xQuantitativeHorizontalAccuracy = xHorizontalAccuracy.xpath('./qhorizpa')
-                        unless xQuantitativeHorizontalAccuracy.empty?
-                           xHorizontalAccuracyValue = xQuantitativeHorizontalAccuracy.xpath('horizpav')
-                           unless xHorizontalAccuracyValue.empty?
-                              descriptive_result_text += " Value: #{xHorizontalAccuracyValue.text}"
-                           end
-                           xHorizontalAccuracyExplanation = xQuantitativeHorizontalAccuracy.xpath('horizpae')
-                           unless xHorizontalAccuracyExplanation.empty?
-                              descriptive_result_text += " Explanation: #{xHorizontalAccuracyExplanation.text}"
-                           end
+                        unless xHorizontal.xpath('horizpar').empty?
+                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
+                           report[:evaluationMethod][:methodDescription] = xHorizontal.xpath('horizpar').text
                         end
-                        unless descriptive_result_text.empty?
-                           descriptiveResult = intMetadataClass.newDescriptiveResult
-                           descriptiveResult[:name] = 'Horizontal Positional Accuracy Report'
-                           descriptiveResult[:statement] = descriptive_result_text
-                           report[:descriptiveResult] << descriptiveResult
+                        unless xHorizontal.xpath('qhorizpa/horizpav').empty?
+                           quantitativeResult = intMetadataClass.newQuantitativeResult
+                           value = xHorizontal.xpath('qhorizpa/horizpav').text
+                           quantitativeResult[:values] << value
+                           report[:quantitativeResult] << quantitativeResult
                         end
                         hDataQuality[:report] << report
                      end
-                     # data quality 2.4.2 (vertacc) - Vertical Positional Accuracy
-                     xVerticalAccuracy = xPositionalAccuracy.xpath('./vertacc')
-                     unless xVerticalAccuracy.empty?
+                     # vertical positional accuracy
+                     xVertical = xPositionalAccuracy.xpath('./vertacc')
+                     unless xVertical.empty?
                         report = intMetadataClass.newDataQualityReport
-                        report[:type] = 'DQ_AbsoluteExternalPositionalAccuracy'
-                        # Combine Vertical Positional Accuracy Report and Explanation
-                        descriptive_result_text = ''
-                        xVerticalAccuracyReport = xVerticalAccuracy.xpath('./vertaccr')
-                        unless xVerticalAccuracyReport.empty?
-                           descriptive_result_text += xVerticalAccuracyReport.text
+                        report[:type] = 'AbsoluteExternalPositionalAccuracy'
+                        unless xVertical.xpath('qvertpa/vertacce').empty?
+                           report[:qualityMeasure] = intMetadataClass.newQualityMeasure
+                           report[:qualityMeasure][:description] = xVertical.xpath('qvertpa/vertacce').text
+                           name = 'Vertical Positional Accuracy Report'
+                           report[:qualityMeasure][:nameOfMeasure] << name
                         end
-                        xVerticalAccuracyAssessment = xVerticalAccuracy.xpath('./qvertpa')
-                        unless xVerticalAccuracyAssessment.empty?
-                           xVerticalAccuracyValue = xVerticalAccuracyAssessment.xpath('vertaccv')
-                           unless xVerticalAccuracyValue.empty?
-                              descriptive_result_text += " Value: #{xVerticalAccuracyValue.text}"
-                           end
-                           xVerticalAccuracyExplanation = xVerticalAccuracyAssessment.xpath('vertacce')
-                           unless xVerticalAccuracyExplanation.empty?
-                              descriptive_result_text += " Explanation: #{xVerticalAccuracyExplanation.text}"
-                           end
+                        unless xVertical.xpath('vertaccr').empty?
+                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
+                           report[:evaluationMethod][:methodDescription] = xVertical.xpath('vertaccr').text
                         end
-                        unless descriptive_result_text.empty?
-                           descriptiveResult = intMetadataClass.newDescriptiveResult
-                           descriptiveResult[:name] = 'Vertical Positional Accuracy Report'
-                           descriptiveResult[:statement] = descriptive_result_text
-                           report[:descriptiveResult] << descriptiveResult
+                        unless xVertical.xpath('qvertpa/vertaccv').empty?
+                           quantitativeResult = intMetadataClass.newQuantitativeResult
+                           value = xVertical.xpath('qvertpa/vertaccv').text
+                           quantitativeResult[:values] << value
+                           report[:quantitativeResult] << quantitativeResult
                         end
                         hDataQuality[:report] << report
                      end
@@ -180,4 +146,4 @@ module ADIWG
          end
       end
    end
-end
+end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_conformanceResult.rb

@@ -23,11 +23,6 @@ module ADIWG
               intConformanceResult[:scope] = Scope.unpack(hConformanceResult['scope'], responseObj)
             end
 
-            # name
-            if hConformanceResult.has_key?('name')
-              intConformanceResult[:name] = hConformanceResult['name']
-            end
-
             #specification
             if hConformanceResult.has_key?('specification')
               intConformanceResult[:specification] = Citation.unpack(hConformanceResult['specification'], responseObj)

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_coverageResult.rb

@@ -26,10 +26,6 @@ module ADIWG
               intResult[:scope] = Scope.unpack(hResult['scope'], responseObj)
             end
 
-            # name
-            if hResult.has_key?('name')
-              intResult[:name] = hResult['name']
-            end
 
             # spatialRepresentationType
             if hResult.has_key?('spatialRepresentationType')

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_dataQuality.rb

@@ -35,13 +35,6 @@ module ADIWG
               end
             end
 
-            if hDataQuality.has_key?('systemIdentifier')
-              systemIdentifier = hDataQuality['systemIdentifier']
-              intDataQuality[:systemIdentifier] = {}
-              intDataQuality[:systemIdentifier][:uid] = systemIdentifier['uid']
-              intDataQuality[:systemIdentifier][:label] = systemIdentifier['label']
-            end
-
             if hDataQuality.has_key?('standaloneQualityReport')
               hObject = hDataQuality['standaloneQualityReport']
               unless hObject.empty?

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_descriptiveResult.rb

@@ -25,10 +25,6 @@ module ADIWG
               intResult[:scope] = Scope.unpack(hResult['scope'], responseObj)
             end
 
-            if hResult.has_key?('name')
-              intResult[:name] = hResult['name']
-            end
-
             if hResult.has_key?('statement')
               intResult[:statement] = hResult['statement']
             end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_quantitativeResult.rb

@@ -25,10 +25,6 @@ module ADIWG
               intResult[:scope] = Scope.unpack(hResult['scope'], responseObj)
             end
 
-            if hResult.has_key?('name')
-              intResult[:name] = hResult['name']
-            end
-
             if hResult.has_key?('value')
               intResult[:values] = hResult['value']
             end

data/lib/adiwg/mdtranslator/version.rb

@@ -109,7 +109,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.19.0-beta.31"
+      VERSION = "2.20.0-beta.3"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/dcat_us/dcat_us_writer.rb

@@ -0,0 +1,98 @@
+require 'jbuilder'
+require_relative 'version'
+require_relative 'sections/dcat_us_dcat_us'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Dcat_us
+
+            def self.startWriter(intObj, responseObj)
+               # set the contact array for use by the writer
+               @contacts = intObj[:contacts]
+
+               # set output flag for null properties
+               Jbuilder.ignore_nil(!responseObj[:writerShowTags])
+
+               # set the format of the output file based on the writer specified
+               responseObj[:writerOutputFormat] = 'json'
+               responseObj[:writerVersion] = ADIWG::Mdtranslator::Writers::Dcat_us::VERSION
+
+               # write the dcat_us metadata record
+               metadata = Dcat_us.build(intObj, responseObj)
+
+               # set writer pass to true if no messages
+               # false or warning state will be set by writer code
+               responseObj[:writerPass] = true if responseObj[:writerMessages].empty?
+
+               # encode the metadata target as JSON
+               metadata.target!
+            end
+
+            # find contact in contact array and return the contact hash
+            def self.get_contact_by_index(contactIndex)
+               if @contacts[contactIndex]
+                  return @contacts[contactIndex]
+               end
+               {}
+            end
+
+            # find contact in contact array and return the contact hash
+            def self.get_contact_by_id(contactId)
+               @contacts.each do |hContact|
+                  if hContact[:contactId] == contactId
+                     return hContact
+                  end
+               end
+               {}
+            end
+
+            # find contact in contact array and return the contact index
+            def self.get_contact_index_by_id(contactId)
+               @contacts.each_with_index do |hContact, index|
+                  if hContact[:contactId] == contactId
+                     return index
+                  end
+               end
+               {}
+            end
+
+            # ignore jBuilder object mapping when array is empty
+            def self.json_map(collection = [], _class)
+               if collection.nil? || collection.empty?
+                  return nil
+               else
+                  collection.map { |item| _class.build(item).attributes! }
+               end
+            end
+
+            # find all nested objects in 'obj' that contain the element 'ele'
+            def self.nested_objs_by_element(obj, ele, excludeList = [])
+               aCollected = []
+               obj.each do |key, value|
+                  skipThisOne = false
+                  excludeList.each do |exclude|
+                     if key == exclude.to_sym
+                        skipThisOne = true
+                     end
+                  end
+                  next if skipThisOne
+                  if key == ele.to_sym
+                     aCollected << obj
+                  elsif obj.is_a?(Array)
+                     if key.respond_to?(:each)
+                        aReturn = nested_objs_by_element(key, ele, excludeList)
+                        aCollected = aCollected.concat(aReturn) unless aReturn.empty?
+                     end
+                  elsif obj[key].respond_to?(:each)
+                     aReturn = nested_objs_by_element(value, ele, excludeList)
+                     aCollected = aCollected.concat(aReturn) unless aReturn.empty?
+                  end
+               end
+               aCollected
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/dcat_us/readme.md

@@ -0,0 +1,10 @@
+
+## dcat_us
+
+### Supported versions
+
+> 0.0.x (dcat_us is not currently versioned)
+
+### Writer for Data Catalog Vocabulary (DCAT) v1.1
+
+