=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2015-07-19 21:43:56 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2015-08-06 13:27:58 +0000 @@ -9702,6 +9702,7 @@ var googleHybrid = new OpenLayers.Layer.Google('Google Hybrid', { type: google.maps.MapTypeId.HYBRID, + useTiltImages: false, numZoomLevels: 20, animationEnabled: true, layerType: gis.conf.finals.layer.type_base, === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2015-08-05 15:16:32 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2015-08-06 13:27:58 +0000 @@ -1050,7 +1050,7 @@ return window; }; - GIS.core.MapLoader = function(gis, isSession, applyViews) { + GIS.core.MapLoader = function(gis, isSession, applyConfig) { var getMap, setMap, afterLoad, @@ -1227,7 +1227,9 @@ loader = { load: function(views) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (gis.map && gis.map.id) { getMap(); @@ -1499,7 +1501,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } loadOrganisationUnits(view); }, @@ -1796,7 +1800,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true); @@ -2075,7 +2081,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true); @@ -2640,7 +2648,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true); === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js 2015-08-05 15:16:32 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js 2015-08-06 13:27:58 +0000 @@ -3190,7 +3190,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true); @@ -3469,7 +3471,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true); @@ -4034,7 +4038,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true); === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js 2015-08-05 15:16:32 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js 2015-08-06 13:27:58 +0000 @@ -3190,7 +3190,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true); @@ -3469,7 +3471,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true); @@ -4034,7 +4038,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true); === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2015-08-05 16:24:50 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2015-08-06 13:27:58 +0000 @@ -682,7 +682,9 @@ dashboard: true, crossDomain: false, skipMask: true, - userOrgUnit: userOrgUnit + mapViews: [{ + userOrgUnit: userOrgUnit + }] }); } else if ( "reportTable" == dashboardItem.type ) === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js 2015-08-05 15:16:32 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js 2015-08-06 13:27:58 +0000 @@ -3190,7 +3190,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true); @@ -3469,7 +3471,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true); @@ -4034,7 +4038,9 @@ hideMask: false, callBack: null, load: function(view) { - gis.olmap.mask.show(); + if (gis.olmap.mask && !gis.skipMask) { + gis.olmap.mask.show(); + } if (this.compare) { compareView(view, true);