tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issue in public console

This commit is contained in:
Daniel Maya 2017-08-07 11:30:49 +02:00
parent 5164624dca
commit 5df61b95b9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/operation/gis_maps/public_console.php
View File

@ -58,7 +58,7 @@ $confMap = gis_get_map_conf($idMap);
// Default open map (used to overwrite unlicensed google map view)
$confMapDefault = get_good_con();
$confMapUrlDefault = json_decode($confMapDefault['conection_data'], true)['url'];
$confMapUrlDefault = json_decode($confMapDefault['conection_data'], true);
$num_baselayer=0;
// Initialy there is no Gmap base layer.
@ -77,7 +77,7 @@ if ($confMap !== false) {
case 'Gmap':
if (!isset($decodeJSON['gmap_key']) || empty($decodeJSON['gmap_key'])) {
// If there is not gmap_key, show the default view
$baselayers[$num_baselayer]['url'] = $confMapUrlDefault;
$baselayers[$num_baselayer]['url'] = $confMapUrlDefault['url'];
$baselayers[$num_baselayer]['typeBaseLayer'] = 'OSM';
} else {
$baselayers[$num_baselayer]['gmap_type'] = $decodeJSON['gmap_type'];
@ -207,6 +207,7 @@ if ($layers != false) {
var new_height = $(document).height();
$("#map").css("height", new_height - 60);
$("svg[id*=OpenLayers]").css("height", new_height - 60);
});
</script>