From 42a87f69749a0218520528960c0d75b35a98dd27 Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Tue, 28 Jan 2025 15:08:29 -0700 Subject: [PATCH] some improved mapping types for new index values --- src/main/java/org/ecocean/Encounter.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/ecocean/Encounter.java b/src/main/java/org/ecocean/Encounter.java index 9a20949c64..2cbd172ba6 100644 --- a/src/main/java/org/ecocean/Encounter.java +++ b/src/main/java/org/ecocean/Encounter.java @@ -4291,11 +4291,14 @@ public void opensearchDocumentSerializer(JsonGenerator jgen, Shepherd myShepherd if (occ.getIndividualCount() != null) jgen.writeNumberField("occurrenceIndividualCount", occ.getIndividualCount()); if (occ.getMinGroupSizeEstimate() != null) - jgen.writeNumberField("occurrenceMinGroupSizeEstimate", occ.getMinGroupSizeEstimate()); + jgen.writeNumberField("occurrenceMinGroupSizeEstimate", + occ.getMinGroupSizeEstimate()); if (occ.getMaxGroupSizeEstimate() != null) - jgen.writeNumberField("occurrenceMaxGroupSizeEstimate", occ.getMaxGroupSizeEstimate()); + jgen.writeNumberField("occurrenceMaxGroupSizeEstimate", + occ.getMaxGroupSizeEstimate()); if (occ.getBestGroupSizeEstimate() != null) - jgen.writeNumberField("occurrenceBestGroupSizeEstimate", occ.getBestGroupSizeEstimate()); + jgen.writeNumberField("occurrenceBestGroupSizeEstimate", + occ.getBestGroupSizeEstimate()); if (occ.getBearing() != null) jgen.writeNumberField("occurrenceBearing", occ.getBearing()); if (occ.getDistance() != null) @@ -4382,6 +4385,8 @@ public org.json.JSONObject opensearchMapping() { "{\"type\": \"keyword\", \"normalizer\": \"wildbook_keyword_normalizer\"}"); map.put("date", new org.json.JSONObject("{\"type\": \"date\"}")); map.put("dateSubmitted", new org.json.JSONObject("{\"type\": \"date\"}")); + map.put("individualTimeOfBirth", new org.json.JSONObject("{\"type\": \"date\"}")); + map.put("individualTimeOfDeath", new org.json.JSONObject("{\"type\": \"date\"}")); map.put("locationGeoPoint", new org.json.JSONObject("{\"type\": \"geo_point\"}")); map.put("occurrenceLocationGeoPoint", new org.json.JSONObject("{\"type\": \"geo_point\"}")); @@ -4392,6 +4397,8 @@ public org.json.JSONObject opensearchMapping() { map.put("occurrenceId", keywordType); map.put("state", keywordType); map.put("submitterUserId", keywordType); + map.put("individualTaxonomy", keywordType); + map.put("individualId", keywordType); // all case-insensitive keyword-ish types map.put("locationId", keywordNormalType);