libgd-gis 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f8d5008c730b85efa042da3954caa0ef159b6f4c7dbba6c55a0ddbb3d502fca
-  data.tar.gz: faf1b591f83533bcdff3e801953ddaf40ba2ff7eec9d76cf3033d29e390cbace
+  metadata.gz: 9b617161c82e9481b5787df8379b18b0f5bfc267dc62ae1d6979d0cacd92881d
+  data.tar.gz: ec8b6d1c651b74dee77266186e5e5b767e7133f863bb51d9dded95b549c7cedc
 SHA512:
-  metadata.gz: 19c46a399600002003be83127750eca006e0b1fb3be72cda8e65d2ada379c09a0bbc25068ebc56290d588f7c97957011085fb6a068b9e11f313840b64ccfbf3b
-  data.tar.gz: d8850e9183d309f8567f090560069d06987b2c304acf76605578b8ade88a3185ee5a433e6ad35c858946a6aefc7060fa321f233e6bbadf76a76c7300570f7006
+  metadata.gz: 8f9a191f2d884a477557cdc4e5efe69545cdf43f78528056f4b7f82ec1500dedb8015374fed929bb4035c1d0f27ce414aeaff018e2d4eb36802399408f5e41c1
+  data.tar.gz: bb24e7dd4c41e7783d41e97ed7f6ddc8b01a8a0372c9ecdbb182666e977ed365856a10a35b7faf88a3dbbc35aaf52ff33b2e8090c915f3366f5ad32ad3af91f5

data/lib/gd/gis/layer_geojson.rb

@@ -26,19 +26,9 @@ module GD
       # @raise [JSON::ParserError] if the file is invalid JSON
       # @raise [Errno::ENOENT] if the file does not exist
       def self.load(source)
+        data = normalize_source(source)
 
-        data = case source
-          when String
-            if source.strip.start_with?("{", "[")
-              JSON.parse(source)
-            else
-              JSON.parse(File.read(source))
-            end
-          when Hash
-            source
-          else
-            raise ArgumentError, "Unsupported GeoJSON source"
-          end
+        validate_geojson!(data)
 
         # 1) Detect CRS
         crs_name   = data["crs"]&.dig("properties", "name")
@@ -48,13 +38,55 @@ module GD
         ontology = Ontology.new
 
         # 3) Normalize geometries + classify
-        data["features"].map do |f|
-          normalize_geometry!(f["geometry"], normalizer)
+        data["features"].map do |feature|
+          geometry   = feature["geometry"]
+          properties = feature["properties"] || {}
+
+          raise ArgumentError, "Missing geometry" unless geometry
+          raise ArgumentError, "Missing geometry type" unless geometry["type"]
+          raise ArgumentError, "Missing coordinates" unless geometry["coordinates"]
+
+          normalize_geometry!(geometry, normalizer)
+
           layer = ontology.classify(
-            f["properties"] || {},
-            geometry_type: f["geometry"]["type"]
+            properties,
+            geometry_type: geometry["type"]
           )
-          Feature.new(f["geometry"], f["properties"], layer)
+
+          Feature.new(geometry, properties, layer)
+        end
+      end
+
+      def self.normalize_source(source)
+        case source
+        when Hash
+          source
+
+        when String
+          begin
+            JSON.parse(source)
+          rescue JSON::ParserError
+            raise ArgumentError, "File not found: #{source}" unless File.exist?(source)
+
+            JSON.parse(File.read(source))
+          end
+
+        else
+          raise ArgumentError, "Unsupported GeoJSON source: #{source.class}"
+        end
+      end
+
+      def self.validate_geojson!(data)
+        unless data.is_a?(Hash)
+          raise ArgumentError, "GeoJSON must be an object"
+        end
+
+        unless data["type"] == "FeatureCollection"
+          raise ArgumentError, "Only FeatureCollection is supported"
+        end
+
+        unless data["features"].is_a?(Array)
+          raise ArgumentError, "GeoJSON must contain features array"
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgd-gis
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.4.0
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.4.0