Skip to content
Snippets Groups Projects
Commit 70c4e1cd authored by Piotr Gawron's avatar Piotr Gawron
Browse files

loading of google maps API is done only once

parent 3711a148
No related branches found
No related tags found
No related merge requests found
...@@ -305,8 +305,6 @@ function create(params) { ...@@ -305,8 +305,6 @@ function create(params) {
return ServerConnector.getConfiguration(); return ServerConnector.getConfiguration();
}).then(function (configuration) { }).then(function (configuration) {
params.setConfiguration(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); return getProject(params);
}).then(function (project) { }).then(function (project) {
if (project === null) { if (project === null) {
...@@ -317,7 +315,7 @@ function create(params) { ...@@ -317,7 +315,7 @@ function create(params) {
params.setProject(project); params.setProject(project);
var promise = Promise.resolve(); var promise = Promise.resolve();
if (params.getProject().getMapCanvasType() === "GOOGLE_MAPS_API") { 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; return promise;
}).then(function(){ }).then(function(){
...@@ -605,8 +603,6 @@ function createExport(params) { ...@@ -605,8 +603,6 @@ function createExport(params) {
// make sure that we are logged in // make sure that we are logged in
return ServerConnector.getConfiguration().then(function (configuration) { return ServerConnector.getConfiguration().then(function (configuration) {
params.setConfiguration(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); return getProject(params);
}).then(function (project) { }).then(function (project) {
params.setProject(project); params.setProject(project);
...@@ -637,8 +633,6 @@ function createAdmin(params) { ...@@ -637,8 +633,6 @@ function createAdmin(params) {
return ServerConnector.getConfiguration(); return ServerConnector.getConfiguration();
}).then(function (configuration) { }).then(function (configuration) {
params.setConfiguration(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); result = new Admin(params);
return createFooter(); return createFooter();
}).then(function (footer) { }).then(function (footer) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment