From 03bb56a8a20ab956294164c2d7481a4a293f8717 Mon Sep 17 00:00:00 2001 From: Dave Martin Date: Thu, 26 Sep 2024 16:01:54 +0100 Subject: [PATCH] temporarily remove the geological fields as they need terms to map to... https://github.com/gbif/occurrence/issues/342 --- .../search/OccurrenceSearchParameter.java | 29 ++++++++++--------- .../search/OccurrenceSearchRequest.java | 22 +++++++------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/gbif/api/model/occurrence/search/OccurrenceSearchParameter.java b/src/main/java/org/gbif/api/model/occurrence/search/OccurrenceSearchParameter.java index a15d61c6b7..73c351fa02 100644 --- a/src/main/java/org/gbif/api/model/occurrence/search/OccurrenceSearchParameter.java +++ b/src/main/java/org/gbif/api/model/occurrence/search/OccurrenceSearchParameter.java @@ -177,6 +177,7 @@ public class OccurrenceSearchParameter implements SearchParameter, Serializable */ public final static OccurrenceSearchParameter LAST_INTERPRETED = new OccurrenceSearchParameter("LAST_INTERPRETED", Date.class); + /** * Modified date in ISO 8601 formats:yyyy, yyyy-MM, yyyy-MM-dd and MM-dd. * This parameter accepts comma separated range values, examples of valid ranges are: @@ -803,20 +804,20 @@ public class OccurrenceSearchParameter implements SearchParameter, Serializable */ public final static OccurrenceSearchParameter GBIF_ID = new OccurrenceSearchParameter("GBIF_ID", String.class); - /** - * Geological time of an occurrence that searchs in the chronostratigraphy fields. - */ - public final static OccurrenceSearchParameter GEOLOGICAL_TIME = new OccurrenceSearchParameter("GEOLOGICAL_TIME", String.class); - - /** - * Searchs in the lithostratigraphy fields(bed, formation, group, member). - */ - public final static OccurrenceSearchParameter LITHOSTRATIGRAPHY = new OccurrenceSearchParameter("LITHOSTRATIGRAPHY", String.class); - - /** - * Searchs in the biostratigraphy fields(lowest and highest biostratigraphy). - */ - public final static OccurrenceSearchParameter BIOSTRATIGRAPHY = new OccurrenceSearchParameter("BIOSTRATIGRAPHY", String.class); +// /** +// * Geological time of an occurrence that searchs in the chronostratigraphy fields. +// */ +// public final static OccurrenceSearchParameter GEOLOGICAL_TIME = new OccurrenceSearchParameter("GEOLOGICAL_TIME", String.class); +// +// /** +// * Searchs in the lithostratigraphy fields(bed, formation, group, member). +// */ +// public final static OccurrenceSearchParameter LITHOSTRATIGRAPHY = new OccurrenceSearchParameter("LITHOSTRATIGRAPHY", String.class); +// +// /** +// * Searchs in the biostratigraphy fields(lowest and highest biostratigraphy). +// */ +// public final static OccurrenceSearchParameter BIOSTRATIGRAPHY = new OccurrenceSearchParameter("BIOSTRATIGRAPHY", String.class); public static OccurrenceSearchParameter[] values(){ diff --git a/src/main/java/org/gbif/api/model/occurrence/search/OccurrenceSearchRequest.java b/src/main/java/org/gbif/api/model/occurrence/search/OccurrenceSearchRequest.java index dc74b84a62..8ce5e45d26 100644 --- a/src/main/java/org/gbif/api/model/occurrence/search/OccurrenceSearchRequest.java +++ b/src/main/java/org/gbif/api/model/occurrence/search/OccurrenceSearchRequest.java @@ -257,17 +257,17 @@ public void addGadmLevel3GidFilter(String gadm3) { addParameter(OccurrenceSearchParameter.GADM_LEVEL_3_GID, gadm3); } - public void addGeologicalTimeFilter(String geologicalTimeConcept) { - addParameter(OccurrenceSearchParameter.GEOLOGICAL_TIME, geologicalTimeConcept); - } - - public void addLithostratigraphyFilter(String lithostratigraphy) { - addParameter(OccurrenceSearchParameter.LITHOSTRATIGRAPHY, lithostratigraphy); - } - - public void addBiostratigraphyFilter(String biostratigraphy) { - addParameter(OccurrenceSearchParameter.BIOSTRATIGRAPHY, biostratigraphy); - } +// public void addGeologicalTimeFilter(String geologicalTimeConcept) { +// addParameter(OccurrenceSearchParameter.GEOLOGICAL_TIME, geologicalTimeConcept); +// } +// +// public void addLithostratigraphyFilter(String lithostratigraphy) { +// addParameter(OccurrenceSearchParameter.LITHOSTRATIGRAPHY, lithostratigraphy); +// } +// +// public void addBiostratigraphyFilter(String biostratigraphy) { +// addParameter(OccurrenceSearchParameter.BIOSTRATIGRAPHY, biostratigraphy); +// } @Experimental public void addInstitutionKeyFilter(String institutionKey) {