Return-Path: 
 <commits-return-369-apmail-climate-commits-archive=climate.apache.org@climate.incubator.apache.org>
X-Original-To: apmail-climate-commits-archive@minotaur.apache.org
Delivered-To: apmail-climate-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DE377FA68
	for <apmail-climate-commits-archive@minotaur.apache.org>;
 Wed, 17 Jul 2013 06:34:56 +0000 (UTC)
Received: (qmail 99759 invoked by uid 500); 17 Jul 2013 06:34:56 -0000
Delivered-To: apmail-climate-commits-archive@climate.apache.org
Received: (qmail 99736 invoked by uid 500); 17 Jul 2013 06:34:56 -0000
Mailing-List: contact commits-help@climate.incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@climate.incubator.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@climate.incubator.apache.org>
List-Post: <mailto:commits@climate.incubator.apache.org>
List-Id: <commits.climate.incubator.apache.org>
Reply-To: dev@climate.incubator.apache.org
Delivered-To: mailing list commits@climate.incubator.apache.org
Received: (qmail 99721 invoked by uid 99); 17 Jul 2013 06:34:55 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jul 2013 06:34:55 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jul 2013 06:34:53 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id F41CB23889EC;
	Wed, 17 Jul 2013 06:34:31 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1504010 - in
 /incubator/climate/trunk/rcmet/src/main/ui/app:
 index.html js/controllers/WorldMapCtrl.js
Date: Wed, 17 Jul 2013 06:34:31 -0000
To: commits@climate.incubator.apache.org
From: joyce@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130717063431.F41CB23889EC@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: joyce
Date: Wed Jul 17 06:34:31 2013
New Revision: 1504010

URL: http://svn.apache.org/r1504010
Log:
CLIMATE-204 - Remove overlay display on World Map

- Remove the option for a user to toggle the overlay display from the
  DatasetDisplay.
- Remove overlay drawing code from WorldMapCtrl.js.

Modified:
    incubator/climate/trunk/rcmet/src/main/ui/app/index.html
    incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/WorldMapCtrl.js

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/index.html
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/index.html?rev=1504010&r1=1504009&r2=1504010&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/index.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/index.html Wed Jul 17 06:34:31 2013
@@ -147,9 +147,6 @@
                       <div class="span2 text-center">
                         {{dataset.latlonVals.lonMax}}
                       </div>
-                      <div class="span2">
-                        <label><input type="checkbox" ng-model="dataset.shouldDisplay" /> Overlay</label>
-                      </div>
                     </div>
                     <div class="row-fluid">
                       <div class="span2 text-center">South:</div>
@@ -171,7 +168,7 @@
                   <!--Preview Map Section-->
                   <div class="span3">
                     <!--If the dataset is global we show a picture of a globe instead of the actual map-->
-                    <div ng-hide="dataset.latlonVals.lonMin == -180 && dataset.latlonVals.lonMax == 180 &&
+                    <div ng-hide="dataset.latlonVals.lonMin == -180 && dataset.latlonVals.lonMax == 180 && 
                                   dataset.latlonVals.latMin == -90 && dataset.latlonVals.latMax == 90" 
                                   preview-map="dataset" index="$index"></div>
                     <div ng-show="dataset.latlonVals.lonMin == -180 && dataset.latlonVals.lonMax == 180 &&

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/WorldMapCtrl.js
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/WorldMapCtrl.js?rev=1504010&r1=1504009&r2=1504010&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/WorldMapCtrl.js (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/WorldMapCtrl.js Wed Jul 17 06:34:31 2013
@@ -33,33 +33,8 @@ function($rootScope, $scope, selectedDat
 		if ($scope.datasets.length == 0 || !("map" in $rootScope))
 			return;
  		
-		// Create Group to add all rectangles to map
+		// Create a group that we'll draw overlays to
 		$rootScope.rectangleGroup = L.layerGroup();
-		
-		// Loop through datasets and add rectangles to Group 
-		var i = -1;
-		angular.forEach($scope.datasets, function(dataset) {
-			// Keep track of dataset count for displaying colors
-			i++;
-
-			// If the user disabled the overlay then get out of here!
-			if (!dataset.shouldDisplay)
-				return;
-
-			// Get bounds from dataset 
-			var maplatlon = dataset.latlonVals;
-			var bounds = [[maplatlon.latMax, maplatlon.lonMin], [maplatlon.latMin, maplatlon.lonMax]];
-
-			var polygon = L.rectangle(bounds,{
-				stroke: false,
-				fillColor: $rootScope.fillColors[i],
-				fillOpacity: 0.3
-			});
-
-			// Add layer to Group
-			$rootScope.rectangleGroup.addLayer(polygon);
-		});
-
 		// Add rectangle Group to map
 		$rootScope.rectangleGroup.addTo($rootScope.map);