libgd-gis 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78e53ca4b47b3bd61cdc1a52268598fefbfa1797f2781a5296e4be856523787e
-  data.tar.gz: 2cbf66d159688eb784f2801527ba1856fc836c58211187c772ed1060ed702e36
+  metadata.gz: 5f3f45fc1508b900f78e5b11cd5fff6854ff81e1482ca26b8478be88957ba086
+  data.tar.gz: 30df288e61f15f66d0c0f210f9842cc1897ae35b1e6c0a442d6238dbb0c1ce4c
 SHA512:
-  metadata.gz: 55886e495283ecac661a25773d87fc98420cd38abaf8ca0f39fc9896b42c58d7e3da40f0aeaecb977def3c9d0eb721fc2520f7eb7d07fe6b5de89506cc1fae50
-  data.tar.gz: 90e030366511f4cc4c8aa8de17ac0ce17a129c56d71c2c3f46d2fb6a03a882c8408870c9ec5bc132c837d4a3a8bf4681385c77862cfd0fdde4b5f03378688c0e
+  metadata.gz: ca3069e841e805116089bc949fa4f14a708775100eed78dbc488fa1c1bba0d0fa66a7acb2fce50711d134e9d98695c2b3c0ecc7f28cdf723b4936da37e22825b
+  data.tar.gz: d12da69bd604584ba37b2b250de904e622a93a325437afec6c6f79f81c53c4863043c2b837e2f73d965423e62229f4838458d485f7f2d44bdf746e7df8c44075

data/lib/gd/gis/layer_geojson.rb

@@ -6,7 +6,6 @@ require_relative "ontology"
 module GD
   module GIS
     class LayerGeoJSON
-
       def self.load(path)
         data = JSON.parse(File.read(path))
 
@@ -20,7 +19,10 @@ module GD
         # 3) Normalize geometries + classify
         data["features"].map do |f|
           normalize_geometry!(f["geometry"], normalizer)
-          layer = ontology.classify(f["properties"] || {})
+          layer = ontology.classify(
+            f["properties"] || {},
+            geometry_type: f["geometry"]["type"]
+          )
           Feature.new(f["geometry"], f["properties"], layer)
         end
       end

data/lib/gd/gis/layer_points.rb

@@ -7,10 +7,11 @@ module GD
         @lon = lon
         @lat = lat
 
-        if icon
-          @icon = GD::Image.open(icon)
+        if icon.kind_of?(Array) || icon.nil?
+          fill, stroke = icon || [GD::GIS::ColorHelpers.random_rgb, GD::GIS::ColorHelpers.random_rgb]
+          @icon = build_default_marker(fill, stroke)
         else
-          @icon = build_default_marker
+          @icon = GD::Image.open(icon)
         end
 
         @label = label
@@ -22,23 +23,21 @@ module GD
         @icon.save_alpha = true
       end
 
-      def build_default_marker
+      def build_default_marker(fill, stroke)
         size = 32
+
         img = GD::Image.new(size, size)
         img.antialias = true
-        
-        white = GD::Color.rgb(255,255,255)
-        black = GD::Color.rgb(0,0,0)
 
         cx = size / 2
         cy = size / 2
-        r  = 12
+        r  = 5
 
-        # borde blanco
-        img.arc(cx, cy, r*2+4, r*2+4, 0, 360, white)
+        # stroke
+        img.arc(cx, cy, r*2+4, r*2+4, 0, 360, stroke)
 
-        # relleno negro
-        img.filled_arc(cx, cy, r*2, r*2, 0, 360, black)
+        # fill
+        img.filled_arc(cx, cy, r*2, r*2, 0, 360, fill)
 
         img
       end

data/lib/gd/gis/map.rb

@@ -24,7 +24,7 @@ module GD
         width: nil,
         height: nil,
         crs: nil,
-	      fitted_bbox: false
+        fitted_bbox: false
       )
         # --------------------------------------------------
         # 1. Basic input validation
@@ -150,7 +150,34 @@ module GD
             # o @layers[:street] << feature
           else
             geom_type = feature.geometry["type"]
-            if geom_type == "LineString" || geom_type == "MultiLineString"
+
+            if geom_type == "Point"
+              points_style = @style.points or
+                raise ArgumentError, "Style error: missing 'points' section"
+
+              font = points_style[:font] or
+                raise ArgumentError, "Style error: points.font is required"
+
+              size = points_style[:size] or
+                raise ArgumentError, "Style error: points.size is required"
+
+              raw_color = points_style[:color]
+              color = @style.normalize_color(raw_color)
+
+              icon  = points_style.key?(:icon_fill) && points_style.key?(:icon_stroke) ? [points_style[:icon_stroke], points_style[:icon_stroke]] : nil
+              icon  = points_style.key?(:icon) ? points_style[:icon] : nil if icon.nil?
+
+              @points_layers << GD::GIS::PointsLayer.new(
+                [feature],
+                lon:   ->(f) { f.geometry["coordinates"][0] },
+                lat:   ->(f) { f.geometry["coordinates"][1] },
+                icon:  icon,
+                label: ->(f) { f.properties["name"] },  # 👈 TEXTO
+                font:  font,
+                size:  size,
+                color: color
+              )
+            elsif geom_type == "LineString" || geom_type == "MultiLineString"
               @layers[:minor] << feature
             end
           end

data/lib/gd/gis/ontology.rb

@@ -8,7 +8,7 @@ module GD
         @rules = YAML.load_file(path)
       end
 
-      def classify(properties)
+      def classify(properties, geometry_type: nil)
         @rules.each do |layer, sources|
           sources.each do |source, rules|
             rules.each do |key, values|
@@ -19,8 +19,12 @@ module GD
             end
           end
         end
+
+        return :points if geometry_type == "Point"
+
         nil
       end
+
     end
   end
 end

data/lib/gd/gis/style.rb

@@ -3,13 +3,14 @@ require "yaml"
 module GD
   module GIS
     class Style
-      attr_reader :roads, :rails, :water, :parks, :order
+      attr_reader :roads, :rails, :water, :parks, :points, :order
 
       def initialize(definition)
         @roads = definition[:roads] || {}
         @rails = definition[:rails] || {}
         @water = definition[:water] || {}
         @parks = definition[:parks] || {}
+        @points = definition[:points] || {}
         @order = definition[:order] || []
       end
 
@@ -25,6 +26,7 @@ module GD
           rails: data[:rail] || data[:rails],
           water: data[:water],
           parks: data[:park] || data[:parks],
+          points: data[:points],
           order: (data[:order] || []).map(&:to_sym)
         )
       end
@@ -40,6 +42,31 @@ module GD
           obj
         end
       end
+
+      def normalize_color(color)
+        case color
+        when GD::Color
+          color
+
+        when Array
+          case color.length
+          when 3
+            GD::Color.rgb(*color)
+          when 4
+            GD::Color.rgba(*color)
+          else
+            raise ArgumentError,
+              "Style error: color array must be [r,g,b] or [r,g,b,a]"
+          end
+
+        when nil
+          GD::GIS::ColorHelpers.random_vivid
+
+        else
+          raise ArgumentError,
+            "Style error: invalid color format (#{color.inspect})"
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libgd-gis
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-19 00:00:00.000000000 Z
+date: 2026-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-libgd