libgd-gis 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff2a73817209bdd6e71f77b83cd0f7ffaee27327e95c199e01bf9eb879b2ff53
-  data.tar.gz: d5fe87d75561eba31a1cae4c46902a16dfcd9a70b525f8d6772682f05f1f9c56
+  metadata.gz: fa4dd3c210385e6b89998eeccbc88c4e82d5c45b6081be260b98843b4bd01124
+  data.tar.gz: c0e6f00da6d017e7d30f8ccc6c14b4a16ee3a5e7799d5cbf8c4a4b72b137bde6
 SHA512:
-  metadata.gz: a9e41b51e0e1365eb60905131e2766981de954d74b92b16ba8abb45224e3c6df9215a96628cf23f7c90c6675d2acf98dbafe326c569ee45440dcedd1502f5d7d
-  data.tar.gz: d2598e4392ee4c400a0cf2982d91916119222f9ec4dd869b4851d0b994a0a241f39ef483e720d66121fd070af3b4ba5c46068d2194d8a09b9ed4b61cfa259192
+  metadata.gz: fd5c30cbcdae3f214a9f0fb9605edd1244ca161774fc6e60fabcff70688b9b3712bc7444be326fd88c5517d470bfa8c06d8bc0522ca470edc86e5608235a26e9
+  data.tar.gz: 1cfd799c2c1abfb457ad761de7b293a97b5f880ddd55cd4e02298820c91f344977ee176abf8d7da9b77594247a1c8c1a1f34db951f69f15ff00ed7748d3c4da5

data/lib/gd/gis/bbox_resolver.rb

@@ -0,0 +1,27 @@
+module GD
+  module GIS
+    module BBoxResolver
+      def self.resolve(bbox)
+        case bbox
+        when Symbol, String
+          Extents.fetch(bbox)
+
+        when Array
+          validate!(bbox)
+          bbox.map(&:to_f)
+
+        else
+          raise ArgumentError,
+            "bbox must be Symbol, String or [min_lng, min_lat, max_lng, max_lat]"
+        end
+      end
+
+      def self.validate!(bbox)
+        unless bbox.is_a?(Array) && bbox.size == 4
+          raise ArgumentError,
+            "bbox must be [min_lng, min_lat, max_lng, max_lat]"
+        end
+      end
+    end
+  end
+end

data/lib/gd/gis/data/extents_global.json

@@ -0,0 +1,95 @@
+{
+  "world": [-180.0, -90.0, 180.0, 90.0],
+
+  "northern_hemisphere": [-180.0, 0.0, 180.0, 90.0],
+  "southern_hemisphere": [-180.0, -90.0, 180.0, 0.0],
+  "eastern_hemisphere": [0.0, -90.0, 180.0, 90.0],
+  "western_hemisphere": [-180.0, -90.0, 0.0, 90.0],
+
+  "africa": [-25.0, -35.0, 51.0, 38.0],
+  "antarctica": [-180.0, -90.0, 180.0, -60.0],
+  "asia": [26.0, -11.0, 169.0, 78.0],
+  "europe": [-31.0, 34.0, 39.0, 72.0],
+  "north_america": [-168.0, 7.0, -52.0, 83.0],
+  "south_america": [-82.0, -56.0, -34.0, 13.0],
+  "oceania": [110.0, -50.0, 180.0, 0.0],
+
+  "argentina": [-73.6, -55.1, -53.6, -21.7],
+  "bolivia": [-69.7, -22.9, -57.5, -9.7],
+  "brazil": [-74.0, -34.0, -34.0, 5.3],
+  "chile": [-75.6, -56.0, -66.4, -17.5],
+  "colombia": [-79.0, -4.2, -66.9, 13.5],
+  "ecuador": [-81.0, -5.0, -75.0, 1.5],
+  "guyana": [-61.4, 1.2, -56.5, 8.6],
+  "paraguay": [-62.6, -27.6, -54.3, -19.3],
+  "peru": [-81.4, -18.4, -68.7, -0.0],
+  "suriname": [-58.1, 1.8, -53.9, 6.0],
+  "uruguay": [-58.4, -35.0, -53.1, -30.1],
+  "venezuela": [-73.4, 0.6, -59.8, 12.2],
+
+  "canada": [-141.0, 41.0, -52.6, 83.1],
+  "united_states": [-125.0, 24.0, -66.9, 49.4],
+  "mexico": [-118.4, 14.5, -86.7, 32.7],
+  "greenland": [-73.0, 59.8, -12.2, 83.6],
+
+  "iceland": [-24.5, 63.3, -13.5, 66.6],
+  "ireland": [-10.5, 51.4, -6.0, 55.5],
+  "united_kingdom": [-8.6, 49.8, 1.8, 60.9],
+  "portugal": [-9.6, 36.9, -6.2, 42.2],
+  "spain": [-9.5, 35.9, 3.3, 43.8],
+  "france": [-5.2, 41.3, 9.6, 51.1],
+  "belgium": [2.5, 49.5, 6.4, 51.5],
+  "netherlands": [3.3, 50.7, 7.2, 53.7],
+  "germany": [5.9, 47.3, 15.0, 55.1],
+  "switzerland": [5.9, 45.8, 10.5, 47.8],
+  "italy": [6.6, 36.6, 18.5, 47.1],
+  "austria": [9.5, 46.4, 17.2, 49.0],
+  "poland": [14.1, 49.0, 24.1, 54.8],
+  "czechia": [12.1, 48.5, 18.9, 51.1],
+  "hungary": [16.1, 45.7, 22.9, 48.6],
+  "greece": [19.4, 34.8, 28.2, 41.8],
+  "norway": [4.9, 58.0, 31.3, 71.2],
+  "sweden": [11.1, 55.3, 24.2, 69.1],
+  "finland": [20.6, 59.8, 31.6, 70.1],
+  "denmark": [8.0, 54.5, 12.7, 57.8],
+
+  "turkey": [26.0, 36.0, 45.0, 42.1],
+  "russia": [19.0, 41.0, 180.0, 82.0],
+
+  "saudi_arabia": [34.5, 16.3, 55.7, 32.2],
+  "iran": [44.0, 25.0, 63.3, 39.8],
+  "iraq": [38.8, 29.0, 48.6, 37.4],
+  "israel": [34.2, 29.5, 35.9, 33.3],
+  "jordan": [34.9, 29.2, 39.3, 33.4],
+  "syria": [35.7, 32.3, 42.4, 37.3],
+
+  "india": [68.1, 6.5, 97.4, 35.5],
+  "pakistan": [60.9, 23.7, 77.8, 37.1],
+  "bangladesh": [88.0, 20.7, 92.7, 26.6],
+  "china": [73.5, 18.1, 135.1, 53.6],
+  "mongolia": [87.7, 41.6, 119.9, 52.1],
+  "japan": [129.4, 31.0, 145.8, 45.5],
+  "south_korea": [125.0, 33.1, 131.9, 38.6],
+  "north_korea": [124.0, 37.7, 130.7, 43.0],
+
+  "thailand": [97.3, 5.6, 105.6, 20.5],
+  "vietnam": [102.1, 8.2, 109.5, 23.4],
+  "malaysia": [99.6, 0.8, 119.3, 7.4],
+  "indonesia": [95.0, -11.0, 141.0, 6.0],
+  "philippines": [116.9, 4.6, 126.6, 21.2],
+
+  "egypt": [24.7, 22.0, 36.9, 31.7],
+  "libya": [9.3, 19.5, 25.1, 33.2],
+  "algeria": [-8.7, 19.0, 12.0, 37.1],
+  "morocco": [-13.2, 27.7, -1.0, 35.9],
+  "tunisia": [7.5, 30.2, 11.6, 37.3],
+
+  "nigeria": [2.7, 4.2, 14.7, 13.9],
+  "ethiopia": [32.9, 3.4, 47.9, 14.9],
+  "kenya": [33.9, -4.7, 41.9, 5.0],
+  "south_africa": [16.4, -34.8, 32.9, -22.1],
+
+  "australia": [112.9, -43.7, 153.6, -10.7],
+  "new_zealand": [166.4, -47.3, 178.6, -34.4],
+  "papua_new_guinea": [140.8, -11.7, 156.0, -1.4]
+}

data/lib/gd/gis/extents.rb

@@ -0,0 +1,39 @@
+require "json"
+
+module GD
+  module GIS
+    module Extents
+      DATA_PATH = File.expand_path(
+        "data/extents_global.json",
+        __dir__
+      )
+
+      @extents = nil
+
+      class << self
+        def fetch(name)
+          load_data!
+          @extents.fetch(name.to_s.downcase) do
+            raise ArgumentError, "Unknown extent: #{name}"
+          end
+        end
+
+        def [](name)
+          fetch(name)
+        end
+
+        def all
+          load_data!
+          @extents.keys.map(&:to_sym)
+        end
+
+        private
+
+        def load_data!
+          return if @extents
+          @extents = JSON.parse(File.read(DATA_PATH))
+        end
+      end
+    end
+  end
+end

data/lib/gd/gis/layer_points.rb

@@ -101,16 +101,15 @@ module GD
       #
       # @return [void]
       def render!(img, projector)
-        value = case @icon
-                when "numeric"
-                  @symbol
-                when "alphabetic"
-                  (@symbol + 96).chr
-                when "symbol"
-                  @symbol
-                else
-                  @icon
-                end
+        value =
+          case @icon
+          when "numeric", "symbol"
+            @symbol
+          when "alphabetic"
+            (@symbol + 96).chr
+          else
+            @icon
+          end
 
         if @icon.is_a?(GD::Image)
           w = @icon.width
@@ -176,7 +175,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

@@ -1,9 +1,27 @@
-# lib/libgd/gis/legend.rb
+# lib/gd/gis/legend.rb
 
 module GD
   module GIS
     LegendItem = Struct.new(:color, :label)
 
+    # Represents a map legend rendered as part of the final image.
+    #
+    # A Legend provides visual context for map elements by associating
+    # colors or symbols with human-readable labels.
+    #
+    # Legends are rendered server-side and embedded directly into the
+    # resulting map image, allowing the map to be self-explanatory
+    # without relying on external UI components.
+    #
+    # A Legend is typically created and configured via {Map#legend}
+    # and rendered automatically during the map rendering pipeline.
+    #
+    # @example Creating a legend
+    #   map.legend do |l|
+    #     l.add [76, 175, 80, 0], "Delivered"
+    #     l.add [255, 193, 7, 0], "In transit"
+    #     l.add [244, 67, 54, 0], "Delayed"
+    #
     class Legend
       attr_reader :items, :position
 

data/lib/gd/gis/map.rb

@@ -43,8 +43,6 @@ module GD
       # @return [Boolean] enables debug rendering
       attr_reader :debug
 
-      attr_reader :legend
-
       # Creates a new map.
       #
       # @param bbox [Array<Float>]
@@ -72,6 +70,9 @@ module GD
         crs: nil,
         fitted_bbox: false
       )
+        # resolve symbolic bbox
+        bbox = GD::GIS::BBoxResolver.resolve(bbox)
+
         # 1. Basic input validation
         raise ArgumentError, "bbox must be [min_lng, min_lat, max_lng, max_lat]" unless
           bbox.is_a?(Array) && bbox.size == 4
@@ -230,6 +231,7 @@ module GD
 
         layers.each do |layer|
           next unless layer.respond_to?(:color)
+
           @legend.add(layer.color, layer.name)
         end
       end
@@ -272,8 +274,8 @@ module GD
           w
         end
 
-        width  = (text_widths.max || 0) + box_size + padding * 3
-        height = @legend.items.size * line_height + padding * 2
+        width  = (text_widths.max || 0) + box_size + (padding * 3)
+        height = (@legend.items.size * line_height) + (padding * 2)
 
         # --- position --------------------------------------------
 
@@ -285,8 +287,6 @@ module GD
             [margin, @image.height - height - margin]
           when :top_right
             [@image.width - width - margin, margin]
-          when :top_left
-            [margin, margin]
           else
             [margin, margin]
           end
@@ -302,7 +302,7 @@ module GD
         # --- items -----------------------------------------------
 
         @legend.items.each_with_index do |item, idx|
-          iy = y + padding + idx * line_height
+          iy = y + padding + (idx * line_height)
 
           # color box
           @image.filled_rectangle(
@@ -484,10 +484,10 @@ module GD
 
         @points_layers << GD::GIS::PointsLayer.new(
           [row],
-          lon: -> r { r[:lon] },
-          lat: -> r { r[:lat] },
+          lon: ->(r) { r[:lon] },
+          lat: ->(r) { r[:lat] },
           icon: icon || @style.point[:icon],
-          label: label ? -> r { r[:label] } : nil,
+          label: label ? ->(r) { r[:label] } : nil,
           font: font || @style.point[:font],
           size: size || @style.point[:size],
           color: color || @style.point[:color],
@@ -585,7 +585,7 @@ 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
 
@@ -646,7 +646,7 @@ 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
 

data/lib/gd/gis.rb

@@ -32,6 +32,9 @@ require_relative "gis/font_helper"
 require_relative "gis/style"
 require_relative "gis/classifier"
 
+require_relative "gis/extents"
+require_relative "gis/bbox_resolver"
+
 require_relative "gis/feature"
 require_relative "gis/map"
 require_relative "gis/basemap"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgd-gis
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
@@ -40,9 +40,12 @@ files:
 - README.md
 - lib/gd/gis.rb
 - lib/gd/gis/basemap.rb
+- lib/gd/gis/bbox_resolver.rb
 - lib/gd/gis/classifier.rb
 - lib/gd/gis/color_helpers.rb
 - lib/gd/gis/crs_normalizer.rb
+- lib/gd/gis/data/extents_global.json
+- lib/gd/gis/extents.rb
 - lib/gd/gis/feature.rb
 - lib/gd/gis/font_helper.rb
 - lib/gd/gis/geometry.rb