libgd-gis 0.2.5 → 0.2.7.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15adf406fc3424953ad3ac2fcf5d05bfab4d02268619793fabc2bc5ed5ec67f7
-  data.tar.gz: 3a073e0eab8c647fb9a142e5675e1bb138c58a68cb0f31fb03e09f063f848f7d
+  metadata.gz: 6559ec92e07ae18e0a783d5d822c676437c68896928d7e2a59143ffd0ef9bb7e
+  data.tar.gz: d1d343b32dbef5a5093746577db4b61d678a27d42949737079f3ba8e4c840a9a
 SHA512:
-  metadata.gz: 17a1eebdd7c9a4c1db7ffdff96965b61e5f0ac37548ea9955ed19dbc0812ac723f5be2a7ab203f26135aefeef2d39f44eff60ba0265bb868a379d5ab86a541ad
-  data.tar.gz: 0dd61743522c231ebf7df34c6c6a4da6dffc3c42fb539d5020a17f3a70c1a3ab5cc3fb78d6529f620fc5323a39cf2c02cd0097a3abc9e2f846a1a8f799727b2b
+  metadata.gz: 40cdba7a5707db6afde50b1358e6ae65eb936e34880d4ba2d593acfa72945cb09dc25661bab3dfdf7eefc6ea7f260171f9c38bc396dbeb2c42c83fc573964bd7
+  data.tar.gz: ac76fd31a7b28acae6067ed56ed4783d2dabb97992d19c841af25459204caf9e3180cd5bea9e74b9de8c583741ab187044ccbdcabd45ce1b2523438faf5c1b5b

data/lib/gd/gis/layer_points.rb

@@ -1,6 +1,8 @@
 module GD
   module GIS
     class PointsLayer
+      attr_accessor :data, :size
+
       def initialize(data, lon:, lat:, icon:, label: nil, font: nil, size: 12, color: [0,0,0])
         @data = data
         @lon = lon
@@ -15,6 +17,7 @@ module GD
         @label = label
         @font  = font
         @size  = size
+        @data = data
         @color = color
 
         @icon.alpha_blending = true

data/lib/gd/gis/map.rb

@@ -36,6 +36,10 @@ module GD
         @lines_layers    = []
         @polygons_layers = []
 
+        @dynamic_points = []
+        @dynamic_lines  = []
+        @dynamic_polys  = []
+
         @style = nil
       end
 
@@ -77,11 +81,35 @@ module GD
       # -----------------------------------
 
       def add_points(data, **opts)
-        @points_layers << GD::GIS::PointsLayer.new(data, **opts)
+        layer = GD::GIS::PointsLayer.new(data, **opts)
+        @points_layers << layer
+        layer
       end
 
-      def add_lines(features, **opts)
-        @lines_layers << GD::GIS::LinesLayer.new(features, **opts)
+      def add_line(coords, **opts)
+        feature = {
+          "type" => "Feature",
+          "geometry" => {
+            "type" => "LineString",
+            "coordinates" => coords
+          },
+          "properties" => {}
+        }
+
+        add_lines([feature], **opts)
+      end
+
+      def add_multiline(lines, **opts)
+        feature = {
+            "type" => "Feature",
+            "geometry" => {
+                      "type" => "MultiLineString",
+                      "coordinates" => lines
+            },
+            "properties" => []
+          }
+
+        add_lines([feature], **opts)
       end
 
       def add_polygons(polygons, **opts)
@@ -123,20 +151,26 @@ module GD
           )
         end
 
-        projection = lambda do |lon, lat|
+        @projection = lambda do |lon, lat|
           x, y = GD::GIS::Projection.lonlat_to_global_px(lon, lat, @zoom)
           [(x - origin_x).round, (y - origin_y).round]
         end
 
         # 1️⃣ Semantic GeoJSON layers (this is what was working)
         @style.order.each do |kind|
-          draw_layer(kind, projection)
+          draw_layer(kind, @projection)
         end
 
         # 2️⃣ Generic overlays
-        @polygons_layers.each { |l| l.render!(@image, projection) }
-        @lines_layers.each    { |l| l.render!(@image, projection) }
-        @points_layers.each   { |l| l.render!(@image, projection) }
+        @polygons_layers.each { |l| l.render!(@image, @projection) }
+        @lines_layers.each    { |l| l.render!(@image, @projection) }
+        @points_layers.each   { |l| l.render!(@image, @projection) }
+
+        @dynamic_polys.each  { |l| l.render!(@image, @projection) }
+        @dynamic_lines.each  { |l| l.render!(@image, @projection) }
+        @dynamic_points.each { |l| l.render!(@image, @projection) }
+
+        @image
       end
 
       def save(path)
@@ -173,7 +207,7 @@ module GD
 
             if style[:stroke]
               color = GD::Color.rgb(*style[:stroke])
-              f.draw(@image, projection, color, width, :water)
+              f.draw(@image, @projection, color, width, :water)
             end
 
           else
@@ -182,18 +216,67 @@ module GD
 
             if geom == "Polygon" || geom == "MultiPolygon"
               # THIS is the critical fix
-              f.draw(@image, projection, nil, nil, style)
+              f.draw(@image, @projection, nil, nil, style)
             else
               if style[:stroke]
                 color = GD::Color.rgb(*style[:stroke])
                 width = style[:stroke_width] || 1
-                f.draw(@image, projection, color, width)
+                f.draw(@image, @projection, color, width)
               end
             end
           end
         end
       end
 
+      def clear_dynamic_layers
+        @dynamic_points.clear
+        @dynamic_lines.clear
+        @dynamic_polys.clear
+      end
+
+      def add_dynamic_point(data, **opts)
+        @dynamic_points << GD::GIS::PointsLayer.new(data, **opts)
+      end
+
+      def add_dynamic_line(coords, **opts)
+        feature = {
+          "type" => "Feature",
+          "geometry" => {
+            "type" => "LineString",
+            "coordinates" => coords
+          },
+          "properties" => {}
+        }
+        @dynamic_lines << GD::GIS::LinesLayer.new([feature], **opts)
+      end
+
+      def render_base
+        render
+        @base_image = @image
+      end
+
+      def render_with_base
+        img = GD::Image.new(@base_image.width, @base_image.height)
+        img.copy(@base_image, 0,0, 0,0, @base_image.width, @base_image.height)
+
+        @points_layers.each   { |l| l.render!(img, @projection) }
+        @lines_layers.each    { |l| l.render!(img, @projection) }
+        @polygons_layers.each{ |l| l.render!(img, @projection) }
+
+        img
+      end
+
+      private
+
+      def add_lines(features, **opts)
+        stroke = opts.delete(:color) || opts.delete(:stroke)
+        width = opts.delete(:width) || opts.delete(:stroke_width)
+
+        raise ArgumentError, "missing :color or :stroke" unless stroke
+        raise ArgumentError, "missing :width" unless width
+
+        @lines_layers << GD::GIS::LinesLayer.new(features, :stroke => stroke, :width => width)
+      end
 
     end
   end

data/lib/gd/gis/ontology.yml

@@ -1,3 +1,7 @@
+# ============================================================
+#  WATER
+# ============================================================
+
 water:
   ign:
     objeto:
@@ -21,3 +25,243 @@ water:
       - lake
       - reservoir
       - riverbank
+
+  osm:
+    waterway:
+      - river
+      - stream
+      - canal
+      - drain
+      - ditch
+    natural:
+      - water
+      - lake
+      - reservoir
+      - wetland
+      - bay
+      - strait
+
+# ============================================================
+#  ROADS
+# ============================================================
+
+roads:
+  ign:
+    objeto:
+      - autopista
+      - ruta
+      - camino
+      - calle
+      - avenida
+
+  natural_earth:
+    featurecla:
+      - road
+      - highway
+
+  osm:
+    highway:
+      - motorway
+      - motorway_link
+      - trunk
+      - trunk_link
+      - primary
+      - primary_link
+      - secondary
+      - secondary_link
+      - tertiary
+      - tertiary_link
+      - residential
+      - unclassified
+      - service
+      - living_street
+      - pedestrian
+      - road
+      - busway
+      - track
+
+# ============================================================
+#  RAIL
+# ============================================================
+
+rail:
+  osm:
+    railway:
+      - rail
+      - subway
+      - light_rail
+      - tram
+      - monorail
+      - funicular
+
+# ============================================================
+#  PARKS & GREEN
+# ============================================================
+
+park:
+  ign:
+    objeto:
+      - parque
+      - plaza
+      - reserva
+
+  natural_earth:
+    featurecla:
+      - park
+      - protected_area
+
+  osm:
+    leisure:
+      - park
+      - garden
+      - pitch
+      - playground
+      - recreation_ground
+      - golf_course
+    landuse:
+      - grass
+      - meadow
+      - forest
+    natural:
+      - wood
+      - scrub
+      - heath
+      - grassland
+
+# ============================================================
+#  BUILDINGS
+# ============================================================
+
+buildings:
+  ign:
+    objeto:
+      - edificio
+      - hospital
+      - escuela
+
+  osm:
+    building:
+      - yes
+      - residential
+      - commercial
+      - industrial
+      - retail
+      - hospital
+      - school
+      - church
+      - cathedral
+      - university
+      - public
+      - civic
+      - apartments
+
+# ============================================================
+#  POI (Points of Interest)
+# ============================================================
+
+poi:
+  osm:
+    amenity:
+      - hospital
+      - school
+      - university
+      - cafe
+      - restaurant
+      - bar
+      - pharmacy
+      - bank
+      - atm
+      - police
+      - fire_station
+      - library
+      - cinema
+      - theatre
+      - post_office
+      - fuel
+    shop:
+      - supermarket
+      - bakery
+      - convenience
+      - clothes
+      - mall
+      - department_store
+      - butcher
+      - greengrocer
+      - fast_food
+
+# ============================================================
+#  TRANSPORT
+# ============================================================
+
+transport:
+  osm:
+    aeroway:
+      - aerodrome
+      - runway
+      - taxiway
+      - apron
+      - terminal
+    public_transport:
+      - station
+      - stop_position
+      - platform
+
+# ============================================================
+#  NATURAL FEATURES
+# ============================================================
+
+natural:
+  natural_earth:
+    featurecla:
+      - mountain
+      - peak
+      - hill
+      - volcano
+
+  osm:
+    natural:
+      - peak
+      - hill
+      - volcano
+      - ridge
+      - cliff
+      - dune
+
+# ============================================================
+#  LANDUSE
+# ============================================================
+
+landuse:
+  osm:
+    landuse:
+      - residential
+      - commercial
+      - industrial
+      - retail
+      - farmland
+      - forest
+      - grass
+      - meadow
+      - quarry
+      - cemetery
+      - landfill
+      - recreation_ground
+roads:
+  osm_geofabrik:
+    fclass:
+      - motorway
+      - motorway_link
+      - trunk
+      - trunk_link
+      - primary
+      - primary_link
+      - secondary
+      - secondary_link
+      - tertiary
+      - tertiary_link
+      - residential
+      - unclassified
+      - service
+      - living_street
+      - pedestrian
+      - road

data/lib/gd/gis/path_sampler.rb

@@ -0,0 +1,68 @@
+require "json"
+
+module GD
+  module GIS
+    class PathSampler
+      def initialize(coords)
+        @coords = coords
+        @segments = []
+        @total = 0.0
+
+        coords.each_cons(2) do |a,b|
+          d = haversine(a[0],a[1], b[0],b[1])
+          @segments << [a,b,d]
+          @total += d
+        end
+      end
+
+      def point_at(t)
+        target = t * @total
+        acc = 0.0
+
+        @segments.each do |a,b,d|
+          return interpolate(a,b,(target-acc)/d) if acc + d >= target
+          acc += d
+        end
+
+        @coords.last
+      end
+
+      def interpolate(a,b,t)
+        [
+          a[0] + (b[0]-a[0])*t,
+          a[1] + (b[1]-a[1])*t
+        ]
+      end
+
+      def haversine(lon1,lat1,lon2,lat2)
+        r = 6371000
+        dlat = (lat2-lat1) * Math::PI/180
+        dlon = (lon2-lon1) * Math::PI/180
+        a = Math.sin(dlat/2)**2 +
+            Math.cos(lat1*Math::PI/180)*Math.cos(lat2*Math::PI/180)*
+            Math.sin(dlon/2)**2
+        2 * r * Math.atan2(Math.sqrt(a), Math.sqrt(1-a))
+      end
+
+      def self.from_geojson(path)
+        data = JSON.parse(File.read(path))
+
+        coords =
+        if data["features"]
+        data["features"][0]["geometry"]["coordinates"]
+
+        elsif data["paths"]
+        data["paths"][0]["points"]["coordinates"]
+
+        elsif data["routes"]
+        data["routes"][0]["geometry"]["coordinates"]
+
+        else
+        raise "Formato de ruta desconocido en #{path}"
+        end
+
+        new(coords)
+      end
+    end
+  end
+end

data/lib/gd/gis.rb

@@ -12,3 +12,4 @@ require_relative "gis/layer_points"
 require_relative "gis/layer_lines"
 require_relative "gis/layer_polygons"
 require_relative "gis/layer_geojson"
+require_relative "gis/path_sampler"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgd-gis
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7.pre.alpha.1
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
@@ -15,20 +15,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 description: A native GIS raster engine for Ruby built on libgd. Render maps, GeoJSON,
   heatmaps and tiles.
 email:
@@ -56,6 +56,7 @@ files:
 - lib/gd/gis/map.rb
 - lib/gd/gis/ontology.rb
 - lib/gd/gis/ontology.yml
+- lib/gd/gis/path_sampler.rb
 - lib/gd/gis/projection.rb
 - lib/gd/gis/style.rb
 - lib/gd/gis/style/dark.rb
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.4
 specification_version: 4
 summary: Geospatial raster rendering for Ruby using libgd
 test_files: []