From 70c4e1cd5b707c07dd0049c68c1c91b977a3cc59 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 30 May 2018 15:20:37 +0200
Subject: [PATCH] loading of google maps API is done only once
---
frontend-js/src/main/js/minerva.js | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 92dac01dcd..d943ddace1 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -305,8 +305,6 @@ function create(params) {
return ServerConnector.getConfiguration();
}).then(function (configuration) {
params.setConfiguration(configuration);
- return functions.loadScript("https://maps.google.com/maps/api/js?libraries=drawing&v=3.26&key=" + configuration.getOption(ConfigurationType.GOOGLE_MAPS_API_KEY));
- }).then(function () {
return getProject(params);
}).then(function (project) {
if (project === null) {
@@ -317,7 +315,7 @@ function create(params) {
params.setProject(project);
var promise = Promise.resolve();
if (params.getProject().getMapCanvasType() === "GOOGLE_MAPS_API") {
- promise = functions.loadScript("https://maps.google.com/maps/api/js?libraries=drawing");
+ promise = functions.loadScript("https://maps.google.com/maps/api/js?libraries=drawing&key=" + params.getConfiguration().getOption(ConfigurationType.GOOGLE_MAPS_API_KEY));
}
return promise;
}).then(function(){
@@ -605,8 +603,6 @@ function createExport(params) {
// make sure that we are logged in
return ServerConnector.getConfiguration().then(function (configuration) {
params.setConfiguration(configuration);
- return functions.loadScript("https://maps.google.com/maps/api/js?libraries=drawing&v=3.26&key=" + configuration.getOption(ConfigurationType.GOOGLE_MAPS_API_KEY));
- }).then(function () {
return getProject(params);
}).then(function (project) {
params.setProject(project);
@@ -637,8 +633,6 @@ function createAdmin(params) {
return ServerConnector.getConfiguration();
}).then(function (configuration) {
params.setConfiguration(configuration);
- return functions.loadScript("https://maps.google.com/maps/api/js?libraries=drawing&v=3.26&key=" + configuration.getOption(ConfigurationType.GOOGLE_MAPS_API_KEY));
- }).then(function () {
result = new Admin(params);
return createFooter();
}).then(function (footer) {
--
GitLab