libgd-gis 0.3.21 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae0d79550ce61b3bebaa90e48f7b57c5dd1f1fca8be67d857e41fd8fec69e75c
-  data.tar.gz: b37ff43e8f0a0dd9112ad256c46e3aa1154975ca737544eae761bec9d074ee32
+  metadata.gz: ff2a73817209bdd6e71f77b83cd0f7ffaee27327e95c199e01bf9eb879b2ff53
+  data.tar.gz: d5fe87d75561eba31a1cae4c46902a16dfcd9a70b525f8d6772682f05f1f9c56
 SHA512:
-  metadata.gz: 6272498890dd101132b00edcd65d63b023721afa2d18a77bb17919b53d6220927ff5d532803d1c24e726799ac3d7671b648d2979c38725880403d5cd5dc966be
-  data.tar.gz: 65464584707bb1c54bb8401c847a395ba646f94846d5897fe5e6b099c97d812616035d35770d3106860819ce0d318b8980b56c7e067ace39c683ed6a5fa18273
+  metadata.gz: a9e41b51e0e1365eb60905131e2766981de954d74b92b16ba8abb45224e3c6df9215a96628cf23f7c90c6675d2acf98dbafe326c569ee45440dcedd1502f5d7d
+  data.tar.gz: d2598e4392ee4c400a0cf2982d91916119222f9ec4dd869b4851d0b994a0a241f39ef483e720d66121fd070af3b4ba5c46068d2194d8a09b9ed4b61cfa259192

data/lib/gd/gis/crs_normalizer.rb

@@ -69,6 +69,9 @@ module GD
           when EPSG3857
             mercator_to_wgs84(lon, lat)
 
+          when "EPSG:22195"
+            gk_to_wgs84(lon, lat)
+
           else
             raise ArgumentError, "Unsupported CRS: #{@crs}"
           end
@@ -97,6 +100,70 @@ module GD
           lat = ((2 * Math.atan(Math.exp(y / r))) - (Math::PI / 2)) * 180.0 / Math::PI
           [lon, lat]
         end
+
+        # Converts Gauss–Krüger (GK) projected coordinates to WGS84.
+        #
+        # This method converts easting/northing coordinates from
+        # Gauss–Krüger Argentina Zone 5 (EPSG:22195) into
+        # WGS84 longitude/latitude (degrees).
+        #
+        # The implementation is intended for cartographic rendering
+        # and visualization purposes, not for high-precision geodesy.
+        #
+        # @param easting [Numeric]
+        #   Easting value in meters.
+        #
+        # @param northing [Numeric]
+        #   Northing value in meters.
+        #
+        # @return [Array<Float>]
+        #   A `[longitude, latitude]` pair in decimal degrees (WGS84).
+        #
+        # @example Convert Gauss–Krüger coordinates
+        #   gk_to_wgs84(580_000, 6_176_000)
+        #   # => [longitude, latitude]
+        #
+        # @note
+        #   This method assumes:
+        #   - Central meridian: −60°
+        #   - False easting: 500,000 m
+        #   - WGS84-compatible ellipsoid
+        #
+        # @see https://epsg.io/22195
+
+        def gk_to_wgs84(easting, northing)
+          a = 6378137.0
+          f = 1 / 298.257223563
+          e2 = (2 * f) - (f * f)
+          lon0 = -60.0 * Math::PI / 180.0
+
+          x = easting - 500_000.0
+          y = northing - 10_000_000.0
+
+          m = y
+          mu = m / (a * (1 - (e2 / 4) - (3 * e2 * e2 / 64)))
+
+          e1 = (1 - Math.sqrt(1 - e2)) / (1 + Math.sqrt(1 - e2))
+
+          j1 = (3 * e1 / 2) - (27 * (e1**3) / 32)
+          j2 = (21 * (e1**2) / 16) - (55 * (e1**4) / 32)
+
+          fp = mu + (j1 * Math.sin(2 * mu)) + (j2 * Math.sin(4 * mu))
+
+          c1 = e2 * (Math.cos(fp)**2)
+          t1 = Math.tan(fp)**2
+          r1 = a * (1 - e2) / ((1 - (e2 * (Math.sin(fp)**2)))**1.5)
+          n1 = a / Math.sqrt(1 - (e2 * (Math.sin(fp)**2)))
+
+          d = x / n1
+
+          lat = fp - ((n1 * Math.tan(fp) / r1) *
+                    (((d**2) / 2) - ((5 + (3 * t1) + (10 * c1)) * (d**4) / 24)))
+
+          lon = lon0 + ((d - ((1 + (2 * t1) + c1) * (d**3) / 6)) / Math.cos(fp))
+
+          [lon * 180.0 / Math::PI, lat * 180.0 / Math::PI]
+        end
       end
     end
   end

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/legend.rb

@@ -0,0 +1,20 @@
+# lib/libgd/gis/legend.rb
+
+module GD
+  module GIS
+    LegendItem = Struct.new(:color, :label)
+
+    class Legend
+      attr_reader :items, :position
+
+      def initialize(position: :bottom_right)
+        @position = position
+        @items = []
+      end
+
+      def add(color, label)
+        @items << LegendItem.new(color, label)
+      end
+    end
+  end
+end

data/lib/gd/gis/map.rb

@@ -7,6 +7,7 @@ require_relative "layer_geojson"
 require_relative "layer_points"
 require_relative "layer_lines"
 require_relative "layer_polygons"
+require_relative "legend"
 
 LINE_GEOMS = %w[LineString MultiLineString].freeze
 POLY_GEOMS = %w[Polygon MultiPolygon].freeze
@@ -42,6 +43,8 @@ module GD
       # @return [Boolean] enables debug rendering
       attr_reader :debug
 
+      attr_reader :legend
+
       # Creates a new map.
       #
       # @param bbox [Array<Float>]
@@ -217,6 +220,111 @@ module GD
         @used_labels[key] = true
       end
 
+      def legend(position: :bottom_right)
+        @legend = Legend.new(position: position)
+        yield @legend
+      end
+
+      def legend_from_layers(position: :bottom_right)
+        @legend = Legend.new(position: position)
+
+        layers.each do |layer|
+          next unless layer.respond_to?(:color)
+          @legend.add(layer.color, layer.name)
+        end
+      end
+
+      def draw_legend
+        return unless @legend
+        return unless @image
+        return unless @style
+        return unless @style.global
+        return if @style.global[:label] == false
+
+        label_style = @style.global[:label] || {}
+
+        padding     = 10
+        box_size    = 12
+        line_height = 18
+        margin      = 15
+
+        # --- font (from style) -----------------------------------
+
+        font_path =
+          case label_style[:font]
+          when nil, "default"
+            GD::GIS::FontHelper.random
+          else
+            label_style[:font]
+          end
+
+        font_size  = label_style[:size] || 10
+        font_color = GD::Color.rgba(*(label_style[:color] || [0, 0, 0, 0]))
+
+        # --- measure text (CORRECT API) ---------------------------
+
+        text_widths = @legend.items.map do |i|
+          w, = @image.text_bbox(
+            i.label,
+            font: font_path,
+            size: font_size
+          )
+          w
+        end
+
+        width  = (text_widths.max || 0) + box_size + padding * 3
+        height = @legend.items.size * line_height + padding * 2
+
+        # --- position --------------------------------------------
+
+        x, y =
+          case @legend.position
+          when :bottom_right
+            [@image.width - width - margin, @image.height - height - margin]
+          when :bottom_left
+            [margin, @image.height - height - margin]
+          when :top_right
+            [@image.width - width - margin, margin]
+          when :top_left
+            [margin, margin]
+          else
+            [margin, margin]
+          end
+
+        # --- background ------------------------------------------
+
+        bg     = GD::Color.rgba(255, 255, 255, 80)
+        border = GD::Color.rgb(200, 200, 200)
+
+        @image.filled_rectangle(x, y, x + width, y + height, bg)
+        @image.rectangle(x, y, x + width, y + height, border)
+
+        # --- items -----------------------------------------------
+
+        @legend.items.each_with_index do |item, idx|
+          iy = y + padding + idx * line_height
+
+          # color box
+          @image.filled_rectangle(
+            x + padding,
+            iy,
+            x + padding + box_size,
+            iy + box_size,
+            GD::Color.rgba(*item.color)
+          )
+
+          # label text
+          @image.text_ft(
+            item.label,
+            x: x + padding + box_size + 8,
+            y: iy + box_size,
+            font: font_path,
+            size: font_size,
+            color: font_color
+          )
+        end
+      end
+
       # Loads features from a GeoJSON file.
       #
       # This method:
@@ -288,7 +396,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 +406,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]
@@ -387,6 +585,8 @@ module GD
         @polygons_layers.each { |l| l.render!(@image, projection) }
         @lines_layers.each    { |l| l.render!(@image, projection) }
         @points_layers.each   { |l| l.render!(@image, projection) }
+        
+        draw_legend
       end
 
       def render_viewport
@@ -446,6 +646,8 @@ module GD
         @polygons_layers.each { |l| l.render!(@image, projection) }
         @lines_layers.each    { |l| l.render!(@image, projection) }
         @points_layers.each   { |l| l.render!(@image, projection) }
+        
+        draw_legend
       end
 
       # Saves the rendered image to disk.

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.1
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
@@ -50,14 +50,13 @@ files:
 - lib/gd/gis/layer_lines.rb
 - lib/gd/gis/layer_points.rb
 - lib/gd/gis/layer_polygons.rb
+- lib/gd/gis/legend.rb
 - lib/gd/gis/map.rb
-- lib/gd/gis/middleware.rb
 - lib/gd/gis/ontology.rb
 - lib/gd/gis/ontology.yml
 - 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.6
 specification_version: 4
 summary: Geospatial raster rendering for Ruby using libgd
 test_files: []

data/lib/gd/gis/middleware.rb

@@ -1,152 +0,0 @@
-# frozen_string_literal: true
-
-module GD
-  module GIS
-    # Coordinate Reference System (CRS) helpers and normalizers.
-    #
-    # This module defines commonly used CRS identifiers and
-    # utilities for normalizing coordinates into a single,
-    # consistent representation.
-    #
-    module CRS
-      # OGC CRS84 (longitude, latitude)
-      CRS84      = "urn:ogc:def:crs:OGC:1.3:CRS84"
-
-      # EPSG:4326 (latitude, longitude axis order)
-      EPSG4326   = "EPSG:4326"
-
-      # EPSG:3857 (Web Mercator)
-      EPSG3857   = "EPSG:3857"
-
-      # Gauss–Krüger Argentina, zone 5
-      #
-      # Note: This constant represents a *specific* GK zone
-      # and is not a generic Gauss–Krüger definition.
-      GK_ARGENTINA = "EPSG:22195"
-
-      # Normalizes coordinates from supported CRS definitions
-      # into CRS84 (longitude, latitude in degrees).
-      #
-      # Supported input CRS:
-      # - CRS84
-      # - EPSG:4326 (axis order normalization)
-      # - EPSG:3857 (Web Mercator)
-      # - EPSG:22195 (Gauss–Krüger Argentina, zone 5)
-      #
-      # All outputs are returned as:
-      #   [longitude, latitude] in degrees
-      #
-      # ⚠️ Projection conversions are intended for mapping
-      # and visualization, not for high-precision geodesy.
-      #
-      class Normalizer
-        # Creates a new CRS normalizer.
-        #
-        # @param crs [String, Symbol, nil]
-        #   CRS identifier; defaults to CRS84 if nil
-        def initialize(crs)
-          @crs = normalize_name(crs)
-        end
-
-        # Normalizes a coordinate pair into CRS84.
-        #
-        # @param lon [Numeric]
-        #   first coordinate (meaning depends on input CRS)
-        # @param lat [Numeric]
-        #   second coordinate (meaning depends on input CRS)
-        #
-        # @return [Array<Float>]
-        #   normalized [longitude, latitude] in degrees
-        #
-        # @raise [RuntimeError]
-        #   if the CRS is not supported
-        def normalize(lon, lat)
-          case @crs
-          when CRS84
-            [lon, lat]
-
-          when EPSG4326
-            # EPSG:4326 uses (lat, lon)
-            [lat, lon]
-
-          when GK_ARGENTINA
-            gk_to_wgs84(lon, lat)
-
-          when EPSG3857
-            mercator_to_wgs84(lon, lat)
-
-          else
-            raise "Unsupported CRS: #{@crs}"
-          end
-        end
-
-        private
-
-        # Normalizes a CRS name into a comparable string.
-        #
-        # @param name [Object]
-        # @return [String]
-        def normalize_name(name)
-          return CRS84 if name.nil?
-
-          name.to_s.strip
-        end
-
-        # Converts Web Mercator coordinates to WGS84.
-        #
-        # @param x [Numeric] X coordinate in meters
-        # @param y [Numeric] Y coordinate in meters
-        # @return [Array<Float>] [longitude, latitude] in degrees
-        def mercator_to_wgs84(x, y)
-          r = 6378137.0
-          lon = (x / r) * 180.0 / Math::PI
-          lat = ((2 * Math.atan(Math.exp(y / r))) - (Math::PI / 2)) * 180.0 / Math::PI
-          [lon, lat]
-        end
-
-        # Converts Gauss–Krüger Argentina (zone 5) coordinates to WGS84.
-        #
-        # This implementation provides sufficient accuracy for
-        # cartographic rendering and visualization.
-        #
-        # @param easting [Numeric] easting (meters)
-        # @param northing [Numeric] northing (meters)
-        # @return [Array<Float>] [longitude, latitude] in degrees
-        def gk_to_wgs84(easting, northing)
-          # Parameters for Argentina GK Zone 5
-          a = 6378137.0
-          f = 1 / 298.257223563
-          e2 = (2 * f) - (f * f)
-          lon0 = -60.0 * Math::PI / 180.0 # central meridian zone 5
-
-          x = easting - 500000.0
-          y = northing
-
-          m = y
-          mu = m / (a * (1 - (e2 / 4) - (3 * e2 * e2 / 64)))
-
-          e1 = (1 - Math.sqrt(1 - e2)) / (1 + Math.sqrt(1 - e2))
-
-          j1 = (3 * e1 / 2) - (27 * (e1**3) / 32)
-          j2 = (21 * (e1**2) / 16) - (55 * (e1**4) / 32)
-
-          fp = mu + (j1 * Math.sin(2 * mu)) + (j2 * Math.sin(4 * mu))
-
-          c1 = e2 * (Math.cos(fp)**2)
-          t1 = Math.tan(fp)**2
-          r1 = a * (1 - e2) / ((1 - (e2 * (Math.sin(fp)**2)))**1.5)
-          n1 = a / Math.sqrt(1 - (e2 * (Math.sin(fp)**2)))
-
-          d = x / n1
-
-          lat = fp - ((n1 * Math.tan(fp) / r1) *
-                     (((d**2) / 2) - ((5 + (3 * t1) + (10 * c1)) * (d**4) / 24)))
-
-          lon = lon0 + ((d - ((1 + (2 * t1) + c1) * (d**3) / 6)) / Math.cos(fp))
-
-          [lon * 180.0 / Math::PI, lat * 180.0 / Math::PI]
-        end
-      end
-    end
-  end
-end

data/lib/test.rb

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