Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Others color config to use with leaflet overlay #289

Merged
merged 1 commit into from
Mar 19, 2024
Merged

fix: Others color config to use with leaflet overlay #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ CHANGELOG
8.7.1+dev (XXXX-XX-XX)
-----------------------

**Bug fixes**

- 'Others' color config to use with leaflet overlay (#290)

8.7.1 (2024-03-13)
-------------------

Expand Down
10 changes: 8 additions & 2 deletions mapentity/static/mapentity/mapentity.detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,14 @@ $(document).ready(function () {
var loaded_layer = false;
var map = data.map;

var style = L.Util.extend({ clickable: false },
window.SETTINGS.map.styles[modelname] || {});

var style = window.SETTINGS.map.styles[modelname];
if (style === undefined) {
style = window.SETTINGS.map.styles.others;
}
if (!(typeof window.SETTINGS.map.styles.others === "function")) {
var style = L.Util.extend({}, style);
}

var layer = new L.ObjectsLayer(null, {
modelname: modelname,
Expand Down