libgd-gis 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31c9d884a7601b749b9ef7c51852ab27e440284a47535119ecb1715f8257e510
-  data.tar.gz: 152d65acaabc7626f47c3ec2e77d71fa45479694395076727a71d598ebe84025
+  metadata.gz: 15adf406fc3424953ad3ac2fcf5d05bfab4d02268619793fabc2bc5ed5ec67f7
+  data.tar.gz: 3a073e0eab8c647fb9a142e5675e1bb138c58a68cb0f31fb03e09f063f848f7d
 SHA512:
-  metadata.gz: 74debf00d8816b99beac0d59775b27b525c0b0f0db9cc41c39f2f48396e1cefcffd90a0ee658d9a1a08a89e6b661fa0547a21171bd638575bcd29c5e603ad967
-  data.tar.gz: b8a4a1268a2da42c554c4b0fb24705fc3f1fcdab8915992aad113d6d611e3d4863ebe1eddf9c48050474c736ba54a23ea9d222f20a857ba80f65bf6faaadce9e
+  metadata.gz: 17a1eebdd7c9a4c1db7ffdff96965b61e5f0ac37548ea9955ed19dbc0812ac723f5be2a7ab203f26135aefeef2d39f44eff60ba0265bb868a379d5ab86a541ad
+  data.tar.gz: 0dd61743522c231ebf7df34c6c6a4da6dffc3c42fb539d5020a17f3a70c1a3ab5cc3fb78d6529f620fc5323a39cf2c02cd0097a3abc9e2f846a1a8f799727b2b

data/README.md

@@ -29,10 +29,15 @@
 </p>
 
 ![CI](https://github.com/ggerman/libgd-gis/actions/workflows/ci.yml/badge.svg)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6bc3e7d6118d47e6959b16690b815909)](https://www.codacy.com/app/libgd-gis/libgd-gis?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=libgd-gis/libgd-gis&amp;utm_campaign=Badge_Grade)
+[![Test Coverage](https://coveralls.io/repos/githublibgd-gis/libgd-gis/badge.svg?branch=master)](https://coveralls.io/github/libgd-gis/libgd-gis?branch=master)
+[![Gem Version](https://img.shields.io/gem/v/libgd-gis.svg)](https://rubygems.org/gems/libgd-gis)
+
 
 | Examples | Examples | Examples |
 | :----: | :----: | :--: |
-| <img src="examples/nyc/nyc.png" height="250"> | <img src="examples/tokyo/tokyo.png" height="250"> | <img src="examples/parana/parana.png" height="250"> | 
+| <img src="docs/examples/parana.png" height="250"> | <img src="docs/examples/nyc.png" height="250"> | <img src="docs/examples/paris.png" height="250"> |
+| <img src="examples/nyc/nyc.png" height="250"> | <img src="docs/examples/tokyo_solarized.png" height="250"> | <img src="examples/parana/parana.png" height="250"> |
 | <img src="docs/examples/america.png" height="250"> | <img src="docs/examples/argentina_museum.png" height="250"> | <img src="docs/examples/museos_parana.png" height="250"> |
 | <img src="docs/examples/asia.png" height="250"> | <img src="docs/examples/europe.png" height="250"> | <img src="docs/examples/icecream_parana.png" height="250"> |
 | <img src="docs/examples/argentina_cities.png" height="250"> | <img src="docs/examples/tanzania_hydro.png" height="250"> | <img src="docs/examples/parana_polygon.png" height="250"> |
@@ -40,6 +45,12 @@
 
 ---
 
+> **libgd-gis is evolving very fast**, so some examples may temporarily stop working.  
+> Please report issues or ask for help — feedback is very welcome.  
+> https://github.com/ggerman/libgd-gis/issues or ggerman@gmail.com
+
+--
+
 ## A geospatial raster engine for Ruby.
 
 libgd-gis allows Ruby to render real maps, GeoJSON layers, vector features, and geospatial tiles using a native raster backend powered by **libgd**.

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/map.rb

@@ -47,18 +47,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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgd-gis
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
@@ -41,14 +41,21 @@ files:
 - lib/gd/gis.rb
 - lib/gd/gis/basemap.rb
 - lib/gd/gis/classifier.rb
-- lib/gd/gis/dump.sh
+- 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/dump.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-OUT="all_ruby_sources.txt"
-> "$OUT"
-
-echo "### Ruby sources dump ($(date))" >> "$OUT"
-echo >> "$OUT"
-
-find . -type f -name "*.rb" | sort | while read -r file; do
-  echo "===== FILE: $file =====" >> "$OUT"
-  echo >> "$OUT"
-  cat "$file" >> "$OUT"
-  echo >> "$OUT"
-  echo >> "$OUT"
-done
-
-echo "Wrote $OUT"