Skip to content

Commit

Permalink
closes #223
Browse files Browse the repository at this point in the history
  • Loading branch information
loarie committed Nov 23, 2020
1 parent fbb3dd9 commit 821800d
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions lib/models/observation_query_builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -943,19 +943,17 @@ ObservationQueryBuilder.reqToElasticQueryComponents = async req => {
}

_.each( ["geoprivacy", "taxon_geoprivacy"], geoprivacyField => {
if ( params[geoprivacyField] === "open" ) {
inverseFilters.push( { exists: { field: geoprivacyField } } );
} else if ( params[geoprivacyField] === "obscured_private" ) {
if ( params[geoprivacyField] === "obscured_private" ) {
searchFilters.push( esClient.termFilter( geoprivacyField, ["obscured", "private"] ) );
} else if ( params[geoprivacyField] && params[geoprivacyField] !== "any" ) {
const geoprivacyFieldFilter = esClient.termFilter( geoprivacyField, params[geoprivacyField] );
if ( geoprivacyFieldFilter.terms[geoprivacyField].indexOf( "open" ) < 0 ) {
searchFilters.push( geoprivacyFieldFilter );
} else {
// Since "open" just means the field isn't there, we need a should to do
// something like "geoprivacy IS NULL OR geoprivacy IN (x,y,z)"
// Since "open" means the field isn't there or is open, we need to do
// something like "geoprivacy IS NULL OR geoprivacy is open"
geoprivacyFieldFilter.terms[geoprivacyField] = _.filter(
geoprivacyFieldFilter.terms[geoprivacyField], g => g !== "open"
geoprivacyFieldFilter.terms[geoprivacyField], g => g == "open"
);
searchFilters.push( {
bool: {
Expand Down

0 comments on commit 821800d

Please sign in to comment.