libgd-gis 0.4.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f8d5008c730b85efa042da3954caa0ef159b6f4c7dbba6c55a0ddbb3d502fca
-  data.tar.gz: faf1b591f83533bcdff3e801953ddaf40ba2ff7eec9d76cf3033d29e390cbace
+  metadata.gz: 9d3a1a097a70594f97c1bc94eaf18e02c1494b530b430c137051eb1bc9d3c293
+  data.tar.gz: 1c3d4d8b4c9476dd06eab30fa0708063a9f6605dda34a2d23690460d98713edb
 SHA512:
-  metadata.gz: 19c46a399600002003be83127750eca006e0b1fb3be72cda8e65d2ada379c09a0bbc25068ebc56290d588f7c97957011085fb6a068b9e11f313840b64ccfbf3b
-  data.tar.gz: d8850e9183d309f8567f090560069d06987b2c304acf76605578b8ade88a3185ee5a433e6ad35c858946a6aefc7060fa321f233e6bbadf76a76c7300570f7006
+  metadata.gz: '069642af657e39514e8b16f2076e25abb097f8174abd5612c2427c0a8e64041ac0d82dd5769a4712a946bde371db8b697c65043b290a889b7840f3580f885b65'
+  data.tar.gz: d20ceb5e7e8c129100f6e536a633d9ea2cb9f423852878a829563c0132d01014ce9221637cfdd1f8ed3ff32c50c95c734022eacb175b502e7683b81505cef0fa

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,16 +38,54 @@ 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)
+        raise ArgumentError, "GeoJSON must be an object" unless data.is_a?(Hash)
+
+        raise ArgumentError, "Only FeatureCollection is supported" unless data["type"] == "FeatureCollection"
+
+        return if data["features"].is_a?(Array)
+
+        raise ArgumentError, "GeoJSON must contain features array"
+      end
+
       # Normalizes a GeoJSON geometry in-place.
       #
       # Supports 2D and 3D coordinate arrays.

data/lib/gd/gis/map.rb

@@ -404,6 +404,10 @@ module GD
               @layers[:minor] << feature
             end
           end
+          puts "\n=== ONTOLOGY DEBUG ==="
+          puts "Properties: #{feature.properties}"
+          puts "Geometry: #{feature.geometry['type']}"
+          puts "→ Classified as: #{feature.layer.inspect}"
         end
       end
 
@@ -674,6 +678,10 @@ module GD
         items = @layers[kind]
         return if items.nil? || items.empty?
 
+        puts ">>>>>>debug<<<<<<"
+        puts kind
+
+
         style =
           case kind
           when :street, :primary, :motorway, :secondary, :minor

data/lib/gd/gis/ontology.rb

@@ -31,6 +31,20 @@ module GD
         @rules = YAML.load_file(path)
       end
 
+      def print_rules
+        @rules.each do |layer, sources|
+          puts "\n=== #{layer.to_s.upcase} ==="
+
+          sources.each do |source, rules|
+            puts "  [#{source}]"
+
+            rules.each do |key, values|
+              puts "    #{key} → #{values.join(', ')}"
+            end
+          end
+        end
+      end
+
       # Classifies a feature into a semantic layer.
       #
       # Properties are matched against ontology rules using
@@ -64,9 +78,16 @@ module GD
         end
 
         # Fallback classification
-        return :points if geometry_type == "Point"
-
-        nil
+        case geometry_type
+        when "Point"
+          :points
+        when "LineString", "MultiLineString"
+          :minor
+        when "Polygon", "MultiPolygon"
+          :area
+        else
+          nil
+        end
       end
     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.5.0
 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