blacklight-maps 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7059d890824c42ab380fe30f134bbe80c6aec34
-  data.tar.gz: 0ce93e925097ef9a696d19722d60a46210a0130f
+  metadata.gz: cec8bdbdd2134f3c1f7f3762f61a91c387fcb39b
+  data.tar.gz: 02828cec807ece0e8564c74f6d424d3f787b9534
 SHA512:
-  metadata.gz: e38b41d52c15e1194bb858fd74a5f121e859d41e5c2e5c2063a1ea03d4761c64a5688443d527723fb274f13481292fb77008a6a3c987113cc7e3116e03538f19
-  data.tar.gz: 0f5bb334cea790bd339f408e00daf1100ecc8678adb011be8a72481a498274271eecb976b4e504f3381d7f7a71db8027ea541ed0e2a4aa59a46144605d212b53
+  metadata.gz: 9c3cb7694eb528ca1ff0d6f45454bb196591ee9c22bed67a8b74d385ac01ec072b1dd35f48cfa01a8b1fa410338ed8579694ea01aa20f9554d4b1d72343f092c
+  data.tar.gz: 75f2982504e7cf96e7d369e365dc7ad371342f388b274e3ea486752be3cd2138ec225a629d161fd0a2c67955cc6cbe118e0e1668a70aaad6d9f2ead52c35008e

data/lib/blacklight/maps/export.rb

@@ -85,9 +85,8 @@ module BlacklightMaps
     # turn bboxes into points for index view so we don't get weird mix of boxes and markers
     def build_feature_from_geojson(loc, hits = nil)
       geojson_hash = JSON.parse(loc).deep_symbolize_keys
-
       if @action != "show" && geojson_hash[:bbox]
-        geojson_hash[:geometry][:coordinates] = Geometry::BoundingBox.new(geojson_hash[:bbox]).find_center
+        geojson_hash[:geometry][:coordinates] = Geometry::Point.new(Geometry::BoundingBox.new(geojson_hash[:bbox]).find_center).normalize_for_search
         geojson_hash[:geometry][:type] = "Point"
         geojson_hash.delete(:bbox)
       end
@@ -104,7 +103,7 @@ module BlacklightMaps
       if coords.scan(/[\s]/).length == 3 # bbox
         if @action != "show"
           geojson_hash[:geometry][:type] = "Point"
-          geojson_hash[:geometry][:coordinates] = Geometry::BoundingBox.from_lon_lat_string(coords).find_center
+          geojson_hash[:geometry][:coordinates] = Geometry::Point.new(Geometry::BoundingBox.from_lon_lat_string(coords).find_center).normalize_for_search
         else
           coords_array = coords.split(' ').map { |v| v.to_f }
           geojson_hash[:bbox] = coords_array

data/lib/blacklight/maps/geometry.rb

@@ -35,5 +35,36 @@ module BlacklightMaps
         new(points.split(' '))
       end
     end
+
+    # This class contains Point objects and methods for working with them
+    class Point
+
+      # points is an array corresponding to the longitude and latitude values
+      # [long, lat]
+      def initialize(points)
+        @long = points[0].to_f
+        @lat = points[1].to_f
+      end
+
+      # returns a string that can be used as the value of solr_parameters[:pt]
+      # normalizes any long values >180 or <-180
+      def normalize_for_search
+        case
+          when @long > 180
+            @long -= 360
+          when @long < -180
+            @long += 360
+        end
+        [@long,@lat]
+      end
+
+      # Creates a new point from from a coordinate string
+      # "-50,100" (lat,long)
+      def self.from_lat_lon_string(points)
+        new(points.split(',').reverse)
+      end
+
+    end
+
   end
 end

data/lib/blacklight/maps/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Maps
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/lib/blacklight/maps/export_spec.rb

@@ -131,6 +131,18 @@ describe "BlacklightMaps::GeojsonExport" do
           expect(@output[:geometry][:coordinates]).to eq([82.7789705, 21.12899555])
         end
 
+        describe "bounding box that crosses the dateline" do
+
+          before do
+            @output = subject.send(:build_feature_from_coords, '1.162386 6.7535159 -179.395555 35.5044752', 1)
+          end
+
+          it "should set a center point with a long value between -180 and 180" do
+            expect(@output[:geometry][:coordinates]).to eq([90.88341550000001,21.12899555])
+          end
+
+        end
+
       end
 
       describe "catalog#show view" do

data/spec/lib/blacklight/maps/geometry_spec.rb

@@ -1,24 +1,43 @@
 require 'spec_helper'
 
-describe "BlacklightMaps::Geometry::BoundingBox" do
+describe BlacklightMaps::Geometry do
 
-  let(:bbox) { BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('-100 -50 100 50') }
-  let(:bbox_california) { BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('-124.4096196 32.5342321 -114.131211 42.0095169') }
-  let(:bbox_dateline) {BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('165 30 -172 -20') }
+  describe "BlacklightMaps::Geometry::BoundingBox" do
 
-  it "should instantiate Geometry::BoundingBox" do
-    expect(bbox.class).to eq(::BlacklightMaps::Geometry::BoundingBox)
-  end
+    let(:bbox) { BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('-100 -50 100 50') }
+    let(:bbox_california) { BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('-124.4096196 32.5342321 -114.131211 42.0095169') }
+    let(:bbox_dateline) {BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('165 30 -172 -20') }
 
-  it "should return center of simple bounding box" do
-    expect(bbox.find_center).to eq([0.0, 0.0])
-  end
+    it "should instantiate Geometry::BoundingBox" do
+      expect(bbox.class).to eq(::BlacklightMaps::Geometry::BoundingBox)
+    end
+
+    it "should return center of simple bounding box" do
+      expect(bbox.find_center).to eq([0.0, 0.0])
+    end
 
-  it "should return center of California bounding box" do
-    expect(bbox_california.find_center).to eq([-119.2704153, 37.271874499999996])
+    it "should return center of California bounding box" do
+      expect(bbox_california.find_center).to eq([-119.2704153, 37.271874499999996])
+    end
+
+    it "should return correct dateline bounding box" do
+      expect(bbox_dateline.find_center).to eq([-183.5, 5])
+    end
   end
 
-  it "should return correct dateline bounding box" do
-    expect(bbox_dateline.find_center).to eq([-183.5, 5])
+  describe "BlacklightMaps::Geometry::Point" do
+
+    let(:point) { BlacklightMaps::Geometry::Point.from_lat_lon_string('20,120') }
+    let(:unparseable_point) { BlacklightMaps::Geometry::Point.from_lat_lon_string('35.86166,-184.195397') }
+
+    it "should instantiate Geometry::Point" do
+      expect(point.class).to eq(::BlacklightMaps::Geometry::Point)
+    end
+
+    it "should return a Solr-parseable coordinate if @long is > 180 or < -180" do
+      expect(unparseable_point.normalize_for_search).to eq([175.804603,35.86166])
+    end
+
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-maps
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Chris Beer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails