adiwg-mdtranslator 2.0.0rc5 → 2.0.0rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecd5337a8dfd9f2c62c7e449e2e480fd0308c806
-  data.tar.gz: 1e0c2971909fdc056bbb4bda02c9419afc0a7e45
+  metadata.gz: 63347888ab794a1ee8a6def46c8dbf979c55ee47
+  data.tar.gz: bbe3e51b5cfedd30c354d31277f9e4c98b477d3d
 SHA512:
-  metadata.gz: 936f7f46d97de59dbc0a48ac3056d33913f813ea27a40a68ceff0b2bb25847a41bd2530f94a6a0b6b84bfed11836e4061aa0e32b6bc8cb449b87a3b7f707f353
-  data.tar.gz: f3efa41bd0e71fbc46d85084ae675cee4d20b643a4d1452facf4f9a7d7bf7aadd01f3c6c60da44898b8f1b783e7730ca1e5532e240e06107e6b93b0b4290e2c9
+  metadata.gz: 289cf433acd5d2c3fb71f6e010d2bab975ad3b6c85b57ddf54b1b44a6bcbfac21491272f34569642090e5f50c4ba6f8676a661caa753b10771bfb5e3b5af1d89
+  data.tar.gz: 2110820a54149d78f9a244de1d927090111f1408366e961b9ff8b7535eed597f189adf2ce77c481dbe810bdc123079506db49f99112951eea6da6240b1487744

data/lib/adiwg/mdtranslator/internal/module_coordinates.rb

@@ -1,171 +1,197 @@
 # repack coordinates
 
 # History:
-#   Stan Smith 2016-11-10 added computedBbox computation
-#   Stan Smith 2015-07-16 moved module_coordinates from mdJson reader to internal
-#   Stan Smith 2015-07-14 refactored to remove global namespace constants
-#   Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
-#   Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
-#   Stan Smith 2014-05-23 added getLevels
+#  Stan Smith 2017-05-24 added checkGeometry method to move objects to real world
+#  Stan Smith 2016-11-10 added computedBbox computation
+#  Stan Smith 2015-07-16 moved module_coordinates from mdJson reader to internal
+#  Stan Smith 2015-07-14 refactored to remove global namespace constants
+#  Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
+#  Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
+#  Stan Smith 2014-05-23 added getLevels
 # 	Stan Smith 2013-11-13 added getDimension
 # 	Stan Smith 2013-11-07 original script
 
 module AdiwgCoordinates
 
-    # repack coordinate array into single string for ISO
-    def self.stringifyCoords(aCoords, responseObj)
-
-        s = ''
-        i = 0
-        coordCount = aCoords.length
-        aCoords.each do |coord|
-            if coord.kind_of?(Array)
-                s = s + unpack(coord, responseObj)
-            else
-                i += 1
-                s = s + coord.to_s
-                if i < coordCount
-                    s = s + ','
-                end
-                s = s + ' '
+   # repack coordinate array into single string for ISO
+   def self.stringifyCoords(aCoords, responseObj)
+
+      s = ''
+      i = 0
+      coordCount = aCoords.length
+      aCoords.each do |coord|
+         if coord.kind_of?(Array)
+            s = s + unpack(coord, responseObj)
+         else
+            i += 1
+            s = s + coord.to_s
+            if i < coordCount
+               s = s + ','
             end
-        end
-
-        return s
-
-    end
-
-    # get the number of dimensions in a coordinate array
-    def self.getDimension(aCoords)
-
-        if aCoords[0].kind_of?(Array)
-            coordDim = getDimension(aCoords[0])
-        else
-            coordDim = aCoords.length
-        end
-
-        return coordDim
-
-    end
-
-    # get the number of levels in the coordinate array
-    def self.getLevels(aCoords)
-
-        i = 1
-        if aCoords[0].kind_of?(Array)
-            i = i + getLevels(aCoords[0])
-        end
-        return i
-
-    end
-
-    # compute bounding box
-    def self.computeBbox(aGeo)
-
-        # find all the eastings (x) and northings (y) in the GeoJSON object
-        aNorthings = []
-        aEastings = []
-        aGeo.each do |hGeo|
-            unpackGeometry(hGeo, aNorthings, aEastings)
-        end
-
-        # find most north/south points
-        north = aNorthings.max
-        south = aNorthings.min
-
-        # find most east/west spanning the meridian
-        eastM = aEastings.max
-        westM = aEastings.min
-
-        # find most east/west spanning the anti-meridian
-        positiveEast = []
-        negativeEast = []
-        aEastings.each do |east|
-            negativeEast << east if east < 0.0
-            positiveEast << east if east >= 0.0
-        end
-        eastAM = negativeEast.max
-        westAM = positiveEast.min
-
-        # if eastings are all positive or all negative no meridian was spanned
-        if positiveEast.empty? || negativeEast.empty?
+            s = s + ' '
+         end
+      end
+
+      return s
+
+   end
+
+   # get the number of dimensions in a coordinate array
+   def self.getDimension(aCoords)
+
+      if aCoords[0].kind_of?(Array)
+         coordDim = getDimension(aCoords[0])
+      else
+         coordDim = aCoords.length
+      end
+
+      return coordDim
+
+   end
+
+   # get the number of levels in the coordinate array
+   def self.getLevels(aCoords)
+
+      i = 1
+      if aCoords[0].kind_of?(Array)
+         i = i + getLevels(aCoords[0])
+      end
+      return i
+
+   end
+
+   # compute bounding box
+   def self.computeBbox(aGeo)
+
+      # find all the eastings (x) and northings (y) in the GeoJSON object
+      aNorthings = []
+      aEastings = []
+      aGeo.each do |hGeo|
+         unpackGeometry(hGeo, aNorthings, aEastings)
+      end
+
+      # find most north/south points
+      north = aNorthings.max
+      south = aNorthings.min
+
+      # find most east/west spanning the meridian
+      eastM = aEastings.max
+      westM = aEastings.min
+
+      # find most east/west spanning the anti-meridian
+      aPositiveEast = []
+      aNegativeEast = []
+      aEastings.each do |east|
+         aNegativeEast << east if east < 0.0
+         aPositiveEast << east if east >= 0.0
+      end
+      aNegativeEast.uniq!
+      aPositiveEast.uniq!
+
+      eastAM = aNegativeEast.max
+      westAM = aPositiveEast.min
+
+      # if eastings are all positive or all negative hemisphere is decided
+      if aPositiveEast.empty? || aNegativeEast.empty?
+         east = eastM
+         west = westM
+      else
+         # choose which meridian to span based on smaller edge-to-edge distance
+         distanceM = eastM - westM
+         distanceAM = (180 + eastAM) + (180 - westAM)
+         if distanceM.abs <= distanceAM.abs
+            # this spanned to  meridian
             east = eastM
             west = westM
-        else
-            # choose which meridian was spanned based on smaller edge-to-edge distance
-            distanceM = eastM - westM
-            distanceAM = (180 + eastAM) + (180 - westAM)
-            if distanceM <= distanceAM
-                # this spanned to  meridian
-                east = eastM
-                west = westM
-            else
-                # this spanned tne anti-meridian
-                east = eastAM
-                west = westAM
-            end
-        end
-
-        bBox = {}
-        bBox[:westLongitude] = west
-        bBox[:eastLongitude] = east
-        bBox[:southLatitude] = south
-        bBox[:northLatitude] = north
-
-        return bBox
-
-    end
-
-    # compute bounding box
-    def self.unpackGeometry(hGeo, aNorthings, aEastings)
-
-        # geometry objects
-        type = hGeo[:type]
-        if %w{ Point LineString Polygon MultiPoint MultiLineString MultiPolygon }.one? { |word| word == type }
-            unpackCoords(hGeo[:coordinates], aNorthings, aEastings)
-        end
-
-        # geometry collections
-        if hGeo[:type] == 'GeometryCollection'
-            hGeo[:geometryObjects].each do |aGeoObj|
-                unpackCoords(aGeoObj[:coordinates], aNorthings, aEastings)
-            end
-        end
-
-        # features
-        if hGeo[:type] == 'Feature'
-            featureType = hGeo[:geometryObject][:type]
-            if featureType == 'GeometryCollection'
-                unpackGeometry(hGeo[:geometryObject], aNorthings, aEastings)
-            else
-                unpackCoords(hGeo[:geometryObject][:coordinates], aNorthings, aEastings)
-            end
-        end
-
-        # feature collections
-        if hGeo[:type] == 'FeatureCollection'
-            hGeo[:features].each do |hFeature|
-                unpackGeometry(hFeature, aNorthings, aEastings)
-            end
-        end
-
-    end
-
-    # compute bounding box
-    def self.unpackCoords(aCoords, aNorthings, aEastings)
-        if aCoords[0].kind_of?(Array)
-            aCoords.each do |aTuple|
-                unpackCoords(aTuple, aNorthings, aEastings)
-            end
-        else
-            addPoint(aCoords, aNorthings, aEastings)
-        end
-    end
-
-    # compute bounding box
-    def self.addPoint(aPoint, aNorthings, aEastings)
-        aEastings << aPoint[0]
-        aNorthings << aPoint[1]
-    end
+         else
+            # this spanned tne anti-meridian
+            east = eastAM
+            west = westAM
+         end
+      end
+
+      bBox = {}
+      bBox[:westLongitude] = west
+      bBox[:eastLongitude] = east
+      bBox[:southLatitude] = south
+      bBox[:northLatitude] = north
+
+      return bBox
+
+   end
+
+   # compute bounding box
+   def self.unpackGeometry(hGeo, aNorthings, aEastings)
+
+      # geometry objects
+      type = hGeo[:type]
+      if %w{ Point LineString Polygon MultiPoint MultiLineString MultiPolygon }.one? {|word| word == type}
+         checkGeometry(hGeo[:coordinates], aNorthings, aEastings)
+      end
+
+      # geometry collections
+      if hGeo[:type] == 'GeometryCollection'
+         hGeo[:geometryObjects].each do |aGeoObj|
+            checkGeometry(aGeoObj[:coordinates], aNorthings, aEastings)
+         end
+      end
+
+      # features
+      if hGeo[:type] == 'Feature'
+         featureType = hGeo[:geometryObject][:type]
+         if featureType == 'GeometryCollection'
+            unpackGeometry(hGeo[:geometryObject], aNorthings, aEastings)
+         else
+            checkGeometry(hGeo[:geometryObject][:coordinates], aNorthings, aEastings)
+         end
+      end
+
+      # feature collections
+      if hGeo[:type] == 'FeatureCollection'
+         hGeo[:features].each do |hFeature|
+            unpackGeometry(hFeature, aNorthings, aEastings)
+         end
+      end
+
+   end
+
+   # move geometry to real world if necessary
+   def self.checkGeometry(aCoords, aNorthings, aEastings)
+
+      aGeoNorthings = []
+      aGeoEastings = []
+
+      unpackCoords(aCoords, aGeoNorthings, aGeoEastings)
+
+      minEast = aGeoEastings.min
+      maxEast = aGeoEastings.max
+      if maxEast < -180
+         aGeoEastings.collect! { |x| x + 360 }
+      end
+      if minEast > 180
+         aGeoEastings.collect! { |x| x - 360 }
+      end
+
+      aEastings.concat(aGeoEastings)
+      aNorthings.concat(aGeoNorthings)
+
+   end
+
+   # unpack coordinate arrays
+   def self.unpackCoords(aCoords, aNorthings, aEastings)
+      if aCoords[0].kind_of?(Array)
+         aCoords.each do |aTuple|
+            unpackCoords(aTuple, aNorthings, aEastings)
+         end
+      else
+         addPoint(aCoords, aNorthings, aEastings)
+      end
+   end
+
+   # add to tuple to an array
+   def self.addPoint(aPoint, aNorthings, aEastings)
+      aEastings << aPoint[0]
+      aNorthings << aPoint[1]
+   end
 
 end

data/lib/adiwg/mdtranslator/internal/module_dateTimeFun.rb

@@ -140,4 +140,23 @@ module AdiwgDateTimeFun
         return sDuration
     end
 
+   def self.stringFromDateObject(obj)
+
+      date = obj[:date]
+      if date.nil?
+         date = obj[:dateTime]
+      end
+      dateRes = obj[:dateResolution]
+      unless date.nil?
+         case dateRes
+            when 'Y', 'YM', 'YMD'
+               dateStr = stringDateFromDateTime(date, dateRes)
+            else
+               dateStr = stringDateTimeFromDateTime(date, dateRes)
+         end
+      end
+
+      return dateStr
+   end
+
 end

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,8 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.0.0rc6 2017-05-24 move geometries to real world if in -1 or +1 world
+#                 --- removed special characters from ids for gml:id= in iso writers
 # 2.0.0rc5 2017-05-20 Fixed bug with no writer provided
 # 2.0.0rc4 2017-05-19 bump mdJson schema version to 2.1.2
 # 2.0.0rc3 2017-05-16 removed topicCategory from schema and manage as keyword
@@ -11,7 +13,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.0.0rc5"
+      VERSION = "2.0.0rc6"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/html/sections/html_resourceType.rb

@@ -2,6 +2,7 @@
 # resource type
 
 # History:
+#  Stan Smith 2017-05-24 Fixed problem with nil name
 # 	Stan Smith 2015-03-25 original script
 
 module ADIWG
@@ -19,7 +20,11 @@ module ADIWG
 
                   # resource type
                   @html.em('Resource Type: ')
-                  @html.text!(hType[:type] + ' - ' + hType[:name])
+                  @html.text!(hType[:type])
+                  unless hType[:name].nil?
+                     @html.em(' Name: ')
+                     @html.text!(hType[:name])
+                  end
                   @html.br
 
                end # writeHtml

data/lib/adiwg/mdtranslator/writers/iso19110/classes/class_featureType.rb

@@ -36,6 +36,8 @@ module ADIWG
                         if entityId.nil?
                             @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
                             entityId = 'entity' + @hResponseObj[:writerMissingIdCount]
+                        else
+                            entityId.gsub!(/[^0-9a-zA-Z]/,'')
                         end
 
                         @xml.tag!('gfc:FC_FeatureType', {'id' => entityId}) do

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_gcoDateTime.rb

@@ -5,44 +5,44 @@
 # 	Stan Smith 2017-02-10 original script
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
-
-                class GcoDateTime
-
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
-
-                    def writeXML(hDate)
-
-                        date = hDate[:date]
-                        dateRes = hDate[:dateResolution]
-
-                        # date - date (required)
-                        unless date.nil?
-                            case dateRes
-                                when 'Y', 'YM', 'YMD'
-                                    dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, dateRes)
-                                    @xml.tag!('gco:Date', dateStr)
-                                when 'YMDh', 'YMDhm', 'YMDhms'
-                                    dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, 'YMDhms')
-                                    @xml.tag!('gco:DateTime', dateStr)
-                                when 'YMDhZ', 'YMDhmZ', 'YMDhmsZ'
-                                    dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, 'YMDhmsZ')
-                                    @xml.tag!('gco:DateTime', dateStr)
-                                else
-                                    dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, dateRes)
-                                    @xml.tag!('gco:DateTime', dateStr)
-                            end
-                        end
-
-                    end # write XML
-                end # Date class
-
-            end
-        end
-    end
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
+
+            class GcoDateTime
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hDate)
+
+                  date = hDate[:date]
+                  dateRes = hDate[:dateResolution]
+
+                  # date - date (required)
+                  unless date.nil?
+                     case dateRes
+                        when 'Y', 'YM', 'YMD'
+                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, dateRes)
+                           @xml.tag!('gco:Date', dateStr)
+                        when 'YMDh', 'YMDhm', 'YMDhms'
+                           dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, 'YMDhms')
+                           @xml.tag!('gco:DateTime', dateStr)
+                        when 'YMDhZ', 'YMDhmZ', 'YMDhmsZ'
+                           dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, 'YMDhmsZ')
+                           @xml.tag!('gco:DateTime', dateStr)
+                        else
+                           dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, dateRes)
+                           @xml.tag!('gco:DateTime', dateStr)
+                     end
+                  end
+
+               end # write XML
+            end # Date class
+
+         end
+      end
+   end
 end

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_geometryCollection.rb

@@ -42,6 +42,8 @@ module ADIWG
                         if objId.nil?
                             @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
                             objId = 'geometryCollection' + @hResponseObj[:writerMissingIdCount]
+                        else
+                            objId.gsub!(/[^0-9a-zA-Z]/,'')
                         end
                         attributes['gml:id'] = objId
 

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_lineString.rb

@@ -39,6 +39,8 @@ module ADIWG
                         if lineId.nil?
                             @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
                             lineId = 'line' + @hResponseObj[:writerMissingIdCount]
+                        else
+                            lineId.gsub!(/[^0-9a-zA-Z]/,'')
                         end
                         attributes['gml:id'] = lineId
 

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_multiLine.rb

@@ -35,6 +35,8 @@ module ADIWG
                         if objId.nil?
                             @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
                             objId = 'multiLine' + @hResponseObj[:writerMissingIdCount]
+                        else
+                            objId.gsub!(/[^0-9a-zA-Z]/,'')
                         end
                         attributes['gml:id'] = objId
 

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_multiPoint.rb

@@ -35,6 +35,8 @@ module ADIWG
                         if objId.nil?
                             @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
                             objId = 'multiPoint' + @hResponseObj[:writerMissingIdCount]
+                        else
+                            objId.gsub!(/[^0-9a-zA-Z]/,'')
                         end
                         attributes['gml:id'] = objId
 

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_multiPolygon.rb

@@ -35,6 +35,8 @@ module ADIWG
                         if objId.nil?
                             @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
                             objId = 'multiPolygon' + @hResponseObj[:writerMissingIdCount]
+                        else
+                            objId.gsub!(/[^0-9a-zA-Z]/,'')
                         end
                         attributes['gml:id'] = objId
 

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_point.rb

@@ -16,68 +16,70 @@ require 'adiwg/mdtranslator/internal/module_coordinates'
 require_relative 'class_featureProperties'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
-
-                class Point
-
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
-
-                    def writeXML(hGeoObject, hProperties, objId)
-
-                        # classes used
-                        geoPropClass = FeatureProperties.new(@xml, @hResponseObj)
-
-                        # Point attributes
-                        attributes = {}
-
-                        # Point attributes - gml:id (required)
-                        if objId.nil?
-                            @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
-                            objId = 'point' + @hResponseObj[:writerMissingIdCount]
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
+
+            class Point
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hGeoObject, hProperties, objId)
+
+                  # classes used
+                  geoPropClass = FeatureProperties.new(@xml, @hResponseObj)
+
+                  # Point attributes
+                  attributes = {}
+
+                  # Point attributes - gml:id (required)
+                  if objId.nil?
+                     @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
+                     objId = 'point' + @hResponseObj[:writerMissingIdCount]
+                  else
+                     objId.gsub!(/[^0-9a-zA-Z]/,'')
+                  end
+                  attributes['gml:id'] = objId
+
+                  # Point attributes - srsDimension
+                  s = AdiwgCoordinates.getDimension(hGeoObject[:coordinates])
+                  if !s.nil?
+                     attributes[:srsDimension] = s
+                  end
+
+                  # Point attributes - srsName (GeoJSON is WGS84)
+                  attributes[:srsName] = 'WGS84'
+
+                  @xml.tag!('gml:Point', attributes) do
+
+                     # point - properties for Feature
+                     unless hProperties.empty?
+                        geoPropClass.writeXML(hProperties)
+                     end
+                     if hProperties.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gml:description')
+                        @xml.tag!('gml:identifier', {'codeSpace' => ''})
+                        @xml.tag!('gml:name')
+                     end
+
+                     # point - pos (required)
+                     s = ''
+                     unless hGeoObject[:coordinates].empty?
+                        hGeoObject[:coordinates].each do |coord|
+                           s += coord.to_s + ' '
                         end
-                        attributes['gml:id'] = objId
+                        s = s.strip
+                     end
+                     @xml.tag!('gml:pos', s)
 
-                        # Point attributes - srsDimension
-                        s = AdiwgCoordinates.getDimension(hGeoObject[:coordinates])
-                        if !s.nil?
-                            attributes[:srsDimension] = s
-                        end
+                  end # gml:Point tag
+               end # writeXML
+            end # Point class
 
-                        # Point attributes - srsName (GeoJSON is WGS84)
-                        attributes[:srsName] = 'WGS84'
-
-                        @xml.tag!('gml:Point', attributes) do
-
-                            # point - properties for Feature
-                            unless hProperties.empty?
-                                geoPropClass.writeXML(hProperties)
-                            end
-                            if hProperties.empty? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gml:description')
-                                @xml.tag!('gml:identifier', {'codeSpace'=>''})
-                                @xml.tag!('gml:name')
-                            end
-
-                            # point - pos (required)
-                            s = ''
-                            unless hGeoObject[:coordinates].empty?
-                                hGeoObject[:coordinates].each do |coord|
-                                    s += coord.to_s + ' '
-                                end
-                                s = s.strip
-                            end
-                            @xml.tag!('gml:pos', s)
-
-                        end # gml:Point tag
-                    end # writeXML
-                end # Point class
-
-            end
-        end
-    end
+         end
+      end
+   end
 end

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_polygon.rb

@@ -39,6 +39,8 @@ module ADIWG
                         if objId.nil?
                             @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
                             objId = 'polygon' + @hResponseObj[:writerMissingIdCount]
+                        else
+                            objId.gsub!(/[^0-9a-zA-Z]/,'')
                         end
                         attributes['gml:id'] = objId
 

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_timeInstant.rb

@@ -33,6 +33,8 @@ module ADIWG
                         if timeID.nil?
                             @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
                             timeID = 'timeInstant' + @hResponseObj[:writerMissingIdCount]
+                        else
+                            timeID.gsub!(/[^0-9a-zA-Z]/,'')
                         end
 
                         @xml.tag!('gml:TimeInstant', {'gml:id' => timeID}) do

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_timePeriod.rb

@@ -34,6 +34,8 @@ module ADIWG
                         if timeID.nil?
                             @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
                             timeID = 'timePeriod' + @hResponseObj[:writerMissingIdCount]
+                        else
+                            timeID.gsub!(/[^0-9a-zA-Z]/,'')
                         end
 
                         @xml.tag!('gml:TimePeriod', {'gml:id' => timeID}) do

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_date.rb

@@ -15,21 +15,8 @@ module ADIWG
 
                def self.build(hDate)
 
-                  date = hDate[:date]
-                  dateRes = hDate[:dateResolution]
-                  dateStr = ''
-
-                  unless date.nil?
-                     case dateRes
-                        when 'Y', 'YM', 'YMD'
-                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, dateRes)
-                        else
-                           dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, dateRes)
-                     end
-                  end
-
                   Jbuilder.new do |json|
-                     json.date(dateStr)
+                     json.date(AdiwgDateTimeFun.stringFromDateObject(hDate))
                      json.dateType hDate[:dateType]
                   end
 

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_dateTime.rb

@@ -14,20 +14,7 @@ module ADIWG
 
                def self.build(hDateTime)
 
-                  date = hDateTime[:dateTime]
-                  dateRes = hDateTime[:dateResolution]
-                  dateStr = ''
-
-                  unless date.nil?
-                     case dateRes
-                        when 'Y', 'YM', 'YMD'
-                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, dateRes)
-                        else
-                           dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, dateRes)
-                     end
-                  end
-
-                  return dateStr
+                  return AdiwgDateTimeFun.stringFromDateObject(hDateTime)
 
                end # build
             end # DateTime

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_citation.rb

@@ -18,40 +18,39 @@ module ADIWG
                def self.build(hCitation)
 
                   citation = ''
+                  role = ''
 
                   # names
-                  indexes = []
+                  aIndexes = []
                   hCitation[:responsibleParties].each do |hResponsibility|
+                     role = hResponsibility[:roleName]
                      hResponsibility[:parties].each do |hParty|
-                        indexes << hParty[:contactIndex]
+                        party = {}
+                        party[:role] = role
+                        party[:index] = hParty[:contactIndex]
+                        aIndexes << party
                         hParty[:organizationMembers].each do |hMember|
-                           indexes << hMember[:contactIndex]
+                           party = {}
+                           party[:role] = role
+                           party[:index] = hMember[:contactIndex]
+                           aIndexes << party
                         end
                      end
                   end
-                  indexes.uniq!
-                  indexes.each do |index|
-                     hContact = ADIWG::Mdtranslator::Writers::SbJson.getContact(index)
+                  aIndexes.uniq!
+                  aIndexes.each do |hIndex|
+                     hContact = ADIWG::Mdtranslator::Writers::SbJson.getContact(hIndex[:index])
                      unless hContact.empty?
                         unless hContact[:name].nil?
-                           citation += hContact[:name] + ', '
+                           citation += hContact[:name] + '(' + hIndex[:role] + '), '
                         end
                      end
                   end
 
                   # dates
                   hCitation[:dates].each do |hDate|
-                     date = hDate[:date]
-                     dateRes = hDate[:dateResolution]
-                     unless date.nil?
-                        case dateRes
-                           when 'Y', 'YM', 'YMD'
-                              dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, dateRes)
-                           else
-                              dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, dateRes)
-                        end
-                        citation += dateStr.to_s + '(' + hDate[:dateType] + '), '
-                     end
+                     dateStr = AdiwgDateTimeFun.stringFromDateObject(hDate)
+                     citation += dateStr + '(' + hDate[:dateType] + '), '
                   end
 
                   # title

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_provenance.rb

@@ -0,0 +1,39 @@
+# sbJson 1.0 writer
+
+# History:
+#  Stan Smith 2017-05-23 original script
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module SbJson
+
+            module Provenance
+
+               def self.build(hMetadataInfo)
+
+                  aContacts = hMetadataInfo[:metadataContacts]
+                  aDates = hMetadataInfo[:metadataDates]
+
+                  hProvenance = {}
+                  hProvenance[:dataSource] = 'generated using ADIwg mdTranslator ' + ADIWG::Mdtranslator::VERSION
+
+                  aDates.each do |hDate|
+                     if hDate[:dateType] == 'creation'
+                        hProvenance[:dateCreated] = AdiwgDateTimeFun.stringFromDateObject(hDate)
+                     end
+                     if hDate[:dateType] == 'lastUpdate'
+                        hProvenance[:lastUpdated] = AdiwgDateTimeFun.stringFromDateObject(hDate)
+                     end
+                  end
+
+                  hProvenance
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_rights.rb

@@ -0,0 +1,41 @@
+# sbJson 1.0 writer
+
+# History:
+#  Stan Smith 2017-05-22 original script
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module SbJson
+
+            module Rights
+
+               def self.build(aConstraints)
+
+                  rights = ''
+
+                  aConstraints.each do |hConstraint|
+                     if hConstraint[:type] = 'legal'
+                        unless hConstraint[:legalConstraint].empty?
+                           hConstraint[:legalConstraint][:otherCons].each do |con|
+                              rights += con + '; '
+                           end
+                        end
+                     end
+                  end
+
+                  # clean off last semicolon
+                  if rights.length > 2
+                     rights = rights[0...-2]
+                  end
+
+                  rights
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_sbJson.rb

@@ -8,6 +8,8 @@ require 'jbuilder'
 require_relative 'sbJson_id'
 require_relative 'sbJson_citation'
 require_relative 'sbJson_identifier'
+require_relative 'sbJson_rights'
+require_relative 'sbJson_provenance'
 
 module ADIWG
    module Mdtranslator
@@ -16,6 +18,7 @@ module ADIWG
 
             def self.build(intObj, responseObj)
 
+               metadataInfo = intObj[:metadata][:metadataInfo]
                resourceInfo = intObj[:metadata][:resourceInfo]
                hCitation = resourceInfo[:citation]
 
@@ -46,6 +49,15 @@ module ADIWG
                   json.purpose resourceInfo[:purpose]
 
                   # rights
+                  unless resourceInfo[:constraints].empty?
+                     json.rights Rights.build(resourceInfo[:constraints])
+                  end
+
+                  # provenance
+                  json.provenance Provenance.build(metadataInfo)
+
+                  # material requisition instructions
+                  json.materialRequisitionInstructions
 
                end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.0.0rc5
+  version: 2.0.0rc6
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-21 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -586,6 +586,8 @@ files:
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_facet.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_id.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_identifier.rb
+- lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_provenance.rb
+- lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_rights.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_sbJson.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_spatial.rb
 - lib/adiwg/mdtranslator/writers/sbJson/version.rb
@@ -610,7 +612,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The mdtranslator (metadata translator) is a tool for translating metadata