libgd-gis 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15adf406fc3424953ad3ac2fcf5d05bfab4d02268619793fabc2bc5ed5ec67f7
-  data.tar.gz: 3a073e0eab8c647fb9a142e5675e1bb138c58a68cb0f31fb03e09f063f848f7d
+  metadata.gz: 3c36a99210906574c046daffe2120213b027d92fdd22dec0b27861df22f88029
+  data.tar.gz: bd991fd3290c3bfb82f5640dad84c8e6486368285539774eed1b942acd7848b6
 SHA512:
-  metadata.gz: 17a1eebdd7c9a4c1db7ffdff96965b61e5f0ac37548ea9955ed19dbc0812ac723f5be2a7ab203f26135aefeef2d39f44eff60ba0265bb868a379d5ab86a541ad
-  data.tar.gz: 0dd61743522c231ebf7df34c6c6a4da6dffc3c42fb539d5020a17f3a70c1a3ab5cc3fb78d6529f620fc5323a39cf2c02cd0097a3abc9e2f846a1a8f799727b2b
+  metadata.gz: 6bed27a3930a9512b0f5fff46fdfe2f76fe76932ddf263cc2d219cdaafd754d5161ede878f1b0d929e5a7b00b9c4b546c6905d9ee27d9bc478d5e7914ebc1784
+  data.tar.gz: ee203f7b9dc6f0a2669bbbedcde1e6fe31678c3a847c79a14d975c75cee1cc0a7f2784398acbef9b821943cce9124bdb5b41f0194070ff020fa39824f699a56a

data/lib/gd/gis/feature.rb

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

data/lib/gd/gis/layer_geojson.rb

@@ -1,66 +1,16 @@
 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))
-
-        # 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)
+        features = data["features"]
+        features.map do |f|
+          Feature.new(f["geometry"], f["properties"])
         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/map.rb

@@ -47,27 +47,18 @@ module GD
         features = LayerGeoJSON.load(path)
 
         features.each do |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
-
+          if Classifier.water?(feature)
+            kind = Classifier.water_kind(feature)
             @layers[:water] << [kind, feature]
 
-          when :roads
-            # map to style categories if you want later
-            @layers[:street] << feature
-
-          when :parks
+          elsif Classifier.park?(feature)
             @layers[:park] << feature
 
-          else
-            # ignore unclassified for now
+          elsif Classifier.rail?(feature)
+            @layers[:rail] << feature
+
+          elsif type = Classifier.road(feature)
+            @layers[type] << feature
           end
         end
       end
@@ -80,8 +71,30 @@ module GD
         @points_layers << GD::GIS::PointsLayer.new(data, **opts)
       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)
@@ -194,6 +207,17 @@ module GD
         end
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgd-gis
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
@@ -41,21 +41,13 @@ 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/projection.rb
 - lib/gd/gis/style.rb
 - lib/gd/gis/style/dark.rb

data/lib/gd/gis/crs_normalizer.rb

@@ -1,57 +0,0 @@
-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/input/detector.rb

@@ -1,34 +0,0 @@
-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/ontology.rb

@@ -1,26 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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