Skip to content

Commit

Permalink
Hot Fix for Google Map Tiles not loading
Browse files Browse the repository at this point in the history
  • Loading branch information
mickel1138 committed May 2, 2023
1 parent 209abce commit 49c9f8d
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion assets/static/js/geoviz.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function GeoViz()

google_hybrid = new OpenLayers.Layer.Google("Google Hybrid Map",
{
type: google.maps.MapTypeId.HYBRID,
type: google.maps.MapTypeId.SATELLITE,
numZoomLevels: googleZoomLevel,
sphericalMercator: true,
displayInLayerSwitcher: true
Expand Down
2 changes: 1 addition & 1 deletion templates/DIF/dif.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/datejs/1.0/date.min.js"></script>

<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3&key={{ google_maps_api_key }}&callback=Function.prototype"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.51&key={{ google_maps_api_key }}&callback=Function.prototype"></script>
<script type="text/javascript" src="//cdn3.devexpress.com/jslib/22.2.3/js/dx.all.js"></script>

<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jstree/3.0.1/jstree.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion templates/DataDiscovery/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.7/jstree.min.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3&key={{ google_maps_api_key }}&callback=Function.prototype"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.51&key={{ google_maps_api_key }}&callback=Function.prototype"></script>

<script type="text/javascript" src="{{ asset('build/js/geoviz.js') }}"></script>
<script type="text/javascript" src="{{ asset('build/js/data-discovery.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion templates/Dataland/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
{{ parent() }}

<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3&key={{ google_maps_api_key }}&callback=Function.prototype"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.51&key={{ google_maps_api_key }}&callback=Function.prototype"></script>
<script type="text/javascript" src="{{ asset('build/js/geoviz.js') }}"></script>
<script type="text/javascript" src="{{ asset('build/js/dataland.js') }}"></script>
<script type="text/javascript" src="{{ asset('build/js/download.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion templates/Dataland/v2/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
{{ parent() }}

<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3&key={{ google_maps_api_key }}&callback=Function.prototype"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.51&key={{ google_maps_api_key }}&callback=Function.prototype"></script>
<script type="text/javascript" src="{{ asset('build/js/geoviz.js') }}"></script>

{{ encore_entry_script_tags('data-land') }}
Expand Down
2 changes: 1 addition & 1 deletion templates/DatasetReview/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/datejs/1.0/date.min.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/spin.js/2.0.1/spin.min.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/file-uploader/5.11.8/jquery.fine-uploader/jquery.fine-uploader.min.js"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3&key={{ google_maps_api_key }}&callback=Function.prototype"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.51&key={{ google_maps_api_key }}&callback=Function.prototype"></script>
<script type="text/javascript" src="//cdn3.devexpress.com/jslib/22.2.3/js/dx.all.js"></script>

<script type="text/javascript" src="{{ asset('build/js/funderComponent.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion templates/DatasetSubmission/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/file-uploader/5.11.8/jquery.fine-uploader/jquery.fine-uploader.min.js"></script>

<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3&key={{ google_maps_api_key }}&callback=Function.prototype"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.51&key={{ google_maps_api_key }}&callback=Function.prototype"></script>

<script type="text/javascript" src="//cdn.datatables.net/1.10.7/js/jquery.dataTables.js"></script>
<script type="text/javascript" src="//cdn.datatables.net/select/1.0.1/js/dataTables.select.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion templates/SideBySide/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/datejs/1.0/date.min.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/spin.js/2.0.1/spin.min.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/file-uploader/5.11.8/jquery.fine-uploader/jquery.fine-uploader.min.js"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3&key={{ google_maps_api_key }}&callback=Function.prototype"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.51&key={{ google_maps_api_key }}&callback=Function.prototype"></script>

<script type="text/javascript" src="{{ asset('build/js/pelagosNoty.js') }}"></script>
<script type="text/javascript" src="{{ asset('build/js/datasetReview.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion web/applications/metadata-editor/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

drupal_add_js('//cdn.jsdelivr.net/openlayers/2.13.1/OpenLayers.js',array('type'=>'external'));

drupal_add_js('//maps.google.com/maps/api/js?v=3&sensor=false&key='.$config['google_maps_api_key'].'&callback=Function.prototype',array('type'=>'external'));
drupal_add_js('//maps.google.com/maps/api/js?v=3.51&sensor=false&key='.$config['google_maps_api_key'].'&callback=Function.prototype',array('type'=>'external'));

drupal_add_js('includes/geoviz/geoviz.js',array('type'=>'external'));
drupal_add_js('includes/geoviz/mapWizard.js',array('type'=>'external'));
Expand Down

0 comments on commit 49c9f8d

Please sign in to comment.