From 505fa86f72e49e5a0909e4931b8062224bb95824 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Wed, 4 Dec 2019 08:13:24 +0000
Subject: [PATCH] Fix console error when google or bing maps are used. #270

---
 config/services.yaml     | 8 ++++----
 templates/base.html.twig | 4 ----
 templates/home.html.twig | 6 ++++++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/config/services.yaml b/config/services.yaml
index 7f359bca..c10838ec 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -162,10 +162,10 @@ services:
 
     # map manager
     #App\Service\GISManager\Bing: ~
-    #App\Service\GISManager\OpenStreet: ~
-    App\Service\GISManager\Google: ~
+    App\Service\GISManager\OpenStreet: ~
+    #App\Service\GISManager\Google: ~
 
     #App\Service\GISManagerInterface: "@App\\Service\\GISManager\\Bing"
-    #App\Service\GISManagerInterface: "@App\\Service\\GISManager\\OpenStreet"
-    App\Service\GISManagerInterface: "@App\\Service\\GISManager\\Google"
+    App\Service\GISManagerInterface: "@App\\Service\\GISManager\\OpenStreet"
+    #App\Service\GISManagerInterface: "@App\\Service\\GISManager\\Google"
     
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 5c6aa547..f4acb997 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -41,10 +41,6 @@
             crossorigin=""/>
         {% endblock %}
         <!--end::Extra Styles -->
-        <script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"
-            integrity="sha512-gZwIG9x3wUXg2hdXF6+rVkLF/0Vi9U8D2Ntg4Ga5I5BZpVkVxlJWbSQtXPSiUTtC0TjtGOmxa1AJPuV0CPthew=="
-            crossorigin="">
-        </script>
     </head>
     <!-- end::Head -->
     <!-- end::Body -->
diff --git a/templates/home.html.twig b/templates/home.html.twig
index db70a701..738005a4 100644
--- a/templates/home.html.twig
+++ b/templates/home.html.twig
@@ -45,12 +45,18 @@
 {% block scripts %}
 {{ include('map/' ~ map_js_file) }}
 <script>
+
+{% if 'OpenStreet' in map_js_file %}
+    initMap();
+{% endif %} 
+
 function initMap() {
     var default_lat = {% trans %}default_lat{% endtrans %};
     var default_lng = {% trans %}default_long{% endtrans %};
 
     var map = mapCreate('dashboard_map', default_lat, default_lng, 'road', 13);
 }
+
 </script>
 {% endblock %}