libgd-gis 0.1.2 → 0.1.3

data/lib/gd/gis/basemap.rb

@@ -5,6 +5,7 @@ module GD
   module GIS
     class Basemap
       TILE_SIZE = 256
+      attr_reader :origin_x, :origin_y
 
       def initialize(zoom, bbox, provider=:carto_light)
         @zoom = zoom
@@ -12,8 +13,93 @@ module GD
         @provider = provider
       end
 
-      def url(z,x,y)
-        "https://tile.openstreetmap.org/#{z}/#{x}/#{y}.png"
+      def url(z, x, y, style = :osm)
+        case style
+
+        # ==============================
+        # OpenStreetMap
+        # ==============================
+        when :osm
+          "https://tile.openstreetmap.org/#{z}/#{x}/#{y}.png"
+
+        when :osm_hot
+          "https://tile.openstreetmap.fr/hot/#{z}/#{x}/#{y}.png"
+
+        when :osm_fr
+          "https://a.tile.openstreetmap.fr/osmfr/#{z}/#{x}/#{y}.png"
+
+        # ==============================
+        # CARTO
+        # ==============================
+        when :carto_light
+          "https://a.basemaps.cartocdn.com/light_all/#{z}/#{x}/#{y}.png"
+
+        when :carto_light_nolabels
+          "https://a.basemaps.cartocdn.com/light_nolabels/#{z}/#{x}/#{y}.png"
+
+        when :carto_dark
+          "https://a.basemaps.cartocdn.com/dark_all/#{z}/#{x}/#{y}.png"
+
+        when :carto_dark_nolabels
+          "https://a.basemaps.cartocdn.com/dark_nolabels/#{z}/#{x}/#{y}.png"
+
+        # ==============================
+        # ESRI / ArcGIS (Satellite, terrain, hybrid)
+        # ==============================
+        when :esri_satellite
+          "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/#{z}/#{y}/#{x}"
+
+        when :esri_streets
+          "https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/#{z}/#{y}/#{x}"
+
+        when :esri_terrain
+          "https://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/#{z}/#{y}/#{x}"
+
+        when :esri_hybrid
+          "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/#{z}/#{y}/#{x}"
+
+        # ==============================
+        # STAMEN
+        # ==============================
+        when :stamen_toner
+          "https://stamen-tiles.a.ssl.fastly.net/toner/#{z}/#{x}/#{y}.png"
+
+        when :stamen_toner_lite
+          "https://stamen-tiles.a.ssl.fastly.net/toner-lite/#{z}/#{x}/#{y}.png"
+
+        when :stamen_terrain
+          "https://stamen-tiles.a.ssl.fastly.net/terrain/#{z}/#{x}/#{y}.png"
+
+        when :stamen_watercolor
+          "https://stamen-tiles.a.ssl.fastly.net/watercolor/#{z}/#{x}/#{y}.jpg"
+
+        # ==============================
+        # OpenTopoMap
+        # ==============================
+        when :topo
+          "https://a.tile.opentopomap.org/#{z}/#{x}/#{y}.png"
+
+        # ==============================
+        # Wikimedia
+        # ==============================
+        when :wikimedia
+          "https://maps.wikimedia.org/osm-intl/#{z}/#{x}/#{y}.png"
+
+        # ==============================
+        # OpenRailwayMap
+        # ==============================
+        when :railway
+          "https://tiles.openrailwaymap.org/standard/#{z}/#{x}/#{y}.png"
+
+        # ==============================
+        # CyclOSM
+        # ==============================
+        when :cyclosm
+          "https://a.tile-cyclosm.openstreetmap.fr/cyclosm/#{z}/#{x}/#{y}.png"
+
+        else
+          raise "Unknown basemap style: #{style}"
+        end
       end
 
       def lon2tile(lon)
@@ -36,30 +122,51 @@ module GD
         @x_min = x_min
         @y_min = y_min
 
+        @origin_x = x_min * TILE_SIZE
+        @origin_y = y_min * TILE_SIZE
+
         FileUtils.mkdir_p("tmp/tiles")
 
         tiles = []
 
         (x_min..x_max).each do |x|
           (y_min..y_max).each do |y|
-            path = "tmp/tiles/#{@zoom}_#{x}_#{y}.png"
-            unless File.exist?(path)
-              uri = URI(url(@zoom,x,y))
+            path = nil
+
+            unless File.exist?("tmp/tiles/#{@provider}_#{@zoom}_#{x}_#{y}.png") ||
+                  File.exist?("tmp/tiles/#{@provider}_#{@zoom}_#{x}_#{y}.jpg")
+
+              uri = URI(url(@zoom, x, y, @provider))
 
               Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
                 req = Net::HTTP::Get.new(uri)
                 req["User-Agent"] = "libgd-gis/0.1 (Ruby)"
 
                 res = http.request(req)
+                raise "Tile fetch failed #{res.code}" unless res.code == "200"
+
+                content_type = res["content-type"]
 
-                unless res.code == "200"
-                  raise "Tile fetch failed #{res.code}"
-                end
+                ext =
+                  if content_type&.include?("png")
+                    "png"
+                  elsif content_type&.include?("jpeg") || content_type&.include?("jpg")
+                    "jpg"
+                  else
+                    raise "Unsupported tile type: #{content_type}"
+                  end
 
+                path = "tmp/tiles/#{@provider}_#{@zoom}_#{x}_#{y}.#{ext}"
                 File.binwrite(path, res.body)
               end
-
+            else
+              if File.exist?("tmp/tiles/#{@provider}_#{@zoom}_#{x}_#{y}.png")
+                path = "tmp/tiles/#{@provider}_#{@zoom}_#{x}_#{y}.png"
+              else
+                path = "tmp/tiles/#{@provider}_#{@zoom}_#{x}_#{y}.jpg"
+              end
             end
+
             tiles << [x,y,path]
           end
         end

data/lib/gd/gis/geometry.rb

@@ -0,0 +1,40 @@
+module GD
+  module GIS
+    module Geometry
+      def self.buffer_line(coords, meters)
+        left = []
+        right = []
+
+        coords.each_cons(2) do |a,b|
+          x1,y1 = a
+          x2,y2 = b
+
+          dx = x2 - x1
+          dy = y2 - y1
+
+          len = Math.sqrt(dx*dx + dy*dy)
+          next if len == 0
+
+          # normal vector
+          nx = -dy / len
+          ny = dx / len
+
+          # offset in degrees (approx)
+          # 1 meter ≈ 1 / 111_320 degrees
+          off = meters / 111_320.0
+
+          left  << [x1 + nx*off, y1 + ny*off]
+          right << [x1 - nx*off, y1 - ny*off]
+        end
+
+        # add last point
+        x2,y2 = coords.last
+        left  << [x2, y2]
+        right << [x2, y2]
+
+        polygon = left + right.reverse
+        polygon
+      end
+    end
+  end
+end

data/lib/gd/gis/layer_lines.rb

@@ -0,0 +1,36 @@
+module GD
+  module GIS
+    class LinesLayer
+      def initialize(features, stroke:, width:)
+        @features = features
+        @stroke = stroke
+        @width = width
+      end
+
+      def render!(img, projection)
+        @features.each do |f|
+          geom = f["geometry"]
+
+          case geom["type"]
+          when "LineString"
+            draw_line(geom["coordinates"], img, projection)
+          when "MultiLineString"
+            geom["coordinates"].each do |line|
+              draw_line(line, img, projection)
+            end
+          end
+        end
+      end
+
+      def draw_line(coords, img, projection)
+        pts = coords.map { |p| projection.call(p[0], p[1]) }
+
+        (0...pts.size-1).each do |i|
+          x1,y1 = pts[i]
+          x2,y2 = pts[i+1]
+          img.line(x1,y1,x2,y2,@stroke, thickness: @width)
+        end
+      end
+    end
+  end
+end

data/lib/gd/gis/layer_points.rb

@@ -5,7 +5,12 @@ module GD
         @data = data
         @lon = lon
         @lat = lat
-        @icon = GD::Image.open(icon)
+
+        if icon
+          @icon = GD::Image.open(icon)
+        else
+          @icon = build_default_marker
+        end
 
         @label = label
         @font  = font
@@ -16,6 +21,31 @@ module GD
         @icon.save_alpha = true
       end
 
+      def build_default_marker
+        size = 32
+        img = GD::Image.new(size, size)
+        img.alpha_blending = true
+        img.save_alpha = true
+
+        transparent = GD::Color.rgba(0,0,0,0)
+        img.filled_rectangle(0,0,size,size,transparent)
+
+        white = GD::Color.rgb(255,255,255)
+        black = GD::Color.rgb(0,0,0)
+
+        cx = size / 2
+        cy = size / 2
+        r  = 12
+
+        # borde blanco
+        img.arc(cx, cy, r*2+4, r*2+4, 0, 360, white)
+
+        # relleno negro
+        img.filled_arc(cx, cy, r*2, r*2, 0, 360, black)
+
+        img
+      end
+
       def render!(img, projector)
         w = @icon.width
         h = @icon.height

data/lib/gd/gis/layer_polygons.rb

@@ -0,0 +1,38 @@
+module GD
+  module GIS
+    class PolygonsLayer
+      def initialize(polygons, fill:, stroke: nil, width: nil)
+        @polygons = polygons
+        @fill = fill
+        @stroke = stroke
+        @width = width
+      end
+
+      def self.from_lines(features, stroke:, fill:, width:)
+        polys = []
+
+        features.each do |f|
+          coords = f["geometry"]["coordinates"]
+          poly = Geometry.buffer_line(coords, width)
+          polys << poly
+        end
+
+        new(polys, fill: fill, stroke: stroke)
+      end
+
+      def render!(img, projection)
+        @polygons.each do |poly|
+          pts = poly.map { |p| projection.call(p[0], p[1]) }
+
+          img.filled_polygon(pts, @fill)
+
+          if @stroke
+            pts.each_cons(2) do |a,b|
+              img.line(a[0],a[1],b[0],b[1],@stroke, thickness: 1)
+            end
+          end
+        end
+      end
+    end
+  end
+end