调整Filter类的命名空间为GeoBeans.Filter

fanzia · Sep 22, 2016 · 12ef8a3 · 12ef8a3
1 parent 6876af1
commit 12ef8a3
Show file tree

Hide file tree

Showing 20 changed files with 133 additions and 18 deletions.
diff --git a/src/GeoBeans/Filter/ComparisionFilter.js b/src/GeoBeans/Filter/ComparisionFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.ComparisionFilter = GeoBeans.Class(GeoBeans.Filter,{
+/**
+ * @classdesc
+ * 比较过滤器
+ * @class
+ * @extends {GeoBeans.Filter}
+ */
+GeoBeans.Filter.ComparisionFilter = GeoBeans.Class(GeoBeans.Filter,{
 
 	operator : null,
 

diff --git a/src/GeoBeans/Filter/ComparisionFilter/BinaryComparisionFilter.js b/src/GeoBeans/Filter/ComparisionFilter/BinaryComparisionFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.BinaryComparisionFilter = GeoBeans.Class(GeoBeans.ComparisionFilter,{
+/**
+ * @classdesc
+ * 二元比较过滤器
+ * @class
+ * @extends {GeoBeans.Filter.ComparisionFilter}
+ */
+GeoBeans.Filter.BinaryComparisionFilter = GeoBeans.Class(GeoBeans.ComparisionFilter,{
 
 	expression1	: null,
 	expression2 : null,

diff --git a/src/GeoBeans/Filter/ComparisionFilter/IsBetweenFilter.js b/src/GeoBeans/Filter/ComparisionFilter/IsBetweenFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.IsBetweenFilter = GeoBeans.Class(GeoBeans.ComparisionFilter,{
+/**
+ * @classdesc
+ * Between比较过滤器
+ * @class
+ * @extends {GeoBeans.Filter.ComparisionFilter}
+ */
+GeoBeans.Filter.IsBetweenFilter = GeoBeans.Class(GeoBeans.ComparisionFilter,{
 	expression : null,
 	lowerBound : null,
 	upperBound : null,

diff --git a/src/GeoBeans/Filter/ComparisionFilter/IsLikeFilter.js b/src/GeoBeans/Filter/ComparisionFilter/IsLikeFilter.js
@@ -1,5 +1,10 @@
-// 可以用BinaryComparisionFilter代替
-GeoBeans.IsLikeFilter = GeoBeans.Class(GeoBeans.ComparisionFilter,{
+/**
+ * @classdesc
+ * like比较过滤器
+ * @class
+ * @extends {GeoBeans.Filter.ComparisionFilter}
+ */
+GeoBeans.Filter.IsLikeFilter = GeoBeans.Class(GeoBeans.ComparisionFilter,{
 	properyName : null,
 	literal 	: null,
 

diff --git a/src/GeoBeans/Filter/ComparisionFilter/IsNullFilter.js b/src/GeoBeans/Filter/ComparisionFilter/IsNullFilter.js
@@ -1,6 +1,12 @@
-GeoBeans.IsNullFilter = GeoBeans.Class(GeoBeans.ComparisionFilter,{
-	properyName : null,
+/**
+ * @classdesc
+ * Null比较过滤器
+ * @class
+ * @extends {GeoBeans.Filter.ComparisionFilter}
+ */
+GeoBeans.Filter.IsNullFilter = GeoBeans.Class(GeoBeans.ComparisionFilter,{
 
+	properyName : null,
 
 	initialize : function(properyName){
 		GeoBeans.ComparisionFilter.prototype.initialize.apply(this,arguments);

diff --git a/src/GeoBeans/Filter/Expression.js b/src/GeoBeans/Filter/Expression.js
@@ -1,3 +1,8 @@
+/**
+ * @classdesc
+ * 查询表达式
+ * @class
+ */
 GeoBeans.Expression = GeoBeans.Class({
 	type : null,
 

diff --git a/src/GeoBeans/Filter/Expression/Literal.js b/src/GeoBeans/Filter/Expression/Literal.js
@@ -1,3 +1,9 @@
+/**
+ * @classdesc
+ * 属性值表达式
+ * @class
+ * @extends {GeoBeans.ComparisionFilter}
+ */
 GeoBeans.Literal = GeoBeans.Class(GeoBeans.Expression,{
 	value : null,
 

diff --git a/src/GeoBeans/Filter/Expression/PropertyName.js b/src/GeoBeans/Filter/Expression/PropertyName.js
@@ -1,4 +1,10 @@
-GeoBeans.PropertyName = GeoBeans.Class({
+/**
+ * @classdesc
+ * 属性名称表达式
+ * @class
+ * @extends {GeoBeans.ComparisionFilter}
+ */
+GeoBeans.PropertyName = GeoBeans.Class(GeoBeans.Expression, {
 	name : null,
 
 	initialize : function(){

diff --git a/src/GeoBeans/Filter/FilterReader.js b/src/GeoBeans/Filter/FilterReader.js
@@ -1,3 +1,8 @@
+/**
+ * @classdesc
+ * XML格式过滤器转换为对象
+ * @class
+ */
 GeoBeans.FilterReader = GeoBeans.Class({
 
 	initialize : function(){

diff --git a/src/GeoBeans/Filter/FilterWriter.js b/src/GeoBeans/Filter/FilterWriter.js
@@ -1,3 +1,8 @@
+/**
+ * @classdesc
+ * 过滤器对象转换为XML格式
+ * @class
+ */
 GeoBeans.FilterWriter = GeoBeans.Class({
 
 	initialize : function(){

diff --git a/src/GeoBeans/Filter/IDFilter.js b/src/GeoBeans/Filter/IDFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.IDFilter = GeoBeans.Class(GeoBeans.Filter,{
+/**
+ * @classdesc
+ * ID过滤器
+ * @class
+ * @extends {GeoBeans.Filter}
+ */
+GeoBeans.Filter.IDFilter = GeoBeans.Class(GeoBeans.Filter,{
 	ids : null,
 
 	initialize : function(){

diff --git a/src/GeoBeans/Filter/LogicFilter.js b/src/GeoBeans/Filter/LogicFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.LogicFilter = GeoBeans.Class(GeoBeans.Filter,{
+/**
+ * @classdesc
+ * 逻辑过滤器
+ * @class
+ * @extends {GeoBeans.Filter}
+ */
+GeoBeans.Filter.LogicFilter = GeoBeans.Class(GeoBeans.Filter,{
 	operator : null,
 
 

diff --git a/src/GeoBeans/Filter/LogicFilter/BinaryLogicFilter.js b/src/GeoBeans/Filter/LogicFilter/BinaryLogicFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.BinaryLogicFilter = GeoBeans.Class(GeoBeans.LogicFilter,{
+/**
+ * @classdesc
+ * 二元逻辑比较过滤器（AND, OR）
+ * @class
+ * @extends {GeoBeans.Filter.LogicFilter}
+ */
+GeoBeans.Filter.BinaryLogicFilter = GeoBeans.Class(GeoBeans.LogicFilter,{
 	// operator : null,
 	filters  : null,
 

diff --git a/src/GeoBeans/Filter/LogicFilter/UnaryLogicFilter.js b/src/GeoBeans/Filter/LogicFilter/UnaryLogicFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.UnaryLogicFilter = GeoBeans.Class(GeoBeans.LogicFilter,{
+/**
+ * @classdesc
+ * 一元逻辑比较过滤器（NOT）
+ * @class
+ * @extends {GeoBeans.Filter.LogicFilter}
+ */
+GeoBeans.Filter.UnaryLogicFilter = GeoBeans.Class(GeoBeans.LogicFilter,{
 	filter : null,
 
 	initialize : function(filter){

diff --git a/src/GeoBeans/Filter/OrderBy.js b/src/GeoBeans/Filter/OrderBy.js
@@ -1,4 +1,9 @@
-GeoBeans.OrderBy = GeoBeans.Class({
+/**
+ * @classdesc
+ * 排序类
+ * @class
+ */
+GeoBeans.Query.OrderBy = GeoBeans.Class({
 	fields : null,
 
 	order : null,

diff --git a/src/GeoBeans/Filter/SpatialFilter.js b/src/GeoBeans/Filter/SpatialFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.SpatialFilter = GeoBeans.Class(GeoBeans.Filter,{
+/**
+ * @classdesc
+ * 空间查询过滤器
+ * @class
+ * @extends {GeoBeans.Filter}
+ */
+GeoBeans.Filter.SpatialFilter = GeoBeans.Class(GeoBeans.Filter,{
 
 
 	initialize : function(){

diff --git a/src/GeoBeans/Filter/SpatialFilter/BBoxFilter.js b/src/GeoBeans/Filter/SpatialFilter/BBoxFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.BBoxFilter = GeoBeans.Class(GeoBeans.SpatialFilter,{
+/**
+ * @classdesc
+ * 矩形空间查询过滤器
+ * @class
+ * @extends {GeoBeans.Filter.SpatialFilter}
+ */
+GeoBeans.Filter.BBoxFilter = GeoBeans.Class(GeoBeans.SpatialFilter,{
 	// propExpression 	: null,
 	extent 		: null,
 

diff --git a/src/GeoBeans/Filter/SpatialFilter/BeyondFilter.js b/src/GeoBeans/Filter/SpatialFilter/BeyondFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.BeyondFilter = GeoBeans.Class(GeoBeans.SpatialFilter,{
+/**
+ * @classdesc
+ * Beyond空间查询过滤器
+ * @class
+ * @extends {GeoBeans.Filter.SpatialFilter}
+ */
+GeoBeans.Filter.BeyondFilter = GeoBeans.Class(GeoBeans.SpatialFilter,{
 	distance : null,
 
 

diff --git a/src/GeoBeans/Filter/SpatialFilter/BinarySpatialFilter.js b/src/GeoBeans/Filter/SpatialFilter/BinarySpatialFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.BinarySpatialFilter = GeoBeans.Class(GeoBeans.SpatialFilter,{
+/**
+ * @classdesc
+ * 二元空间查询过滤器
+ * @class
+ * @extends {GeoBeans.Filter.SpatialFilter}
+ */
+GeoBeans.Filter.BinarySpatialFilter = GeoBeans.Class(GeoBeans.SpatialFilter,{
 	operator : null,
 	propName : null,
 	geometry : null,

diff --git a/src/GeoBeans/Filter/SpatialFilter/DistanceBufferFilter.js b/src/GeoBeans/Filter/SpatialFilter/DistanceBufferFilter.js
@@ -1,4 +1,10 @@
-GeoBeans.DistanceBufferFilter = GeoBeans.Class(GeoBeans.SpatialFilter,{
+/**
+ * @classdesc
+ * 距离缓冲去空间查询过滤器
+ * @class
+ * @extends {GeoBeans.Filter.SpatialFilter}
+ */
+GeoBeans.Filter.DistanceBufferFilter = GeoBeans.Class(GeoBeans.SpatialFilter,{
 	distance : null,
 
 	initialize : function(propName,geometry,distance){