From dee41490c89752ddd65b8946f051b4751e4a5c8b Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Thu, 30 Jan 2025 19:29:19 -0700 Subject: [PATCH] drop empty check --- .../java/org/ecocean/MarkedIndividual.java | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/ecocean/MarkedIndividual.java b/src/main/java/org/ecocean/MarkedIndividual.java index b9b2534762..1c00ac9901 100644 --- a/src/main/java/org/ecocean/MarkedIndividual.java +++ b/src/main/java/org/ecocean/MarkedIndividual.java @@ -2638,9 +2638,7 @@ public org.json.JSONObject opensearchMapping() { map.put("timeOfDeath", new org.json.JSONObject("{\"type\": \"date\"}")); map.put("locationGeoPoints", new org.json.JSONObject("{\"type\": \"geo_point\"}")); - // map.put("nameMap", new org.json.JSONObject("{\"type\": \"nested\"}")); map.put("nameMap", new org.json.JSONObject("{\"type\": \"nested\", \"dynamic\": false}")); - // map.put("cooccurrenceIndividualMap", new org.json.JSONObject("{\"type\": \"nested\"}")); map.put("cooccurrenceIndividualMap", new org.json.JSONObject("{\"type\": \"nested\", \"dynamic\": false}")); return map; @@ -2735,19 +2733,17 @@ relationship partner (name and ID) dlons.add(dlon); } } - if (coMap.size() > 0) { - // json is a quick hacky way to write out using writeRawValue() - // JSONArray coNamesArr = new JSONArray(); TODO unsure how names should be used in index??? - org.json.JSONObject coMapJ = new org.json.JSONObject(); - jgen.writeArrayFieldStart("cooccurrenceIndividualIds"); - for (MarkedIndividual ind : coMap.keySet()) { - jgen.writeString(ind.getId()); - coMapJ.put(ind.getId(), coMap.get(ind)); - } - jgen.writeEndArray(); - jgen.writeFieldName("cooccurrenceIndividualMap"); - jgen.writeRawValue(coMapJ.toString()); + // json is a quick hacky way to write out using writeRawValue() + // JSONArray coNamesArr = new JSONArray(); TODO unsure how names should be used in index??? + org.json.JSONObject coMapJ = new org.json.JSONObject(); + jgen.writeArrayFieldStart("cooccurrenceIndividualIds"); + for (MarkedIndividual ind : coMap.keySet()) { + jgen.writeString(ind.getId()); + coMapJ.put(ind.getId(), coMap.get(ind)); } + jgen.writeEndArray(); + jgen.writeFieldName("cooccurrenceIndividualMap"); + jgen.writeRawValue(coMapJ.toString()); jgen.writeNumberField("numberMediaAssets", numMAs); jgen.writeArrayFieldStart("locationGeoPoints");