diff options
| author | Marius Halden <marius.h@lden.org> | 2017-05-28 21:31:42 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2017-05-28 21:31:42 +0200 |
| commit | 987124b09a32248414faf4d0d6615d43b29ac6f6 (patch) | |
| tree | a549db8af723c981d3b346e855f25d6fd5ff8aa7 /templates/web/base/maps/google-ol.html | |
| parent | dbf56159e44c1560a413022451bf1a1c4cb22a52 (diff) | |
| parent | a085b63ce09f87e83b75cda9b9cd08aadfe75d61 (diff) | |
Merge tag 'v2.0.4' into fiksgatami-dev
Diffstat (limited to 'templates/web/base/maps/google-ol.html')
| -rw-r--r-- | templates/web/base/maps/google-ol.html | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index cccea5b24..7c7711de9 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -1,9 +1,16 @@ -[% map_js = BLOCK %] -<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3"></script> -<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.google.js') %]"></script> -<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> -<script type="text/javascript" src="[% version('/js/map-google-ol.js') %]"></script> -[% END %] +[% +google_maps_url = "https://maps.googleapis.com/maps/api/js?v=3"; +IF c.config.GOOGLE_MAPS_API_KEY; + google_maps_url = google_maps_url _ "&key=" _ c.config.GOOGLE_MAPS_API_KEY; +END; + +map_js = [ + google_maps_url, + version('/js/OpenLayers/OpenLayers.google.js'), + version('/js/map-OpenLayers.js'), + version('/js/map-google-ol.js'), +] +%] [% map_sub_links = BLOCK %] <a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Satellite') %]</a> |