From d92a0bc59cb3d768236336ccf9b35711d450cfbd Mon Sep 17 00:00:00 2001 From: Michael Writhe Date: Mon, 9 May 2011 09:37:09 -0600 Subject: [PATCH] allowed for opacity of fill/stroke to be definned independantly. will continue to support legacy declaration of opacity --- web_assets/overviewer.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/web_assets/overviewer.js b/web_assets/overviewer.js index 6220a16..eea2f7d 100644 --- a/web_assets/overviewer.js +++ b/web_assets/overviewer.js @@ -368,6 +368,14 @@ var overviewer = { clickable = false; // if it doesn't have a name, we dont have to show it. } + if(region.opacity) { + var strokeOpacity = region.opacity; + var fillOpacity = region.opacity * 0.25; + } else { + var strokeOpacity = region.strokeOpacity; + var fillOpacity = region.fillOpacity; + } + if (region.closed) { var shape = new google.maps.Polygon({ 'name': name, @@ -375,10 +383,10 @@ var overviewer = { 'geodesic': false, 'map': null, 'strokeColor': region.color, - 'strokeOpacity': region.opacity, + 'strokeOpacity': strokeOpacity, 'strokeWeight': overviewerConfig.CONST.regionStrokeWeight, 'fillColor': region.color, - 'fillOpacity': region.opacity * 0.25, + 'fillOpacity': fillOpacity, 'zIndex': j, 'paths': converted }); @@ -389,7 +397,7 @@ var overviewer = { 'geodesic': false, 'map': null, 'strokeColor': region.color, - 'strokeOpacity': region.opacity, + 'strokeOpacity': strokeOpacity, 'strokeWeight': overviewerConfig.CONST.regionStrokeWeight, 'zIndex': j, 'path': converted