Merge branch 'devel_11.1.x-clean'

CHANGELOG

@@ -9,7 +9,7 @@ minerva (12.0.0~beta.3) unstable; urgency=medium
   * Bug fix: Legend doesn't disappear if image is wrong
   * Bug fix: Resolution of exported .png in submaps
   * Bug fix: Molstar tool in submaps
-  
+
  -- Piotr Gawron <piotr.gawron@uni.lu>  Thu, 24 May 2018 13:00:00 +0200
 
 minerva (12.0.0~beta.2) unstable; urgency=medium
@@ -99,9 +99,11 @@ minerva (12.0.0~alpha.0) unstable; urgency=medium
 minerva (11.1.0) stable; urgency=high
   * User can provide Google Maps API key that must be registered in google
     cloud account
+  * User data overlays must be Google Maps API terms of use compliant
+  * Terms of Use added
 
- -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 14 May 2018 9:00:00 +0200
-
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Tue, 05 Jun 2018 9:00:00 +0200
+  
 minerva (11.0.10) stable; urgency=medium
   * Bug fix: link from overview image to search result was broken
 

frontend-js/src/main/js/minerva.js

@@ -70,6 +70,9 @@ function processUrlGetParams(params) {
  * @param {string} termsOfUseUrl
  */
 function requestConsent(user, termsOfUseUrl) {
+  if (termsOfUseUrl === "") {
+    return;
+  }
   var dialog = document.createElement("div");
   var dialogContent = document.createElement("div");
   dialogContent.appendChild(functions.createElement({

model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementType.java

@@ -195,9 +195,9 @@ public enum ConfigurationElementType {
       "", ConfigurationElementEditType.STRING, false, ConfigurationElementTypeGroup.SERVER_CONFIGURATION),
 
   /**
-   * File where legend 4/4 is stored.
+   * Terms of use.
    */
-  TERMS_OF_USE("Terms of use file", "resources/other/terms_of_use.pdf", ConfigurationElementEditType.URL, false, ConfigurationElementTypeGroup.LEGEND_AND_LOGO),
+  TERMS_OF_USE("URL of platform Terms of Use file", "", ConfigurationElementEditType.URL, false, ConfigurationElementTypeGroup.LEGEND_AND_LOGO),
 
   ;