From f289b9abeecdd2bd10887d1ed6ef3143448cf492 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 6 May 2022 10:17:57 +0200
Subject: [PATCH] DOC: update docstring ext_map.js
---
src/core/js/ext_map.js | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/core/js/ext_map.js b/src/core/js/ext_map.js
index 2bf31cdf..b4e44446 100644
--- a/src/core/js/ext_map.js
+++ b/src/core/js/ext_map.js
@@ -1581,6 +1581,14 @@ var caosdb_map = new function () {
var lat_vals = getProperty(map_entity, datamodel.lat);
var lng_vals = getProperty(map_entity, datamodel.lng);
+ if (!lng_vals || !lng_vals) {
+ logger.debug("undefined latitude or longitude",
+ map_entity, lat_vals, lng_vals);
+ continue;
+ }
+
+ // we need lat_vals and lng_lavs to be arrays so we make them
+ // be one
var is_list_lat = true;
if (!Array.isArray(lat_vals)) {
lat_vals = [lat_vals];
@@ -1591,11 +1599,9 @@ var caosdb_map = new function () {
lng_vals = [lng_vals];
is_list_lng = false;
}
- if (!lng_vals || !lng_vals) {
- logger.debug("undefined latitude or longitude",
- map_entity, lat_vals, lng_vals);
- continue;
- } else if (is_list_lng !== is_list_lat
+
+ // both array's length must match
+ if (is_list_lng !== is_list_lat
|| (is_list_lat && is_list_lng
&& lat_vals.length !== lng_vals.length)) {
logger.error("Cannot show this entity on the map. "
--
GitLab