Merge PR #1734 by DragonDev1906

2020-06-29 18:49:34 +02:00
parent f6b7e67b85 2a22d25f7a
commit a424744762
2 changed files with 9 additions and 1 deletions
--- a/overviewer_core/data/js_src/util.js
+++ b/overviewer_core/data/js_src/util.js
@@ -424,7 +424,9 @@ overviewer.util = {
                            marker_group.addLayer(layerObj);
                        }
                        // Save marker group
-                        obj.marker_groups[marker_entry.displayName] = marker_group;
+                        var layer_name_html = marker_entry.displayName +
+                            '<img class="ov-marker-legend" src="' + marker_entry.icon + '"></img>';
+                        obj.marker_groups[layer_name_html] = marker_group;
                    }
                }
            }
--- a/overviewer_core/data/web_assets/overviewer.css
+++ b/overviewer_core/data/web_assets/overviewer.css
@@ -180,6 +180,12 @@ div.worldcontrol select {
    margin-top:-50%;
 }

+.ov-marker-legend {
+    height: 1.5rem;
+    float: right;
+    clear: right;
+}
+
 .leaflet-div-icon {
    background: 0;
    border: 0;