libgd-gis 0.1.0 → 0.1.2

data/lib/gd/gis/basemap.rb

@@ -13,7 +13,7 @@ module GD
       end
 
       def url(z,x,y)
-        "https://basemaps.cartocdn.com/light_all/#{z}/#{x}/#{y}.png"
+        "https://tile.openstreetmap.org/#{z}/#{x}/#{y}.png"
       end
 
       def lon2tile(lon)
@@ -45,10 +45,20 @@ module GD
             path = "tmp/tiles/#{@zoom}_#{x}_#{y}.png"
             unless File.exist?(path)
               uri = URI(url(@zoom,x,y))
+
               Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-                res = http.get(uri.path)
+                req = Net::HTTP::Get.new(uri)
+                req["User-Agent"] = "libgd-gis/0.1 (Ruby)"
+
+                res = http.request(req)
+
+                unless res.code == "200"
+                  raise "Tile fetch failed #{res.code}"
+                end
+
                 File.binwrite(path, res.body)
               end
+
             end
             tiles << [x,y,path]
           end

data/lib/gd/gis/layer_points.rb

@@ -1,14 +1,22 @@
 module GD
   module GIS
     class PointsLayer
-      def initialize(data, lon:, lat:, icon:)
+      def initialize(data, lon:, lat:, icon:, label: nil, font: nil, size: 12, color: [0,0,0])
         @data = data
         @lon = lon
         @lat = lat
         @icon = GD::Image.open(icon)
+
+        @label = label
+        @font  = font
+        @size  = size
+        @color = color
+
+        @icon.alpha_blending = true
+        @icon.save_alpha = true
       end
 
-      def render!(img, projection)
+      def render!(img, projector)
         w = @icon.width
         h = @icon.height
 
@@ -16,8 +24,26 @@ module GD
           lon = @lon.call(row)
           lat = @lat.call(row)
 
-          x,y = projection.call(lon,lat)
+          x,y = projector.call(lon,lat)
+
+          # icono
           img.copy(@icon, x - w/2, y - h/2, 0,0,w,h)
+
+          # etiqueta opcional
+          if @label && @font
+            text = @label.call(row)
+            unless text.nil? || text.strip.empty?
+              font_h = @size * 1.1
+
+              img.text(text,
+                x: x + w/2 + 4,
+                y: y + font_h/2,
+                size: @size,
+                color: @color,
+                font: @font
+              )
+            end
+          end
         end
       end
     end

data/lib/gd/gis/map.rb

@@ -13,13 +13,25 @@ module GD
         @layers = []
       end
 
-      def add_points(data, lon:, lat:, icon:)
-        @layers << PointsLayer.new(data, lon: lon, lat: lat, icon: icon)
+      def add_points(data, lon:, lat:, icon:, label: nil, font: nil, size: 12, color: [0,0,0])
+        @layers << PointsLayer.new(
+          data,
+          lon: lon,
+          lat: lat,
+          icon: icon,
+          label: label,
+          font: font,
+          size: size,
+          color: color
+        )
       end
 
       def render
         tiles, x_min, y_min = @basemap.fetch_tiles
 
+        x0 = x_min * 256
+        y0 = y_min * 256
+
         cols = tiles.map{|t| t[0]}.uniq.size
         rows = tiles.map{|t| t[1]}.uniq.size
 
@@ -27,6 +39,8 @@ module GD
         height = rows * 256
 
         @img = GD::Image.new(width,height)
+        @img.alpha_blending = true
+        @img.save_alpha = true
 
         tiles.each do |x,y,path|
           tile = GD::Image.open(path)
@@ -42,7 +56,11 @@ module GD
         max_y = Projection.mercator_y(@bbox[3])
 
         projector = ->(lon,lat) {
-          Projection.lonlat_to_pixel(lon,lat,min_x,max_x,min_y,max_y,width,height)
+          px = ((lon + 180.0) / 360.0 * (2 ** @zoom) * 256)
+          rad = lat * Math::PI / 180.0
+          py = ((1 - Math.log(Math.tan(rad) + 1 / Math.cos(rad)) / Math::PI) / 2 * (2 ** @zoom) * 256)
+
+          [ (px - x0).to_i, (py - y0).to_i ]
         }
 
         @layers.each { |l| l.render!(@img, projector) }
@@ -96,6 +114,8 @@ module GD
 
         # recortar al tamaño exacto del tile
         img = GD::Image.new(256,256)
+        img.alpha_blending = true
+        img.save_alpha = true
         img.copy(submap.instance_variable_get(:@img), 0,0,0,0,256,256)
         img
       end