Merge pull request #22 from CDRH/main

Main
CDRH · Oct 8, 2021 · 1775e6f · 1775e6f
2 parents bf4271b + 248771b
commit 1775e6f
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 41 deletions.
diff --git a/Gemfile b/Gemfile
@@ -61,7 +61,7 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem 'orchid', git: 'https://github.com/cdrh/orchid', tag: 'v3.1.0'
+gem 'orchid', git: 'https://github.com/cdrh/orchid', tag: 'v3.1.1'
 
 gem 'bootstrap-sass', '~> 3.4.1'
 gem 'jquery-rails', '~> 4.3'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/cdrh/orchid
-  revision: 107f473c6204046d3b81f184d4298162f0752fbf
-  tag: v3.1.0
+  revision: 1f9ea684f3529992d3cb7f6dea504941e9147ea8
+  tag: v3.1.1
   specs:
-    orchid (3.1.0)
+    orchid (3.1.1)
       rails (~> 5.2.0)
 
 GEM
@@ -55,23 +55,23 @@ GEM
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
     arel (9.0.0)
-    autoprefixer-rails (9.8.6.3)
+    autoprefixer-rails (10.2.4.0)
       execjs
     bindex (0.8.1)
-    bootsnap (1.4.8)
+    bootsnap (1.7.0)
       msgpack (~> 1.0)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.33.0)
+    capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     childprocess (3.0.0)
     chromedriver-helper (2.1.1)
@@ -84,17 +84,17 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     crass (1.0.6)
-    erubi (1.9.0)
+    erubi (1.10.0)
     execjs (2.7.0)
-    ffi (1.13.1)
+    ffi (1.14.2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.5)
+    i18n (1.8.8)
       concurrent-ruby (~> 1.0)
     io-like (0.3.1)
-    jbuilder (2.10.0)
+    jbuilder (2.11.2)
       activesupport (>= 5.0.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -104,7 +104,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.7.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -114,14 +114,16 @@ GEM
     method_source (1.0.0)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
-    msgpack (1.3.3)
-    nio4r (2.5.3)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    mini_portile2 (2.5.0)
+    minitest (5.14.3)
+    msgpack (1.4.2)
+    nio4r (2.5.4)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     public_suffix (4.0.6)
     puma (3.12.6)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -149,11 +151,11 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.7.1)
+    regexp_parser (2.0.3)
     ruby_dep (1.5.0)
     rubyzip (2.3.0)
     sassc (2.4.0)
@@ -171,18 +173,18 @@ GEM
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (3.7.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)

diff --git a/app/controllers/items_override.rb b/app/controllers/items_override.rb
@@ -31,22 +31,24 @@ def map
   def create_geojson(items)
     features = []
     items.each do |item|
-      item["spatial"].each do |spatial|
-        features << {
-          "type" => "Feature",
-          "properties" => {
-            "title" => spatial["title"],
-            "document" => item["title"],
-            "identifier" => item["identifier"]
-          },
-          "geometry" => {
-            "type" => "Point",
-            "coordinates" => [
-              spatial["coordinates"]["lon"].to_f,
-              spatial["coordinates"]["lat"].to_f
-            ]
+      if item["spatial"]
+        item["spatial"].each do |spatial|
+          features << {
+            "type" => "Feature",
+            "properties" => {
+              "title" => spatial["title"],
+              "document" => item["title"],
+              "identifier" => item["identifier"]
+            },
+            "geometry" => {
+              "type" => "Point",
+              "coordinates" => [
+                spatial["coordinates"]["lon"].to_f,
+                spatial["coordinates"]["lat"].to_f
+              ]
+            }
           }
-        }
+        end
       end
     end
     collection = {