has_geo_lookup 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c346daadf2a1be6115c2c5a5568f3298a90fa7320b8418ffbb1404c48f1e3be4
-  data.tar.gz: 39fbae916da78a3aa2646e5ef0770f67fb65d15d37b276e9963f045354974882
+  metadata.gz: 82a2c8b2c21d67e5d152996defdec6f75ef9e9263a705f21b246be6f4861e176
+  data.tar.gz: 6ebb46f72eb51a01d7fc916657d5d1749f8277adecf64cc352e372e02d839023
 SHA512:
-  metadata.gz: b116a1d609b20c28140e37cf62389b520d4caef383a6abf34e9eacd7b60415929ac3ea9ad464f0ea15abf9fb563d59375dbc47eabdb860b4a19e08944777b2a0
-  data.tar.gz: df4d371bd9667eb8605a32dafbd23271e00b86bfb16a4e38f2d328a294c8e97789c2cec9a87802d4badf2ebfa85b952003d020df9923b8ee5f4175570108403d
+  metadata.gz: 371d3ec0afad3359fe29606ce113e8747acccad689ea99f9b3717c7e9a8b60210daad34fc1b3b15cc6ddc7670c2571953770e77b8b6bd19a1fdb35b7d6fcabf7
+  data.tar.gz: 2611a686994d9e8c7af9cdcb3102eb9b83f6cad94c0908790c3ca78f2068d15174603b3ceb73b7aaa8424d358469ea1713e88d87c6020b8fb855ca5a8c5714a8

data/lib/has_geo_lookup/concern.rb

@@ -248,7 +248,27 @@ module HasGeoLookup
     
     # Fallback to closest geoname approach
     geoname_result = closest_county_or_parish
-    return geoname_result if geoname_result
+    if geoname_result && geoname_result.record
+      # Try coordinate bridge: use geoname coordinates to find GeoBoundaries match
+      # This improves language consistency (e.g., "Lisbon" → "Lisboa")
+      geoname_lat = geoname_result.record.latitude
+      geoname_lng = geoname_result.record.longitude
+      
+      if geoname_lat && geoname_lng
+        # Create temporary checker at geoname coordinates
+        temp_checker = Object.new.extend(HasGeoLookup)
+        temp_checker.define_singleton_method(:latitude) { geoname_lat }
+        temp_checker.define_singleton_method(:longitude) { geoname_lng }
+        
+        bridge_boundary = temp_checker.containing_boundary('ADM2')
+        if bridge_boundary
+          return GeoboundaryResult.new(bridge_boundary, geoname_result.distance_km, 'ADM2', bridge_boundary.name)
+        end
+      end
+      
+      # If coordinate bridge fails, use original geoname result
+      return geoname_result
+    end
     
     nil
   end

data/lib/has_geo_lookup/models/geoboundary.rb

@@ -54,12 +54,12 @@ class Geoboundary < ActiveRecord::Base
   }
 
   scope :containing_point, ->(latitude, longitude) {
-    where("ST_Contains(boundary, ST_GeomFromText(?, 4326))", "POINT(#{longitude} #{latitude})")
+    where("ST_Contains(boundary, ST_GeomFromText(?, 4326))", "POINT(#{latitude} #{longitude})")
   }
 
   # Check if this boundary contains the given coordinates
   #
-  # Uses PostGIS ST_Contains function to perform precise geometric containment
+  # Uses MySQL ST_Contains function to perform precise geometric containment
   # testing against the boundary polygon.
   #
   # @param latitude [Float] Latitude in decimal degrees
@@ -72,7 +72,7 @@ class Geoboundary < ActiveRecord::Base
   def contains_point?(latitude, longitude)
     return false unless latitude && longitude && boundary
     
-    point_wkt = "POINT(#{longitude} #{latitude})"
+    point_wkt = "POINT(#{latitude} #{longitude})"
     
     self.class.connection.select_value(
       "SELECT ST_Contains(ST_GeomFromText(?), ST_GeomFromText(?, 4326)) AS contains",

data/lib/has_geo_lookup/models/metro.rb

@@ -45,13 +45,13 @@ class Metro < ActiveRecord::Base
   scope :containing_point, ->(latitude, longitude) {
     joins(:geoboundaries)
     .where("ST_Contains(geoboundaries.boundary, ST_GeomFromText(?, 4326))", 
-           "POINT(#{longitude} #{latitude})")
+           "POINT(#{latitude} #{longitude})")
     .distinct
   }
 
   # Check if this metro contains the given coordinates
   #
-  # Uses PostGIS spatial queries against all associated geoboundaries to determine
+  # Uses MySQL spatial queries against all associated geoboundaries to determine
   # if the point falls within any boundary that defines this metropolitan area.
   #
   # @param latitude [Float] Latitude in decimal degrees
@@ -68,7 +68,7 @@ class Metro < ActiveRecord::Base
     # Check if point is contained within any of the metro's boundaries
     geoboundaries.joins("INNER JOIN geoboundaries gb ON gb.id = geoboundaries.id")
                  .where("ST_Contains(gb.boundary, ST_GeomFromText(?, 4326))", 
-                        "POINT(#{longitude} #{latitude})")
+                        "POINT(#{latitude} #{longitude})")
                  .exists?
   rescue => e
     Rails.logger.warn "Error checking metro point containment: #{e.message}"

data/lib/has_geo_lookup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HasGeoLookup
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_geo_lookup
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Michael Edlund