switch back to has_public_lat_lng

app/classes/api2/observation_api.rb

@@ -61,7 +61,7 @@ def query_params
                                       help: 1),
         gps_hidden: parse(:boolean, :gps_hidden, help: 1),
         has_images: parse(:boolean, :has_images),
-        with_public_lat_lng: parse(:boolean, :with_public_lat_lng),
+        has_public_lat_lng: parse(:boolean, :has_public_lat_lng),
         has_name: parse(:boolean, :has_name, help: :min_rank),
         has_comments: parse(:boolean, :has_comments, limit: true),
         has_specimen: parse(:boolean, :has_specimen),

app/classes/pattern_search/observation.rb

@@ -38,7 +38,7 @@ class Observation < Base
 
       # booleanish
       has_comments: [:has_comments, :parse_yes],
-      with_public_lat_lng: [:with_public_lat_lng, :parse_boolean],
+      has_public_lat_lng: [:has_public_lat_lng, :parse_boolean],
       has_name: [:has_name, :parse_boolean],
       has_notes: [:has_notes, :parse_boolean],
       images: [:has_images, :parse_boolean],

app/classes/query/image_with_observations.rb

@@ -12,7 +12,7 @@ def parameter_declarations
         old_by?: :string,
         herbaria?: [:string],
         is_collection_location?: :boolean,
-        with_public_lat_lng?: :boolean,
+        has_public_lat_lng?: :boolean,
         has_name?: :boolean,
         has_comments?: { boolean: [true] },
         has_sequences?: { boolean: [true] },
@@ -53,7 +53,7 @@ def initialize_association_parameters
 
     def initialize_boolean_parameters
       initialize_is_collection_location_parameter
-      initialize_with_public_lat_lng_parameter
+      initialize_has_public_lat_lng_parameter
       initialize_has_name_parameter
       initialize_has_notes_parameter
       add_join(:observations, :comments) if params[:has_comments]
@@ -69,11 +69,11 @@ def initialize_is_collection_location_parameter
       )
     end
 
-    def initialize_with_public_lat_lng_parameter
+    def initialize_has_public_lat_lng_parameter
       add_boolean_condition(
         "observations.lat IS NOT NULL AND observations.gps_hidden IS FALSE",
         "observations.lat IS NULL OR observations.gps_hidden IS TRUE",
-        params[:with_public_lat_lng]
+        params[:has_public_lat_lng]
       )
     end
 

app/classes/query/location_with_observations.rb

@@ -17,7 +17,7 @@ def parameter_declarations
         herbaria?: [:string],
         confidence?: [:float],
         is_collection_location?: :boolean,
-        with_public_lat_lng?: :boolean,
+        has_public_lat_lng?: :boolean,
         has_name?: :boolean,
         has_comments?: { boolean: [true] },
         has_sequences?: { boolean: [true] },
@@ -64,7 +64,7 @@ def initialize_association_parameters
 
     def initialize_boolean_parameters
       initialize_is_collection_location_parameter
-      initialize_with_public_lat_lng_parameter
+      initialize_has_public_lat_lng_parameter
       initialize_has_name_parameter
       initialize_has_notes_parameter
       add_has_notes_fields_condition(params[:has_notes_fields])
@@ -80,11 +80,11 @@ def initialize_is_collection_location_parameter
       )
     end
 
-    def initialize_with_public_lat_lng_parameter
+    def initialize_has_public_lat_lng_parameter
       add_boolean_condition(
         "observations.lat IS NOT NULL AND observations.gps_hidden IS FALSE",
         "observations.lat IS NULL OR observations.gps_hidden IS TRUE",
-        params[:with_public_lat_lng]
+        params[:has_public_lat_lng]
       )
     end
 

app/classes/query/name_with_observations.rb

@@ -15,7 +15,7 @@ def parameter_declarations
         herbaria?: [:string],
         confidence?: [:float],
         is_collection_location?: :boolean,
-        with_public_lat_lng?: :boolean,
+        has_public_lat_lng?: :boolean,
         has_name?: :boolean,
         has_sequences?: { boolean: [true] },
         has_notes_fields?: [:string],
@@ -56,7 +56,7 @@ def initialize_association_parameters
 
     def initialize_boolean_parameters
       initialize_is_collection_location_parameter
-      initialize_with_public_lat_lng_parameter
+      initialize_has_public_lat_lng_parameter
       initialize_has_name_parameter
       initialize_has_notes_parameter
       add_has_notes_fields_condition(params[:has_notes_fields])
@@ -72,11 +72,11 @@ def initialize_is_collection_location_parameter
       )
     end
 
-    def initialize_with_public_lat_lng_parameter
+    def initialize_has_public_lat_lng_parameter
       add_boolean_condition(
         "observations.lat IS NOT NULL AND observations.gps_hidden IS FALSE",
         "observations.lat IS NULL OR observations.gps_hidden IS TRUE",
-        params[:with_public_lat_lng]
+        params[:has_public_lat_lng]
       )
     end
 

app/classes/query/observation_base.rb

@@ -37,7 +37,7 @@ def parameter_declarations
 
         # boolean
         has_comments?: { boolean: [true] },
-        with_public_lat_lng?: :boolean,
+        has_public_lat_lng?: :boolean,
         has_name?: :boolean,
         has_notes?: :boolean,
         has_sequences?: { boolean: [true] },
@@ -111,7 +111,7 @@ def initialize_species_lists_parameter
 
     def initialize_boolean_parameters
       initialize_is_collection_location_parameter
-      initialize_with_public_lat_lng_parameter
+      initialize_has_public_lat_lng_parameter
       initialize_has_name_parameter
       initialize_has_notes_parameter
       add_has_notes_fields_condition(params[:has_notes_fields])
@@ -127,11 +127,11 @@ def initialize_is_collection_location_parameter
       )
     end
 
-    def initialize_with_public_lat_lng_parameter
+    def initialize_has_public_lat_lng_parameter
       add_boolean_condition(
         "observations.lat IS NOT NULL AND observations.gps_hidden IS FALSE",
         "observations.lat IS NULL OR observations.gps_hidden IS TRUE",
-        params[:with_public_lat_lng]
+        params[:has_public_lat_lng]
       )
     end
 

config/locales/en.txt

@@ -1108,7 +1108,7 @@
   search_term_has_comments: has_comments
   search_term_has_description: has_description
   search_term_has_field: has_field
-  search_term_with_public_lat_lng: with_public_lat_lng
+  search_term_has_public_lat_lng: has_public_lat_lng
   search_term_has_name: has_name
   search_term_has_notes: has_notes
   search_term_has_observations: has_observations
@@ -3543,7 +3543,7 @@
   observation_term_lichen: "\"no\" = exclude lichens, \"yes\" = include only lichens."
   observation_term_has_name: Has a name? (other than "Fungi sp.")
   observation_term_has_notes: Has Notes?
-  observation_term_with_public_lat_lng: Are the [:OBSERVATION]'s [:LATITUDE] and [:LONGITUDE] fields filled in, and public?
+  observation_term_has_public_lat_lng: Are the [:OBSERVATION]'s [:LATITUDE] and [:LONGITUDE] fields filled in, and public?
   observation_term_has_field: Has a given notes template field filled in.
   observation_term_has_comments: Has any comments?
   observation_term_is_collection_location: Mushroom was growing at the location. ("[:form_observations_is_collection_location]" is checked.)

test/models/query_test.rb

@@ -1717,11 +1717,11 @@ def test_image_with_observations
     assert_not_empty(expect, "'expect` is broken; it should not be empty")
     assert_query(expect, :Image, :with_observations, has_comments: true)
 
-    # with_public_lat_lng
+    # has_public_lat_lng
     expect = Image.joins(:observations).
              where.not(observations: { lat: false }).uniq
     assert_not_empty(expect, "'expect` is broken; it should not be empty")
-    assert_query(expect, :Image, :with_observations, with_public_lat_lng: true)
+    assert_query(expect, :Image, :with_observations, has_public_lat_lng: true)
 
     # has_name
     expect = Image.joins(:observations).
@@ -2146,11 +2146,11 @@ def test_location_with_observations
       :Location, :with_observations, has_comments: true
     )
 
-    # with_public_lat_lng
+    # has_public_lat_lng
     assert_query(
       Location.joins(:observations).where(observations: { gps_hidden: false }).
                where.not(observations: { lat: false }).uniq,
-      :Location, :with_observations, with_public_lat_lng: true
+      :Location, :with_observations, has_public_lat_lng: true
     )
 
     # has_name
@@ -2559,11 +2559,11 @@ def test_name_with_observations
       :Name, :with_observations, has_comments: true
     )
 
-    # with_public_lat_lng
+    # has_public_lat_lng
     assert_query(
       Name.joins(:observations).
            where.not(observations: { lat: false }).uniq,
-      :Name, :with_observations, with_public_lat_lng: true
+      :Name, :with_observations, has_public_lat_lng: true
     )
 
     # has_name