Skip to content
Snippets Groups Projects
Verified Commit 48356eaf authored by Timm Fitschen's avatar Timm Fitschen
Browse files

WIP: marker color config

parent 84503b4b
No related branches found
No related tags found
2 merge requests!89Release v0.10.0,!83F map marker color config
Pipeline #29855 passed
...@@ -973,9 +973,10 @@ var caosdb_map = new function () { ...@@ -973,9 +973,10 @@ var caosdb_map = new function () {
this._reload_layers = function () { this._reload_layers = function () {
caosdb_map._show_load_info() caosdb_map._show_load_info()
const promises = [] 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) { for (const layer of caosdb_map.layers) {
promises.push(caosdb_map._fill_layer(layer.layer_group, 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) => { Promise.all(promises).then((val) => {
caosdb_map._hide_load_info() caosdb_map._hide_load_info()
...@@ -1067,14 +1068,15 @@ var caosdb_map = new function () { ...@@ -1067,14 +1068,15 @@ var caosdb_map = new function () {
view_config); view_config);
// init entity layers // 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(); var layerControl = L.control.layers();
const promises = [] const promises = []
for (const layer of this.layers) { for (const layer of this.layers) {
promises.push(caosdb_map._fill_layer(layer.layer_group, 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); layerControl.addOverlay(layer.layer_group, layer.chooser_html.outerHTML);
layer.layer_group.addTo(this._map); layer.layer_group.addTo(this._map);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment