From d010c86e8fb9969096f853c54382c90bdd61cdeb Mon Sep 17 00:00:00 2001
From: Puneeth Chaganti <punchagan@muse-amuse.in>
Date: Tue, 11 Sep 2018 14:54:39 +0530
Subject: [PATCH] [#3368] Use an API key with all maps requests

Closes #3368
---
 akvo/rsr/context_processors.py             | 2 ++
 akvo/settings/85-gmaps.conf                | 1 +
 akvo/templates/inclusion_tags/maps.html    | 2 +-
 akvo/templates/organisation_directory.html | 3 +--
 akvo/templates/organisation_main.html      | 5 +----
 akvo/templates/project_directory.html      | 5 ++---
 akvo/templates/update_directory.html       | 2 +-
 7 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 akvo/settings/85-gmaps.conf

diff --git a/akvo/rsr/context_processors.py b/akvo/rsr/context_processors.py
index 9c10b616f7..dac4a37ca1 100644
--- a/akvo/rsr/context_processors.py
+++ b/akvo/rsr/context_processors.py
@@ -29,6 +29,7 @@ def extra_context(request, protocol="http"):
     deploy_commit_id = getattr(settings, 'DEPLOY_COMMIT_ID', 'Unknown')
     deploy_commit_full_id = getattr(settings, 'DEPLOY_COMMIT_FULL_ID', 'Unknown')
     sentry_dsn = get_sentry_dsn(settings)
+    gmaps_api_key = getattr(settings, 'GOOGLE_MAPS_API_KEY', 'NO_API_KEY')
 
     return dict(
         current_site=current_site,
@@ -39,6 +40,7 @@ def extra_context(request, protocol="http"):
         deploy_commit_id=deploy_commit_id,
         deploy_commit_full_id=deploy_commit_full_id,
         sentry_dsn=sentry_dsn,
+        gmaps_api_key=gmaps_api_key,
     )
 
 
diff --git a/akvo/settings/85-gmaps.conf b/akvo/settings/85-gmaps.conf
new file mode 100644
index 0000000000..79fea3b163
--- /dev/null
+++ b/akvo/settings/85-gmaps.conf
@@ -0,0 +1 @@
+GOOGLE_MAPS_API_KEY = 'AIzaSyARjGtFp0IV0wANJOjMpQ8jumgbquLR0h8'
diff --git a/akvo/templates/inclusion_tags/maps.html b/akvo/templates/inclusion_tags/maps.html
index 6459ce60e0..21b955099f 100644
--- a/akvo/templates/inclusion_tags/maps.html
+++ b/akvo/templates/inclusion_tags/maps.html
@@ -1,5 +1,5 @@
 <div class= "akvo_map" id="{{map_id}}" style="width:{{width}};height:{{height}};"></div>
-<script type="text/javascript" src="//maps.google.com/maps/api/js"></script>
+<script src="https://maps.googleapis.com/maps/api/js?key={{gmaps_api_key}}"></script>
 <script type="text/javascript">
     var googleMap = {
         canvas: document.getElementById('{{map_id}}'),
diff --git a/akvo/templates/organisation_directory.html b/akvo/templates/organisation_directory.html
index 68e439867e..802b28eeb3 100644
--- a/akvo/templates/organisation_directory.html
+++ b/akvo/templates/organisation_directory.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n maps rsr_utils bootstrap3 pipeline %}
+{% load i18n rsr_utils bootstrap3 pipeline %}
 {% block title %}{% trans 'Organisations' %}{% endblock %}
 {% block maincontent %}
 
@@ -9,7 +9,6 @@
 
 {% block js %}
     {{ block.super }}
-    <script src="//maps.google.com/maps/api/js"></script>
     {# Translation strings #}
     <script type="application/json" id="organisations-text">
      {
diff --git a/akvo/templates/organisation_main.html b/akvo/templates/organisation_main.html
index db83b14116..9e345ba59c 100644
--- a/akvo/templates/organisation_main.html
+++ b/akvo/templates/organisation_main.html
@@ -5,7 +5,7 @@
 -->
 
 {% extends "base.html" %}
-{% load i18n rsr_filters humanize rsr_utils maps %}
+{% load i18n rsr_filters humanize rsr_utils %}
 {% block title %}{{ organisation.name }}{% endblock %}
 {% block maincontent %}
   <div class="container organisationDetail">
@@ -238,7 +238,4 @@ <h2>{% trans 'Funding' %}</h2>
 
 {% block js %}
   {{ block.super }}
-
-  {# Google Maps #}
-  <script src="//maps.google.com/maps/api/js"></script>
 {% endblock js %}
diff --git a/akvo/templates/project_directory.html b/akvo/templates/project_directory.html
index c95ba0f83f..7b2bccf24c 100644
--- a/akvo/templates/project_directory.html
+++ b/akvo/templates/project_directory.html
@@ -10,9 +10,8 @@
 {% block js %}
     {{ block.super }}
 
-    {# Google Maps API #}
-    <script src="//maps.google.com/maps/api/js"></script>
-
+  {# Google Maps API #}
+    <script src="https://maps.googleapis.com/maps/api/js?key={{gmaps_api_key}}"></script>
     <script type="application/json" id="akvo-rsr-typeahead-thumbs">
         {
             "numberOfProjects": {{ project_count }}
diff --git a/akvo/templates/update_directory.html b/akvo/templates/update_directory.html
index 3c745cd38a..18a5e9a397 100644
--- a/akvo/templates/update_directory.html
+++ b/akvo/templates/update_directory.html
@@ -10,7 +10,7 @@
 {% block js %}
     {{ block.super }}
 
-    <script src="//maps.google.com/maps/api/js"></script>
+    <script src="https://maps.googleapis.com/maps/api/js?key={{gmaps_api_key}}"></script>
     {# Translation strings #}
     <script type="application/json" id="updates-text">
      {