#25 call rect selection

gyuque · Feb 25, 2014 · 2d6d07a · 2d6d07a
1 parent 3020156
commit 2d6d07a
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 1 deletion.
diff --git a/inner/js/model/MMMeshLayer.js b/inner/js/model/MMMeshLayer.js
@@ -18,6 +18,7 @@ if (!window.mobmap) { window.mobmap={}; }
 		this._lctrlObserved = false;
 		this.dataReady = false;
 		this.sourceLoader = null;
+		this.localSelectionPool = new mobmap.SelectionPool();
 
 		this.meshData = null;
 	}

diff --git a/inner/js/model/MMProject.js b/inner/js/model/MMProject.js
@@ -18,6 +18,11 @@ if (!window.mobmap) { window.mobmap={}; }
 		getLayerList: function() {
 			return this.layerList;
 		},
+
+		getCurrentTimeInSeconds: function() {
+			var d = this.currentDateTime;
+			return d.getCurrentTime();
+		},
 
 		addMovingObjectLayer: function() {
 			var lyr = new mobmap.MovingObjectLayer();

diff --git a/inner/js/selection/selection-pool.js b/inner/js/selection/selection-pool.js
@@ -6,6 +6,8 @@ if (!window.mobmap) { window.mobmap={}; }
 	function SelectionPool() {
 		var eve = document.createElement('span');
 		this.jEventElement = $(eve);
+
+		this.idmap = createCleanHash();
 	}
 
 	SelectionPool.CHANGE_EVENT = "selection-pool-change";
@@ -17,6 +19,17 @@ if (!window.mobmap) { window.mobmap={}; }
 
 		fire: function() {
 			this.eventDispatcher().trigger(SelectionPool.CHANGE_EVENT, this);
+		},
+
+		clear: function() {
+			var m = this.idmap;
+			for (var i in m) {
+				delete m[i];
+			}
+		},
+
+		addId: function(objId) {
+			this.idmap[objId] = true;
 		}
 	};
 

diff --git a/inner/js/selection/selection-session.js b/inner/js/selection/selection-session.js
@@ -33,16 +33,34 @@ if (!window.mobmap) { window.mobmap={}; }
 		},
 
 		makeIDCollection: function(targetProject) {
+			var pickTime = targetProject.getCurrentTimeInSeconds();
+
 			var ls = targetProject.getLayerList();
 			var len = ls.getCount();
 
 			for (var i = 0;i < len;++i) {
 				var lyr = ls.getLayerAt(i);
+				var selp = lyr.localSelectionPool;
+				selp.clear();
+
 				if (lyr.capabilities & mobmap.LayerCapability.SpatialSelectable) {
-					console.log("layer selection");
+					var pool = lyr.movingData.createPickPool();
+					pool.clear();
+
+					lyr.movingData.pickAt(pool, pickTime);
+					this.filterRect(pool, selp);
+//					var allCount = pool.pickedCount;
+//					console.log("layer selection", allCount);
 				}
 			}
 		},
+
+		filterRect: function(sourcePickPool, targetSelPool) {
+			var xmin = Math.min(this.startPos.lng, this.endPos.lng);
+			var xmax = Math.max(this.startPos.lng, this.endPos.lng);
+			var ymin = Math.min(this.startPos.lat, this.endPos.lat);
+			var ymax = Math.max(this.startPos.lat, this.endPos.lat);
+		},
 
 		// - - - - - - - - - -