From 48356eafb16f6f7bb35d1b7f98c71b861215e7e1 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 1 Nov 2022 16:58:14 +0100
Subject: [PATCH] WIP: marker color config
---
src/core/js/ext_map.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/core/js/ext_map.js b/src/core/js/ext_map.js
index bac14e71..a0da7c1a 100644
--- a/src/core/js/ext_map.js
+++ b/src/core/js/ext_map.js
@@ -973,9 +973,10 @@ var caosdb_map = new function () {
this._reload_layers = function () {
caosdb_map._show_load_info()
const promises = []
+ const entity_layer_config = $.extend(true, {}, caosdb_map._default_entity_layer_config, caosdb_map.config["entityLayers"]);
for (const layer of caosdb_map.layers) {
promises.push(caosdb_map._fill_layer(layer.layer_group,
- caosdb_map._default_entity_layer_config[layer.id]));
+ entity_layer_config[layer.id]));
}
Promise.all(promises).then((val) => {
caosdb_map._hide_load_info()
@@ -1067,14 +1068,15 @@ var caosdb_map = new function () {
view_config);
// init entity layers
- this.layers = this.init_entity_layers(this._default_entity_layer_config);
+ const entity_layer_config = $.extend(true, {}, this._default_entity_layer_config, config["entityLayers"]);
+ this.layers = this.init_entity_layers(entity_layer_config);
var layerControl = L.control.layers();
const promises = []
for (const layer of this.layers) {
promises.push(caosdb_map._fill_layer(layer.layer_group,
- this._default_entity_layer_config[layer.id]));
+ entity_layer_config[layer.id]));
layerControl.addOverlay(layer.layer_group, layer.chooser_html.outerHTML);
layer.layer_group.addTo(this._map);
}
--
GitLab