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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c36a99210906574c046daffe2120213b027d92fdd22dec0b27861df22f88029
-  data.tar.gz: bd991fd3290c3bfb82f5640dad84c8e6486368285539774eed1b942acd7848b6
+  metadata.gz: 6559ec92e07ae18e0a783d5d822c676437c68896928d7e2a59143ffd0ef9bb7e
+  data.tar.gz: d1d343b32dbef5a5093746577db4b61d678a27d42949737079f3ba8e4c840a9a
 SHA512:
-  metadata.gz: 6bed27a3930a9512b0f5fff46fdfe2f76fe76932ddf263cc2d219cdaafd754d5161ede878f1b0d929e5a7b00b9c4b546c6905d9ee27d9bc478d5e7914ebc1784
-  data.tar.gz: ee203f7b9dc6f0a2669bbbedcde1e6fe31678c3a847c79a14d975c75cee1cc0a7f2784398acbef9b821943cce9124bdb5b41f0194070ff020fa39824f699a56a
+  metadata.gz: 40cdba7a5707db6afde50b1358e6ae65eb936e34880d4ba2d593acfa72945cb09dc25661bab3dfdf7eefc6ea7f260171f9c38bc396dbeb2c42c83fc573964bd7
+  data.tar.gz: ac76fd31a7b28acae6067ed56ed4783d2dabb97992d19c841af25459204caf9e3180cd5bea9e74b9de8c583741ab187044ccbdcabd45ce1b2523438faf5c1b5b

data/lib/gd/gis/crs_normalizer.rb

@@ -0,0 +1,57 @@
+module GD
+  module GIS
+    module CRS
+      CRS84    = "urn:ogc:def:crs:OGC:1.3:CRS84"
+      EPSG4326 = "EPSG:4326"
+      EPSG3857 = "EPSG:3857"
+
+      class Normalizer
+        def initialize(crs)
+          @crs = normalize_name(crs)
+        end
+
+        # Accepts:
+        #   normalize(lon,lat)
+        #   normalize(lon,lat,z)
+        #   normalize([lon,lat])
+        #   normalize([lon,lat,z])
+        def normalize(*args)
+          lon, lat = args.flatten
+          return nil if lon.nil? || lat.nil?
+
+          lon = lon.to_f
+          lat = lat.to_f
+
+          case @crs
+          when CRS84, nil
+            [lon, lat]
+
+          when EPSG4326
+            # axis order lat,lon → lon,lat
+            [lat, lon]
+
+          when EPSG3857
+            mercator_to_wgs84(lon, lat)
+
+          else
+            [lon, lat]
+          end
+        end
+
+        private
+
+        def normalize_name(name)
+          return nil if name.nil?
+          name.to_s.strip
+        end
+
+        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
+      end
+    end
+  end
+end

data/lib/gd/gis/feature.rb

@@ -1,11 +1,12 @@
 module GD
   module GIS
     class Feature
-      attr_reader :geometry, :properties
+      attr_reader :geometry, :properties, :layer
 
-      def initialize(geometry, properties)
+      def initialize(geometry, properties, layer = nil)
         @geometry   = geometry
         @properties = properties || {}
+        @layer      = layer
       end
 
       # -------------------------------------------------

data/lib/gd/gis/input/detector.rb

@@ -0,0 +1,34 @@
+module GD
+  module GIS
+    module Input
+      module Detector
+        def self.detect(path)
+          return :geojson   if geojson?(path)
+          return :kml       if kml?(path)
+          return :shapefile if shapefile?(path)
+          return :osm_pbf   if pbf?(path)
+          :unknown
+        end
+
+        def self.geojson?(path)
+          File.open(path) do |f|
+            head = f.read(2048)
+            head.include?('"FeatureCollection"') || head.include?('"GeometryCollection"')
+          end
+        end
+
+        def self.kml?(path)
+          File.open(path) { |f| f.read(512).include?("<kml") }
+        end
+
+        def self.shapefile?(path)
+          File.open(path, "rb") { |f| f.read(4) == "\x00\x00\x27\x0A" }
+        end
+
+        def self.pbf?(path)
+          File.open(path, "rb") { |f| f.read(2) == "\x1f\x8b" }
+        end
+      end
+    end
+  end
+end

data/lib/gd/gis/layer_geojson.rb

@@ -1,16 +1,66 @@
 require "json"
 require_relative "feature"
+require_relative "crs_normalizer"
+require_relative "ontology"
 
 module GD
   module GIS
     class LayerGeoJSON
+
       def self.load(path)
         data = JSON.parse(File.read(path))
-        features = data["features"]
-        features.map do |f|
-          Feature.new(f["geometry"], f["properties"])
+
+        # 1) Detect CRS
+        crs_name   = data["crs"]&.dig("properties", "name")
+        normalizer = CRS::Normalizer.new(crs_name)
+
+        # 2) Load ontology
+        ontology = Ontology.new
+
+        # 3) Normalize geometries + classify
+        data["features"].map do |f|
+          normalize_geometry!(f["geometry"], normalizer)
+          layer = ontology.classify(f["properties"] || {})
+          Feature.new(f["geometry"], f["properties"], layer)
         end
       end
+
+      # --------------------------------------------
+      # CRS normalization (2D + 3D safe)
+      # --------------------------------------------
+      def self.normalize_geometry!(geometry, normalizer)
+        case geometry["type"]
+
+        when "Point"
+          geometry["coordinates"] =
+            normalizer.normalize(geometry["coordinates"])
+
+        when "LineString"
+          geometry["coordinates"] =
+            geometry["coordinates"].map { |c| normalizer.normalize(c) }
+
+        when "MultiLineString"
+          geometry["coordinates"] =
+            geometry["coordinates"].map do |line|
+              line.map { |c| normalizer.normalize(c) }
+            end
+
+        when "Polygon"
+          geometry["coordinates"] =
+            geometry["coordinates"].map do |ring|
+              ring.map { |c| normalizer.normalize(c) }
+            end
+
+        when "MultiPolygon"
+          geometry["coordinates"] =
+            geometry["coordinates"].map do |poly|
+              poly.map do |ring|
+                ring.map { |c| normalizer.normalize(c) }
+              end
+            end
+        end
+      end
+
     end
   end
 end

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
 
@@ -47,18 +51,27 @@ module GD
         features = LayerGeoJSON.load(path)
 
         features.each do |feature|
-          if Classifier.water?(feature)
-            kind = Classifier.water_kind(feature)
+          case feature.layer
+          when :water
+            # optional: detect river vs canal from properties
+            kind =
+              case (feature.properties["objeto"] || feature.properties["waterway"]).to_s.downcase
+              when /river|río/   then :river
+              when /stream|arroyo/ then :stream
+              else :minor
+              end
+
             @layers[:water] << [kind, feature]
 
-          elsif Classifier.park?(feature)
-            @layers[:park] << feature
+          when :roads
+            # map to style categories if you want later
+            @layers[:street] << feature
 
-          elsif Classifier.rail?(feature)
-            @layers[:rail] << feature
+          when :parks
+            @layers[:park] << feature
 
-          elsif type = Classifier.road(feature)
-            @layers[type] << feature
+          else
+            # ignore unclassified for now
           end
         end
       end
@@ -68,7 +81,9 @@ 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_line(coords, **opts)
@@ -136,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)
@@ -186,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
@@ -195,18 +216,56 @@ 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)

data/lib/gd/gis/ontology.rb

@@ -0,0 +1,26 @@
+require "yaml"
+
+module GD
+  module GIS
+    class Ontology
+      def initialize(path = nil)
+        path ||= File.expand_path("ontology.yml", __dir__)
+        @rules = YAML.load_file(path)
+      end
+
+      def classify(properties)
+        @rules.each do |layer, sources|
+          sources.each do |source, rules|
+            rules.each do |key, values|
+              v = (properties[key.to_s] || properties[key.to_sym]).to_s.strip.downcase
+              values = values.map { |x| x.to_s.downcase }
+
+              return layer.to_sym if values.any? { |x| v.include?(x) }
+            end
+          end
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/gd/gis/ontology.yml

@@ -0,0 +1,267 @@
+# ============================================================
+#  WATER
+# ============================================================
+
+water:
+  ign:
+    objeto:
+      - canal
+      - río
+      - arroyo
+      - embalse
+      - laguna
+      - dique
+      - represa
+    gna:
+      - canal
+      - río
+      - arroyo
+      - embalse
+      - laguna
+
+  natural_earth:
+    featurecla:
+      - river
+      - 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.6
+  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:
@@ -41,13 +41,22 @@ files:
 - lib/gd/gis.rb
 - lib/gd/gis/basemap.rb
 - lib/gd/gis/classifier.rb
+- lib/gd/gis/crs_normalizer.rb
 - lib/gd/gis/feature.rb
 - lib/gd/gis/geometry.rb
+- lib/gd/gis/input.rb
+- lib/gd/gis/input/detector.rb
+- lib/gd/gis/input/geojson.rb
+- lib/gd/gis/input/kml.rb
+- lib/gd/gis/input/shapefile.rb
 - lib/gd/gis/layer_geojson.rb
 - lib/gd/gis/layer_lines.rb
 - lib/gd/gis/layer_points.rb
 - lib/gd/gis/layer_polygons.rb
 - 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
@@ -72,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: []