libgd-gis 0.3.21 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae0d79550ce61b3bebaa90e48f7b57c5dd1f1fca8be67d857e41fd8fec69e75c
-  data.tar.gz: b37ff43e8f0a0dd9112ad256c46e3aa1154975ca737544eae761bec9d074ee32
+  metadata.gz: 74dd1161f2cc225b81f304e90a5e60c2bf249da1606c7a84798367f3d1d1c4bb
+  data.tar.gz: 51a6d88d8f49e6e14a363c68fbd9a0837aae91aef028b456f4df20865831fce8
 SHA512:
-  metadata.gz: 6272498890dd101132b00edcd65d63b023721afa2d18a77bb17919b53d6220927ff5d532803d1c24e726799ac3d7671b648d2979c38725880403d5cd5dc966be
-  data.tar.gz: 65464584707bb1c54bb8401c847a395ba646f94846d5897fe5e6b099c97d812616035d35770d3106860819ce0d318b8980b56c7e067ace39c683ed6a5fa18273
+  metadata.gz: 78987b17ccf96eb35607632956a97add64353d9500a5ec9b208028a7064a11501ee5d0b19ce0b1134e41062dd35387b891eb1d67316737a0f7c83279223d1e2c
+  data.tar.gz: e2a9b4e8149839b5b9d7b834757e304979a81e3879a4332f97159e75236be79ea4c4e179a54ed3efd94231c24d290edc83812793b2962ffdbd40ae12549bf40a

data/lib/gd/gis/layer_points.rb

@@ -40,19 +40,19 @@ module GD
         size: 12,
         color: [0, 0, 0],
         font_color: nil,
-        count: 0
+        symbol: 0
       )
         @data = data
         @lon = lon
         @lat = lat
         @color = color
+        @font_color = font_color
 
         if icon.is_a?(Array) || icon.nil?
           fill, stroke = icon || [GD::GIS::ColorHelpers.random_rgb, GD::GIS::ColorHelpers.random_rgb]
           @icon = build_default_marker(fill, stroke)
-        elsif %w[numeric alphabetic].include?(icon)
+        elsif %w[numeric alphabetic symbol].include?(icon)
           @icon = icon
-          @font_color = font_color
         else
           @icon = GD::Image.open(icon)
           @icon.alpha_blending = true
@@ -62,9 +62,11 @@ module GD
         @label = label
         @font  = font
         @size  = size
+
         @r, @g, @b, @a = color
         @a = 0 if @a.nil?
-        @count = count
+
+        @symbol = symbol
       end
 
       # Builds a default circular marker icon.
@@ -101,11 +103,13 @@ module GD
       def render!(img, projector)
         value = case @icon
                 when "numeric"
-                  @count
+                  @symbol
                 when "alphabetic"
-                  (@count + 96).chr
+                  (@symbol + 96).chr
+                when "symbol"
+                  @symbol
                 else
-                  "*"
+                  @icon
                 end
 
         if @icon.is_a?(GD::Image)
@@ -128,8 +132,7 @@ module GD
 
           font_h = @size * 1.1
 
-          if @icon == "numeric" || @icon == "alphabetic"
-
+          if @icon == "numeric" || @icon == "alphabetic" || @icon == "symbol"
             draw_symbol_circle!(
               img: img,
               x: x,
@@ -148,7 +151,7 @@ module GD
                    x: x + (w / 2) + 4,
                    y: y + (font_h / 2),
                    size: @size,
-                   color: GD::Color.rgba(@r, @g, @b, @a),
+                   color: @font_color,
                    font: @font)
         end
       end
@@ -173,7 +176,7 @@ module GD
         # baseline  = top_y + h = y + h/2
         text_x = (x - (w / 2.0)).round
         text_y = (y + (h / 2.0)).round
-
+        
         # 4) Draw number
         img.text(
           text,

data/lib/gd/gis/map.rb

@@ -288,7 +288,7 @@ module GD
                 size:  size,
                 color: color,
                 font_color: font_color,
-                count: @count
+                symbol: @count
               )
               @count += 1
             elsif LINE_GEOMS.include?(geom_type)
@@ -298,6 +298,96 @@ module GD
         end
       end
 
+      # Adds a single point (marker) to the map.
+      #
+      # This is a convenience helper for the most common use case: rendering
+      # one point with an optional label and icon, without having to build
+      # a full collection or manually configure a PointsLayer.
+      #
+      # Internally, this method wraps the given coordinates into a one-element
+      # data collection and delegates rendering to {GD::GIS::PointsLayer},
+      # preserving the same rendering behavior and options.
+      #
+      # This method is intended for annotations, markers, alerts, cities,
+      # or any scenario where only one point needs to be rendered.
+      #
+      # @param lon [Numeric]
+      #   Longitude of the point.
+      # @param lat [Numeric]
+      #   Latitude of the point.
+      # @param label [String, nil]
+      #   Optional text label rendered next to the point.
+      # @param icon [String, Array<GD::Color>, nil]
+      #   Marker representation. Can be:
+      #   - a path to an image file
+      #   - :numeric or :alphabetic symbol styles
+      #   - an array of [fill, stroke] colors
+      #   - nil to generate a default marker
+      # @param font [String, nil]
+      #   Font path used to render the label or symbol.
+      # @param size [Integer]
+      #   Font size in pixels (default: 12).
+      # @param color [Array<Integer>]
+      #   Label or symbol background color as an RGB(A) array.
+      # @param font_color [GD::Color, nil]
+      #   Text color for numeric or alphabetic symbols.
+      #
+      # @return [void]
+      #
+      # @example Render a simple point
+      #   map.add_point(
+      #     lon: -58.3816,
+      #     lat: -34.6037
+      #   )
+      #
+      # @example Point with label
+      #   map.add_point(
+      #     lon: -58.3816,
+      #     lat: -34.6037,
+      #     label: "Buenos Aires"
+      #   )
+      #
+      # @example Point with numeric marker
+      #   map.add_point(
+      #     lon: -58.3816,
+      #     lat: -34.6037,
+      #     icon: "numeric",
+      #     label: "1",
+      #     font: "/usr/share/fonts/DejaVuSans.ttf"
+      #   )
+      #
+
+      def add_point(
+        lon:,
+        lat:,
+        label: nil,
+        icon: nil,
+        font: nil,
+        size: nil,
+        color: nil,
+        font_color: nil,
+        symbol: nil
+      )
+        row = {
+          lon: lon,
+          lat: lat,
+          label: label
+        }
+
+        @points_layers << GD::GIS::PointsLayer.new(
+          [row],
+          lon: -> r { r[:lon] },
+          lat: -> r { r[:lat] },
+          icon: icon || @style.point[:icon],
+          label: label ? -> r { r[:label] } : nil,
+          font: font || @style.point[:font],
+          size: size || @style.point[:size],
+          color: color || @style.point[:color],
+          font_color: font_color || @style.point[:font_color],
+          symbol: symbol
+        )
+      end
+
       # Adds a generic points overlay layer.
       #
       # @param data [Enumerable]

data/lib/gd/gis/style.rb

@@ -17,6 +17,9 @@ module GD
       # @return [Hash] global styling rules
       attr_reader :global
 
+      # @return [Hash] point styling rules
+      attr_reader :point
+
       # @return [Hash] road styling rules
       attr_reader :roads
 
@@ -45,6 +48,7 @@ module GD
       #   :global, :roads, :rails, :water, :parks, :points, :order, :track
       def initialize(definition)
         @global = definition[:global] || {}
+        @point = definition[:point] || {}
         @roads = definition[:roads] || {}
         @rails = definition[:rails] || {}
         @water = definition[:water] || {}
@@ -79,6 +83,7 @@ module GD
 
         new(
           global: data[:global],
+          point: data[:point],
           roads: data[:roads],
           rails: data[:rail] || data[:rails],
           track: data[:track],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgd-gis
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.4.0
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
@@ -57,7 +57,6 @@ files:
 - lib/gd/gis/projection.rb
 - lib/gd/gis/style.rb
 - lib/libgd_gis.rb
-- lib/test.rb
 homepage: https://github.com/ggerman/libgd-gis
 licenses:
 - MIT
@@ -77,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.5
 specification_version: 4
 summary: Geospatial raster rendering for Ruby using libgd
 test_files: []

data/lib/test.rb

@@ -1,3 +0,0 @@
-def foo; end
-
-foo(1, 2)