Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
e8713a1f
Commit
e8713a1f
authored
May 24, 2018
by
Piotr Gawron
Browse files
info window with information when google consent for some data overlay is missing
parent
3fde5e76
Changes
3
Hide whitespace changes
Inline
Side-by-side
frontend-js/src/main/js/gui/leftPanel/LeftPanel.js
View file @
e8713a1f
...
...
@@ -324,4 +324,12 @@ LeftPanel.prototype.destroy = function () {
return
Promise
.
all
(
promises
);
};
LeftPanel
.
prototype
.
setGoogleLicenseConsentRequired
=
function
(
value
)
{
this
.
_googleLicenseConsentRequired
=
value
;
};
LeftPanel
.
prototype
.
isGoogleLicenseConsentRequired
=
function
()
{
return
this
.
_googleLicenseConsentRequired
;
};
module
.
exports
=
LeftPanel
;
frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
View file @
e8713a1f
...
...
@@ -350,9 +350,13 @@ OverlayPanel.prototype.refresh = function () {
body
=
document
.
createElement
(
"
tbody
"
);
table
.
appendChild
(
body
);
self
.
setGoogleLicenseConsentRequired
(
false
);
for
(
i
=
0
;
i
<
customOverlays
.
length
;
i
++
)
{
overlay
=
customOverlays
[
i
];
body
.
appendChild
(
self
.
createOverlayRow
(
overlay
,
selectedOverlay
[
overlay
.
getId
()],
!
overlay
.
isGoogleLicenseConsent
()));
if
(
!
overlay
.
isGoogleLicenseConsent
())
{
self
.
setGoogleLicenseConsentRequired
(
true
);
}
}
}
...
...
@@ -509,4 +513,9 @@ OverlayPanel.prototype.openAddOverlayDialog = function () {
OverlayPanel
.
prototype
.
init
=
function
()
{
return
this
.
refresh
();
};
OverlayPanel
.
prototype
.
setGoogleLicenseConsentRequired
=
function
(
value
)
{
this
.
getParent
().
setGoogleLicenseConsentRequired
(
value
);
};
module
.
exports
=
OverlayPanel
;
frontend-js/src/main/js/minerva.js
View file @
e8713a1f
...
...
@@ -553,6 +553,9 @@ function create(params) {
return
customMap
.
openSubmap
(
submapId
);
}
}).
then
(
function
()
{
if
(
leftPanel
.
isGoogleLicenseConsentRequired
())
{
GuiConnector
.
alert
(
"
Some data overlays doesn't have consent to the terms of the <a href='https://cloud.google.com/maps-platform/terms/'>license of Google Maps Platform</a>. To be able to visualize them you must edit data overlay.
"
)
}
var
result
=
createResult
(
customMap
);
if
(
params
.
isDebug
())
{
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment