module_featureCollection.rb in adiwg-mdtranslator-2.10.0

- old
+ new
@@ -1,87 +1,88 @@
 # unpack feature collection
 # Reader - ADIwg JSON to internal data structure
 
 # History:
-#   Stan Smith 2016-11-10 added computedBbox computation
-#   Stan Smith 2016-10-25 original script
+#  Stan Smith 2018-02-18 refactored error and warning messaging
+#  Stan Smith 2016-11-10 added computedBbox computation
+#  Stan Smith 2016-10-25 original script
 
 require_relative 'module_geoJson'
 require 'adiwg/mdtranslator/internal/module_coordinates'
 
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
+   module Mdtranslator
+      module Readers
+         module MdJson
 
-                module FeatureCollection
+            module FeatureCollection
 
-                    def self.unpack(hFeatCol, responseObj)
+               def self.unpack(hFeatCol, responseObj)
 
-                        # return nil object if input is empty
-                        if hFeatCol.empty?
-                            responseObj[:readerExecutionMessages] << 'Feature Collection object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # return nil object if input is empty
+                  if hFeatCol.empty?
+                     responseObj[:readerExecutionMessages] << 'WARNING: mdJson reader: GeoJson feature collection object is empty'
+                     return nil
+                  end
 
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intFeatCol = intMetadataClass.newFeatureCollection
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intFeatCol = intMetadataClass.newFeatureCollection
 
-                        # feature collection - type (required)
-                        if hFeatCol.has_key?('type')
-                            if hFeatCol['type'] != ''
-                                if hFeatCol['type'] == 'FeatureCollection'
-                                    intFeatCol[:type] = hFeatCol['type']
-                                else
-                                    responseObj[:readerExecutionMessages] << 'Feature Collection type must be GeometryCollection'
-                                    responseObj[:readerExecutionPass] = false
-                                    return nil
-                                end
-                            end
+                  # feature collection - type (required)
+                  if hFeatCol.has_key?('type')
+                     unless hFeatCol['type'] == ''
+                        if hFeatCol['type'] == 'FeatureCollection'
+                           intFeatCol[:type] = hFeatCol['type']
+                        else
+                           responseObj[:readerExecutionMessages] <<
+                              'ERROR: mdJson reader: GeoJson feature collection type must be FeatureCollection'
+                           responseObj[:readerExecutionPass] = false
+                           return nil
                         end
-                        if intFeatCol[:type].nil? || intFeatCol[:type] == ''
-                            responseObj[:readerExecutionMessages] << 'Feature Collection is missing type'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                     end
+                  end
+                  if intFeatCol[:type].nil? || intFeatCol[:type] == ''
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: GeoJson feature collection type is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # feature collection - bounding box
-                        if hFeatCol.has_key?('bbox')
-                            unless hFeatCol['bbox'].empty?
-                                intFeatCol[:bbox] = hFeatCol['bbox']
-                            end
-                        end
+                  # feature collection - bounding box
+                  if hFeatCol.has_key?('bbox')
+                     unless hFeatCol['bbox'].empty?
+                        intFeatCol[:bbox] = hFeatCol['bbox']
+                     end
+                  end
 
-                        # feature collection - features (required, but can be empty)
-                        if hFeatCol.has_key?('features')
-                            hFeatCol['features'].each do |hFeature|
-                                hReturn = GeoJson.unpack(hFeature, responseObj)
-                                unless hReturn.nil?
-                                    intFeatCol[:features] << hReturn
-                                end
-                            end
-                        else
-                            responseObj[:readerExecutionMessages] << 'Features Collection is missing features'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
+                  # feature collection - features (required, but can be empty)
+                  if hFeatCol.has_key?('features')
+                     hFeatCol['features'].each do |hFeature|
+                        hReturn = GeoJson.unpack(hFeature, responseObj)
+                        unless hReturn.nil?
+                           intFeatCol[:features] << hReturn
                         end
+                     end
+                  else
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: GeoJson feature collection features are missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # geometry feature - computed bounding box for extent
-                        unless intFeatCol[:features].empty?
-                            intFeatCol[:computedBbox] = AdiwgCoordinates.computeBbox(intFeatCol[:features])
-                        end
+                  # geometry feature - computed bounding box for extent
+                  unless intFeatCol[:features].empty?
+                     intFeatCol[:computedBbox] = AdiwgCoordinates.computeBbox(intFeatCol[:features])
+                  end
 
-                        # geometry feature - save native GeoJSON for feature
-                        intFeatCol[:nativeGeoJson] = hFeatCol
+                  # geometry feature - save native GeoJSON for feature
+                  intFeatCol[:nativeGeoJson] = hFeatCol
 
-                        return intFeatCol
+                  return intFeatCol
 
-                    end
+               end
 
-                end
-
             end
-        end
-    end
+
+         end
+      end
+   end
 end