Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-webui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-webui
Commits
48356eaf
Verified
Commit
48356eaf
authored
Nov 1, 2022
by
Timm Fitschen
Browse files
Options
Downloads
Patches
Plain Diff
WIP: marker color config
parent
84503b4b
No related branches found
No related tags found
2 merge requests
!89
Release v0.10.0
,
!83
F map marker color config
Pipeline
#29855
passed
Nov 1, 2022
Stage: linting
Stage: test
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/core/js/ext_map.js
+5
-3
5 additions, 3 deletions
src/core/js/ext_map.js
with
5 additions
and
3 deletions
src/core/js/ext_map.js
+
5
−
3
View file @
48356eaf
...
@@ -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
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment