adiwg-mdtranslator 1.3.0 → 1.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c9c38bce8eb28f8f717ca37d09e30519bbef40d
-  data.tar.gz: 85551feb2d6388a9debe63352b6bcd38d209d4f5
+  metadata.gz: 56bda3f3511b60925b18d584816a3e469f25dd58
+  data.tar.gz: 98af01b9951ab6ff0232efe89c6f968c3a7ce802
 SHA512:
-  metadata.gz: c3c61a184344ed5340fad65398fac03bd5efb7f8e1f368a20717a3931d9bd4c0d784e7283d57473b72d0580ff8789b0fc157930bc061b49d9da3f9c644d6639c
-  data.tar.gz: 6027a62b7c3116e947c32dc6dbd9602243fc7748ecf5c3a9d228da28acd183228850ad1885ba5d26c79d3cd510e043ca1925ed8efd629ae8203603a6816e3af2
+  metadata.gz: 857ac692fabf61fa0fb52ef7edfe74c1d02ef8c4f5e85a5214321a1a0fd52131dde74bf5c5b70ce61944ccf1aad16b34c1b5add0f134ad6bbe227e37c057ea5d
+  data.tar.gz: d2b571310bd60303d4f4155b9ca792cc9925fcd77de58186ed2d2f94d25b2394b241536cda288fd58e4c57d60ba0186444ae158b033cfbfaf936cef962f6d7a6

data/.jsbeautifyrc

@@ -0,0 +1,8 @@
+{
+  "ruby": {
+    "indent_size": 2,
+    "indent_char": " ",
+    "indent_level": 0,
+    "indent_with_tabs": false
+  }
+}

data/Rakefile

@@ -4,12 +4,10 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
 	t.libs << 'test'
 	t.test_files = FileList[
-		'test/readers/mdJson/v1/tc*.rb'
+		'test/**/tc*.rb'
 	]
 	t.verbose = true
 end
 
 desc 'Run tests'
 task :default => :test
-
-

data/adiwg-mdtranslator.gemspec

@@ -32,5 +32,7 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency "json-schema", "~> 2.4.0", "< 2.5.0"
     spec.add_runtime_dependency "adiwg-mdjson_schemas", "~> 1.0"
     spec.add_runtime_dependency "adiwg-mdcodes", "~> 1.0"
+    spec.add_runtime_dependency "jbuilder", "~> 2.5"
+    spec.add_runtime_dependency "rgeo", "~> 0.5"
 
 end

data/bin/mdtranslator

@@ -30,8 +30,8 @@ file with options to select the input reader format, writer output format, displ
 in XML outputs, and choose level of validation for mdJson input files.
     LONGDESC
     # define cli options
-    method_option :reader, :aliases => '-r', :desc => 'Reader to read your input metadata file', :enum => %w{mdJson}, :required => true
-    method_option :writer, :aliases => '-w', :desc => 'Writer to create your output metadata file, leave blank to validate input only', :enum => %w{iso19115_2 iso19110 html}
+    method_option :reader, :aliases => '-r', :desc => 'Reader to read your input metadata file', :enum => %w{mdJson sbJson}, :required => true
+    method_option :writer, :aliases => '-w', :desc => 'Writer to create your output metadata file, leave blank to validate input only', :enum => %w{iso19115_2 iso19110 html mdJson sbJson}
     method_option :validate, :aliases => '-v', :desc => 'Specify level of validation to be performed', :enum => %w{none normal strict}, :default => 'normal'
     method_option :showAllTags, :aliases => '-s', :desc => 'Include tags for unused attributes', :type => :boolean, :default => false
     method_option :messages, :aliases => '-m', :desc => 'On error return messages as formatted text or json object', :enum => %w{json text}, :default => 'text'

data/lib/adiwg/mdtranslator.rb

@@ -31,6 +31,8 @@ require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 require 'adiwg/mdtranslator/internal/module_geoFormat'
 require 'adiwg/mdtranslator/internal/module_coordinates'
+require 'adiwg/mdtranslator/internal/module_point'
+require 'adiwg/mdtranslator/internal/module_lineString'
 
 module ADIWG
     module Mdtranslator

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

@@ -92,7 +92,8 @@ class InternalMetadata
             phones: [],
             address: {},
             onlineRes: [],
-            contactInstructions: nil
+            contactInstructions: nil,
+            internal: false
         }
     end
 
@@ -330,6 +331,7 @@ class InternalMetadata
     def newGeoElement
         intObj = {
             elementId: nil,
+            elementType: nil,
             elementIncludeData: nil,
             elementName: nil,
             elementDescription: nil,
@@ -530,7 +532,8 @@ class InternalMetadata
             dictCitation: {},
             dictDescription: nil,
             dictResourceType: nil,
-            dictLanguage: nil
+            dictLanguage: nil,
+            includedWithDataset: nil
         }
     end
 
@@ -695,4 +698,4 @@ class InternalMetadata
         }
     end
 
-end
+end

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

@@ -6,221 +6,214 @@
 #   Stan Smith 2015-04-10 mapped bounding box as geojson feature and wkt polygon
 
 module AdiwgGeoFormat
+  def self.internal_to_geoJson(hGeoEle, geojson = true)
+    geoType = hGeoEle[:elementGeometry][:geoType]
+    hGeometry = hGeoEle[:elementGeometry][:geometry]
+    hSRS = hGeoEle[:elementSrs]
+
+    # GeoJson structure as hash
+    hGeoJson = {}
+
+    # add type
+    hGeoJson[:type] = geoType
+
+    # add bounding box
+    if geoType == 'BoundingBox'
+      hGeoJson[:type] = 'Feature'
+      hGeoJson[:bbox] = [hGeometry[:westLong], hGeometry[:southLat],
+                         hGeometry[:eastLong], hGeometry[:northLat]]
+      hGeoJson[:geometry] = nil
+      hGeoJson[:properties] = nil
+    end
 
-    def self.internal_to_geoJson(hGeoEle)
-
-        geoType = hGeoEle[:elementGeometry][:geoType]
-        hGeometry = hGeoEle[:elementGeometry][:geometry]
-        hSRS = hGeoEle[:elementSrs]
-
-        # GeoJson structure as hash
-        hGeoJson = Hash.new()
-
-        # add type
-        hGeoJson[:type] = geoType
-
-        # add bounding box
-        if geoType == 'BoundingBox'
-            hGeoJson[:type] = 'Feature'
-            hGeoJson[:bbox] = [hGeometry[:westLong],hGeometry[:southLat],
-                               hGeometry[:eastLong],hGeometry[:northLat]]
-            hGeoJson[:geometry] = nil
-            hGeoJson[:properties] = nil
-        end
-
-        # add point, multi-point, linestring, multi-linestring
-        if geoType == 'Point' ||
-            geoType == 'MultiPoint' ||
-            geoType == 'LineString' ||
-            geoType == 'MultiLineString'
-            hGeoJson[:coordinates] = hGeometry
-        end
+    # add point, multi-point, linestring, multi-linestring
+    if geoType == 'Point' ||
+       geoType == 'MultiPoint' ||
+       geoType == 'LineString' ||
+       geoType == 'MultiLineString'
+      hGeoJson[:coordinates] = hGeometry
+    end
 
-        # add polygon
-        if geoType == 'Polygon'
-            hGeoJson[:coordinates] = polygon_to_coords(hGeometry)
-        end
+    # add polygon
+    if geoType == 'Polygon'
+      hGeoJson[:coordinates] = polygon_to_coords(hGeometry)
+    end
 
-        # add multi-polygon
-        if geoType == 'MultiPolygon'
-            hGeoJson[:coordinates] = []
-            hGeometry.each do |hPolygon|
-                hGeoJson[:coordinates] << polygon_to_coords(hPolygon)
-            end
-        end
+    # add multi-polygon
+    if geoType == 'MultiPolygon'
+      hGeoJson[:coordinates] = []
+      hGeometry.each do |hPolygon|
+        hGeoJson[:coordinates] << polygon_to_coords(hPolygon)
+      end
+    end
 
-        # add coordinate reference system
-        if !hSRS.empty?
-            hGeoJson[:crs] = {}
-
-            # if srs name is provided use crs name format
-            sName = hSRS[:srsName]
-            sLink = hSRS[:srsHref]
-            if !sName.nil?
-                hGeoJson[:crs][:type] = 'name'
-                hGeoJson[:crs][:properties]= {}
-                hGeoJson[:crs][:properties][:name] = sName
-            elsif !sLink.nil?
-                hGeoJson[:crs][:type] = 'link'
-                hGeoJson[:crs][:properties]= {}
-                hGeoJson[:crs][:properties][:href] = sLink
-                sType = hSRS[:srsType]
-                if !sType.nil?
-                    hGeoJson[:crs][:properties][:type] = sType
-                end
-            end
+    # add coordinate reference system
+    unless hSRS.empty?
+      hGeoJson[:crs] = {}
+
+      # if srs name is provided use crs name format
+      sName = hSRS[:srsName]
+      sLink = hSRS[:srsHref]
+      if !sName.nil?
+        hGeoJson[:crs][:type] = 'name'
+        hGeoJson[:crs][:properties] = {}
+        hGeoJson[:crs][:properties][:name] = sName
+      elsif !sLink.nil?
+        hGeoJson[:crs][:type] = 'link'
+        hGeoJson[:crs][:properties] = {}
+        hGeoJson[:crs][:properties][:href] = sLink
+        sType = hSRS[:srsType]
+        hGeoJson[:crs][:properties][:type] = sType unless sType.nil?
+      end
 
-        end
+    end
 
-        # convert internal object polygon format to coordinates
-        def self.polygon_to_coords(hPolygon)
-            aCoordinates = []
+    # return GeoJSON
+    geojson ? hGeoJson.to_json : hGeoJson
+  end
 
-            # add exterior ring
-            aCoordinates << hPolygon[:exteriorRing]
+  # convert internal object polygon format to coordinates
+  def self.polygon_to_coords(hPolygon)
+    aCoordinates = []
 
-            # add exclusion rings
-            hPolygon[:exclusionRings].each do |aExRing|
-                aCoordinates << aExRing
-            end
+    # add exterior ring
+    aCoordinates << hPolygon[:exteriorRing]
 
-            return aCoordinates
-        end
+    # add exclusion rings
+    hPolygon[:exclusionRings].each do |aExRing|
+      aCoordinates << aExRing
+    end
 
-        # return GeoJSON
-        return hGeoJson.to_json
+    aCoordinates
+  end
+
+  def self.internal_to_wkt(hGeoEle)
+    geoType = hGeoEle[:geoType]
+    hGeometry = hGeoEle[:geometry]
+    dimension = hGeoEle[:dimension]
+    wktString = ''
+
+    if geoType == 'BoundingBox'
+      wktString = 'POLYGON ('
+      wktString += '(' + hGeometry[:westLong].to_s + ' ' + hGeometry[:northLat].to_s + '), '
+      wktString += '(' + hGeometry[:eastLong].to_s + ' ' + hGeometry[:northLat].to_s + '), '
+      wktString += '(' + hGeometry[:eastLong].to_s + ' ' + hGeometry[:southLat].to_s + '), '
+      wktString += '(' + hGeometry[:westLong].to_s + ' ' + hGeometry[:southLat].to_s + '), '
+      wktString += '(' + hGeometry[:westLong].to_s + ' ' + hGeometry[:northLat].to_s + ')'
+      wktString += ')'
+    end
 
+    if geoType == 'Point'
+      wktString = 'POINT ' + wkt_dimension(dimension) + '('
+      wktString += point_string(hGeometry)
+      wktString += ')'
     end
 
-    def self.internal_to_wkt(hGeoEle)
-        geoType = hGeoEle[:geoType]
-        hGeometry = hGeoEle[:geometry]
-        dimension = hGeoEle[:dimension]
-        wktString = ''
-
-        if geoType == 'BoundingBox'
-            wktString = 'POLYGON ('
-            wktString += '(' + hGeometry[:westLong].to_s + ' ' + hGeometry[:northLat].to_s + '), '
-            wktString += '(' + hGeometry[:eastLong].to_s + ' ' + hGeometry[:northLat].to_s + '), '
-            wktString += '(' + hGeometry[:eastLong].to_s + ' ' + hGeometry[:southLat].to_s + '), '
-            wktString += '(' + hGeometry[:westLong].to_s + ' ' + hGeometry[:southLat].to_s + '), '
-            wktString += '(' + hGeometry[:westLong].to_s + ' ' + hGeometry[:northLat].to_s + ')'
-            wktString += ')'
-        end
+    if geoType == 'LineString'
+      wktString = 'LINESTRING ' + wkt_dimension(dimension) + '('
+      hGeometry.each do |point|
+        wktString += point_string(point) + ', '
+      end
+      wktString.chomp!(', ')
+      wktString += ')'
+    end
 
-        if geoType == 'Point'
-            wktString = 'POINT ' + wkt_dimension(dimension) + '('
-            wktString += point_string(hGeometry)
-            wktString += ')'
+    if geoType == 'Polygon'
+      wktString = 'POLYGON ' + wkt_dimension(dimension) + '('
+
+      # add exterior ring - required
+      wktString += '('
+      aExtRing = hGeometry[:exteriorRing]
+      aExtRing.each do |point|
+        wktString += point_string(point) + ', '
+      end
+      wktString.chomp!(', ')
+      wktString += ')'
+
+      # add any exclusion rings
+      aExcRings = hGeometry[:exclusionRings]
+      aExcRings.each do |excPolygon|
+        wktString += ', ('
+        excPolygon.each do |point|
+          wktString += point_string(point) + ', '
         end
+        wktString.chomp!(', ')
+        wktString += ')'
+      end
 
-        if geoType == 'LineString'
-            wktString = 'LINESTRING ' + wkt_dimension(dimension) + '('
-            hGeometry.each do |point|
-                wktString += point_string(point) + ', '
-            end
-            wktString.chomp!(', ')
-            wktString += ')'
-        end
+      wktString += ')'
+    end
 
-        if geoType == 'Polygon'
-            wktString = 'POLYGON ' + wkt_dimension(dimension) + '('
-
-            # add exterior ring - required
-            wktString += '('
-            aExtRing = hGeometry[:exteriorRing]
-            aExtRing.each do |point|
-                wktString += point_string(point) + ', '
-            end
-            wktString.chomp!(', ')
-            wktString += ')'
-
-            # add any exclusion rings
-            aExcRings = hGeometry[:exclusionRings]
-            aExcRings.each do |excPolygon|
-                wktString += ', ('
-                excPolygon.each do |point|
-                    wktString += point_string(point) + ', '
-                end
-                wktString.chomp!(', ')
-                wktString += ')'
-            end
-
-            wktString += ')'
-        end
+    if geoType == 'MultiPoint'
+      wktString = 'MULTIPOINT ' + wkt_dimension(dimension) + '('
+      hGeometry.each do |point|
+        wktString += '('
+        wktString += point_string(point) + '), '
+      end
+      wktString.chomp!(', ')
+      wktString += ')'
+    end
 
-        if geoType == 'MultiPoint'
-            wktString = 'MULTIPOINT ' + wkt_dimension(dimension) + '('
-            hGeometry.each do |point|
-                wktString += '('
-                wktString += point_string(point) + '), '
-            end
-            wktString.chomp!(', ')
-            wktString += ')'
+    if geoType == 'MultiLineString'
+      wktString = 'MULTILINESTRING ' + wkt_dimension(dimension) + '('
+      hGeometry.each do |line|
+        wktString += '('
+        line.each do |point|
+          wktString += point_string(point) + ', '
         end
+        wktString.chomp!(', ')
+        wktString += '), '
+      end
+      wktString.chomp!(', ')
+      wktString += ')'
+    end
 
-        if geoType == 'MultiLineString'
-            wktString = 'MULTILINESTRING ' + wkt_dimension(dimension) + '('
-                hGeometry.each do |line|
-                    wktString += '('
-                    line.each do |point|
-                        wktString += point_string(point) + ', '
-                    end
-                    wktString.chomp!(', ')
-                    wktString += '), '
-                end
-            wktString.chomp!(', ')
-            wktString += ')'
-        end
+    if geoType == 'MultiPolygon'
+      wktString = 'MULTIPOLYGON ' + wkt_dimension(dimension) + '('
+      hGeometry.each do |polygon|
+        wktString += '('
 
-        if geoType == 'MultiPolygon'
-            wktString = 'MULTIPOLYGON ' + wkt_dimension(dimension) + '('
-            hGeometry.each do |polygon|
-                wktString += '('
-
-                # add exterior ring - required
-                wktString += '('
-                aExtRing = polygon[:exteriorRing]
-                aExtRing.each do |point|
-                    wktString += point_string(point) + ', '
-                end
-                wktString.chomp!(', ')
-                wktString += ')'
-
-                # add any exclusion rings
-                aExcRings = polygon[:exclusionRings]
-                aExcRings.each do |excPolygon|
-                    wktString += ', ('
-                    excPolygon.each do |point|
-                        wktString += point_string(point) + ', '
-                    end
-                    wktString.chomp!(', ')
-                    wktString += ')'
-                end
-
-                wktString += '), '
-            end
-            wktString.chomp!(', ')
-            wktString += ')'
+        # add exterior ring - required
+        wktString += '('
+        aExtRing = polygon[:exteriorRing]
+        aExtRing.each do |point|
+          wktString += point_string(point) + ', '
         end
-
-        def self.point_string(aTuple)
-            sTuple = ''
-            aTuple.each do |element|
-                sTuple += element.to_s + ' '
-            end
-            return sTuple.chomp(' ')
+        wktString.chomp!(', ')
+        wktString += ')'
+
+        # add any exclusion rings
+        aExcRings = polygon[:exclusionRings]
+        aExcRings.each do |excPolygon|
+          wktString += ', ('
+          excPolygon.each do |point|
+            wktString += point_string(point) + ', '
+          end
+          wktString.chomp!(', ')
+          wktString += ')'
         end
 
-        def self.wkt_dimension(dim)
-            sDim = ''
-            sDim += 'Z ' if dim == 3
-            sDim += 'ZM ' if dim == 4
-            return sDim
-        end
+        wktString += '), '
+      end
+      wktString.chomp!(', ')
+      wktString += ')'
+    end
 
-        return wktString
+    wktString
+  end
 
+  def self.point_string(aTuple)
+    sTuple = ''
+    aTuple.each do |element|
+      sTuple += element.to_s + ' '
     end
-
+    sTuple.chomp(' ')
+  end
+
+  def self.wkt_dimension(dim)
+    sDim = ''
+    sDim += 'Z ' if dim == 3
+    sDim += 'ZM ' if dim == 4
+    sDim
+  end
 end