Gazetteer model

Dockerfile

@@ -17,7 +17,7 @@ RUN npm install
 
 COPY . /app
 
-# See https://github.com/phusion/passenger-docker 
+# See https://github.com/phusion/passenger-docker
 RUN mkdir -p /etc/my_init.d
 ADD config/docker/nginx/init.sh /etc/my_init.d/init.sh
 RUN chmod +x /etc/my_init.d/init.sh && \
@@ -57,14 +57,14 @@ RUN [ "x$REVISION" != "x" ] && echo $REVISION > /app/REVISION && \
 FROM base AS assets-precompiler
 
 # http://blog.zeit.io/use-a-fake-db-adapter-to-play-nice-with-rails-assets-precompilation/
-RUN bundle add activerecord-nulldb-adapter
-RUN printf "production:\n  adapter: nulldb" > config/database.yml \
-&&  printf "production:\n  secret_key_base: $(bundle exec rails secret)" > config/secrets.yml
+#RUN bundle add activerecord-nulldb-adapter
+RUN bundle add activerecord-nulldb-adapter --github="taylorthurlow/nulldb" --ref=8183e9d
+RUN printf "production:\n  adapter: nulldb" > config/database.yml
 
 # Precompiling and also removing config files just in case someone uses `docker build --target=assets-precompiler`
 
-RUN NODE_OPTIONS="--max-old-space-size=4096" bundle exec rake assets:precompile \
-&& rm config/database.yml config/secrets.yml
+RUN NODE_OPTIONS="--max-old-space-size=4096" SECRET_KEY_BASE="$(bundle exec rails secret)" bundle exec rake assets:precompile \
+&& rm config/database.yml
 
 FROM base
 COPY --from=assets-precompiler --chown=9999:9999 /app/public /app/public

Gemfile

@@ -7,9 +7,9 @@ ruby '>= 3.2', '< 3.4.0'
 gem 'bundler', '~> 2.5'
 
 gem 'rake', '~> 13.0'
-gem 'rails', '~> 7.1'
+gem 'rails', '~> 7.2'
 gem 'pg', '~> 1.1'
-gem 'activerecord-postgis-adapter', '~> 9.0'
+gem 'activerecord-postgis-adapter', '~> 10.0'
 gem 'hiredis', '~> 0.6.1'
 gem 'redis', '~> 4.5'
 gem 'bootsnap', require: false
@@ -24,7 +24,7 @@ gem 'zip_tricks', '~> 5.6'
 gem 'daemons', '~> 1.4.1'
 gem 'tzinfo-data', '~> 1.2019' # , '>= 1.2019.3'
 gem 'psych', '~> 5.1'
-gem 'rmagick', '~> 6.0' 
+gem 'rmagick', '~> 6.0'
 gem 'roo', '~> 2.8', '>= 2.8.3'
 gem 'roo-xls', '~> 1.2'
 
@@ -36,8 +36,6 @@ gem 'matrix', '~> 0.4.2'
 
 # Geo
 
-# gem 'rgeo-shapefile', '~> 0.4.2'  # deprecated? not compatible- perhaps only used in
-
 # gem 'ffi-geos', '~> 2.3.0'
 # gem 'rgeo', '~> 2.2'
 # gem 'rgeo-geojson', '~> 2.1', '>= 2.1.1'
@@ -47,6 +45,7 @@ gem 'ffi-geos', '~> 2.4.0'
 gem 'rgeo', '~> 3.0'
 gem 'rgeo-geojson', '~> 2.1', '>= 2.1.1'
 gem 'rgeo-proj4', '~> 4.0' #, '>= 3.0.1'
+gem 'rgeo-shapefile', '~> 3.0'
 
 gem 'postgresql_cursor', '~> 0.6.1'
 

Gemfile.lock

@@ -43,86 +43,80 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (2.0.1)
-    actioncable (7.1.5)
-      actionpack (= 7.1.5)
-      activesupport (= 7.1.5)
+    actioncable (7.2.2)
+      actionpack (= 7.2.2)
+      activesupport (= 7.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.5)
-      actionpack (= 7.1.5)
-      activejob (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.5)
-      actionpack (= 7.1.5)
-      actionview (= 7.1.5)
-      activejob (= 7.1.5)
-      activesupport (= 7.1.5)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (7.2.2)
+      actionpack (= 7.2.2)
+      activejob (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
+      mail (>= 2.8.0)
+    actionmailer (7.2.2)
+      actionpack (= 7.2.2)
+      actionview (= 7.2.2)
+      activejob (= 7.2.2)
+      activesupport (= 7.2.2)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.5)
-      actionview (= 7.1.5)
-      activesupport (= 7.1.5)
+    actionpack (7.2.2)
+      actionview (= 7.2.2)
+      activesupport (= 7.2.2)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.5)
-      actionpack (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
+      useragent (~> 0.16)
+    actiontext (7.2.2)
+      actionpack (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.5)
-      activesupport (= 7.1.5)
+    actionview (7.2.2)
+      activesupport (= 7.2.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.5)
-      activesupport (= 7.1.5)
+    activejob (7.2.2)
+      activesupport (= 7.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.5)
-      activesupport (= 7.1.5)
-    activerecord (7.1.5)
-      activemodel (= 7.1.5)
-      activesupport (= 7.1.5)
+    activemodel (7.2.2)
+      activesupport (= 7.2.2)
+    activerecord (7.2.2)
+      activemodel (= 7.2.2)
+      activesupport (= 7.2.2)
       timeout (>= 0.4.0)
-    activerecord-postgis-adapter (9.0.2)
-      activerecord (~> 7.1.0)
-      rgeo-activerecord (~> 7.0.0)
-    activestorage (7.1.5)
-      actionpack (= 7.1.5)
-      activejob (= 7.1.5)
-      activerecord (= 7.1.5)
-      activesupport (= 7.1.5)
+    activerecord-postgis-adapter (10.0.0)
+      activerecord (~> 7.2.0)
+      rgeo-activerecord (~> 8.0.0)
+    activestorage (7.2.2)
+      actionpack (= 7.2.2)
+      activejob (= 7.2.2)
+      activerecord (= 7.2.2)
+      activesupport (= 7.2.2)
       marcel (~> 1.0)
-    activesupport (7.1.5)
+    activesupport (7.2.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
       securerandom (>= 0.3)
-      tzinfo (~> 2.0)
+      tzinfo (~> 2.0, >= 2.0.5)
     acts_as_list (1.2.3)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
@@ -209,6 +203,8 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.4.0)
+    dbf (4.3.2)
+      csv
     debug_inspector (1.2.0)
     delayed_job (4.1.13)
       activesupport (>= 3.0, < 9.0)
@@ -360,7 +356,6 @@ GEM
     modularity (3.0.1)
     msgpack (1.7.5)
     multi_json (1.15.0)
-    mutex_m (0.2.0)
     namae (1.2.0)
       racc (~> 1.7)
     namecase (2.0.0)
@@ -447,20 +442,20 @@ GEM
       rack (>= 1.3)
     rackup (2.2.0)
       rack (>= 3)
-    rails (7.1.5)
-      actioncable (= 7.1.5)
-      actionmailbox (= 7.1.5)
-      actionmailer (= 7.1.5)
-      actionpack (= 7.1.5)
-      actiontext (= 7.1.5)
-      actionview (= 7.1.5)
-      activejob (= 7.1.5)
-      activemodel (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
+    rails (7.2.2)
+      actioncable (= 7.2.2)
+      actionmailbox (= 7.2.2)
+      actionmailer (= 7.2.2)
+      actionpack (= 7.2.2)
+      actiontext (= 7.2.2)
+      actionview (= 7.2.2)
+      activejob (= 7.2.2)
+      activemodel (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.5)
+      railties (= 7.2.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -476,10 +471,10 @@ GEM
       rails (>= 3.2)
     rails_or (1.1.9)
       activerecord (>= 3)
-    railties (7.1.5)
-      actionpack (= 7.1.5)
-      activesupport (= 7.1.5)
-      irb
+    railties (7.2.2)
+      actionpack (= 7.2.2)
+      activesupport (= 7.2.2)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -514,14 +509,17 @@ GEM
     rexml (3.3.9)
     rgb (0.1.2)
     rgeo (3.0.1)
-    rgeo-activerecord (7.0.1)
-      activerecord (>= 5.0)
-      rgeo (>= 1.0.0)
+    rgeo-activerecord (8.0.0)
+      activerecord (>= 7.0)
+      rgeo (>= 3.0)
     rgeo-geojson (2.2.0)
       multi_json (~> 1.15)
       rgeo (>= 1.0.0)
     rgeo-proj4 (4.0.0)
       rgeo (~> 3.0.0)
+    rgeo-shapefile (3.1.0)
+      dbf (~> 4.0)
+      rgeo (>= 1.0)
     rmagick (6.0.1)
       observer (~> 0.1)
       pkg-config (~> 1.4)
@@ -694,6 +692,7 @@ GEM
       tzinfo (>= 1.0.0)
     unicode-display_width (2.6.0)
     uri (1.0.1)
+    useragent (0.16.10)
     validates_timeliness (7.0.0.beta2)
       activemodel (>= 7.0.0, < 8)
       timeliness (>= 0.3.10, < 1)
@@ -746,7 +745,7 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  activerecord-postgis-adapter (~> 9.0)
+  activerecord-postgis-adapter (~> 10.0)
   acts_as_list (~> 1.0)
   addressable (~> 2.8)
   amazing_print (~> 1.5)
@@ -818,7 +817,7 @@ DEPENDENCIES
   puma (~> 6.3)
   rack (~> 3.1.8)
   rack-cors (~> 2.0)
-  rails (~> 7.1)
+  rails (~> 7.2)
   rails-controller-testing (~> 1.0.2)
   rails-jquery-autocomplete (~> 1.0.3)
   rails_or (~> 1.1.8)
@@ -832,6 +831,7 @@ DEPENDENCIES
   rgeo (~> 3.0)
   rgeo-geojson (~> 2.1, >= 2.1.1)
   rgeo-proj4 (~> 4.0)
+  rgeo-shapefile (~> 3.0)
   rmagick (~> 6.0)
   roo (~> 2.8, >= 2.8.3)
   roo-xls (~> 1.2)

app/controllers/asserted_distributions_controller.rb

@@ -116,7 +116,7 @@ def batch_load
   # PATCH /asserted_distributions/batch_update.json?asserted_distributions_query=<>&asserted_distribution={taxon_name_id=123}}
   def batch_update
     if r = AssertedDistribution.batch_update(
-        preview: params[:preview], 
+        preview: params[:preview],
         asserted_distribution: asserted_distribution_params.merge(by: sessions_current_user_id),
         asserted_distribution_query: params[:asserted_distribution_query],
     )