表达式所属包按mapbox文档调整

codingmiao · Jul 28, 2022 · 6d05c1a · 6d05c1a
1 parent 9d70c16
commit 6d05c1a
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 58 deletions.
diff --git a/...cat/vector/mbexpression/decision/Has.java → ...iscat/vector/mbexpression/lookup/Has.java b/...cat/vector/mbexpression/decision/Has.java → ...iscat/vector/mbexpression/lookup/Has.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.wowtools.giscat.vector.mbexpression.decision;
+package org.wowtools.giscat.vector.mbexpression.lookup;
 
 import org.wowtools.giscat.vector.mbexpression.Expression;
 import org.wowtools.giscat.vector.mbexpression.ExpressionName;

diff --git a/...scat/vector/mbexpression/decision/In.java → ...giscat/vector/mbexpression/lookup/In.java b/...scat/vector/mbexpression/decision/In.java → ...giscat/vector/mbexpression/lookup/In.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.wowtools.giscat.vector.mbexpression.decision;
+package org.wowtools.giscat.vector.mbexpression.lookup;
 
 import org.wowtools.giscat.vector.mbexpression.Expression;
 import org.wowtools.giscat.vector.mbexpression.ExpressionName;

diff --git a/...vector/mbexpression/decision/IndexOf.java → ...t/vector/mbexpression/lookup/IndexOf.java b/...vector/mbexpression/decision/IndexOf.java → ...t/vector/mbexpression/lookup/IndexOf.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.wowtools.giscat.vector.mbexpression.decision;
+package org.wowtools.giscat.vector.mbexpression.lookup;
 
 import org.wowtools.giscat.vector.mbexpression.Expression;
 import org.wowtools.giscat.vector.mbexpression.ExpressionName;

diff --git a/.../vector/mbexpression/decision/Length.java → ...at/vector/mbexpression/lookup/Length.java b/.../vector/mbexpression/decision/Length.java → ...at/vector/mbexpression/lookup/Length.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.wowtools.giscat.vector.mbexpression.decision;
+package org.wowtools.giscat.vector.mbexpression.lookup;
 
 import org.wowtools.giscat.vector.mbexpression.Expression;
 import org.wowtools.giscat.vector.mbexpression.ExpressionName;

diff --git a/...t/vector/mbexpression/decision/Slice.java → ...cat/vector/mbexpression/lookup/Slice.java b/...t/vector/mbexpression/decision/Slice.java → ...cat/vector/mbexpression/lookup/Slice.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.wowtools.giscat.vector.mbexpression.decision;
+package org.wowtools.giscat.vector.mbexpression.lookup;
 
 import org.wowtools.giscat.vector.mbexpression.Expression;
 import org.wowtools.giscat.vector.mbexpression.ExpressionName;

diff --git a/...or-mbexpression/src/test/java/org/wowtools/giscat/vector/mbexpression/ExpressionTest.java b/...or-mbexpression/src/test/java/org/wowtools/giscat/vector/mbexpression/ExpressionTest.java
@@ -108,46 +108,7 @@ public void decision() {
         Assert.assertEquals(false,
                 getValue(feature, "[\">\", 1.0,1.0]")
         );
-        //has
-        Assert.assertEquals(true,
-                getValue(feature, "[\"has\", \"int1\"]")
-        );
-        Assert.assertEquals(false,
-                getValue(feature, "[\"has\", \"int3\"]")
-        );
-        //in
-        Assert.assertEquals(true,
-                getValue(feature, "[\"in\", 1,[0,1]]")
-        );
-        Assert.assertEquals(false,
-                getValue(feature, "[\"in\", 1,[0,2]]")
-        );
-        Assert.assertEquals(true,
-                getValue(feature, "[\"in\", \"a\",\"abc\"]")
-        );
-        Assert.assertEquals(false,
-                getValue(feature, "[\"in\", \"a\",\"bbc\"]")
-        );
-        //index-of
-        Assert.assertEquals(2,
-                getValue(feature, "[\"index-of\", \"a\",\"ihas\"]")
-        );
-        Assert.assertEquals(-1,
-                getValue(feature, "[\"index-of\", \"a\",\"ihs\"]")
-        );
-        Assert.assertEquals(1,
-                getValue(feature, "[\"index-of\", \"a\",[\"i\",\"a\",\"a\"]]")
-        );
-        Assert.assertEquals(2,
-                getValue(feature, "[\"index-of\", \"a\",[\"i\",\"a\",\"a\"],2]")
-        );
-        //length
-        Assert.assertEquals(4,
-                getValue(feature, "[\"length\", \"ihas\"]")
-        );
-        Assert.assertEquals(3,
-                getValue(feature, "[\"length\", [\"i\",\"a\",\"a\"]]")
-        );
+
         //<=
         Assert.assertEquals(true,
                 getValue(feature, "[\"<=\", 1,2]")
@@ -192,19 +153,6 @@ public void decision() {
         Assert.assertEquals(true,
                 getValue(feature, "[\"!=\",1.0,1.2]")
         );
-        //slice
-        Assert.assertArrayEquals(new Object[]{2, 3, 4},
-                ((ArrayList) getValue(feature, "[\"slice\",[1,2,3,4],1]")).toArray()
-        );
-        Assert.assertArrayEquals(new Object[]{2, 3},
-                ((ArrayList) getValue(feature, "[\"slice\",[1,2,3,4],1,3]")).toArray()
-        );
-        Assert.assertEquals("bcd",
-                getValue(feature, "[\"slice\",\"abcd\",1]")
-        );
-        Assert.assertEquals("bc",
-                getValue(feature, "[\"slice\",\"abcd\",1,3]")
-        );
         //组合测试
         Assert.assertEquals(true,
                 getValue(feature, "[\"all\", [\"==\", [\"get\", \"int1\"], [\"get\", \"int1\"]]]")
@@ -228,6 +176,59 @@ public void lookup() {
         Assert.assertEquals("1",
                 getValue(feature, "[\"get\",\"str1\"]")
         );
+        //has
+        Assert.assertEquals(true,
+                getValue(feature, "[\"has\", \"int1\"]")
+        );
+        Assert.assertEquals(false,
+                getValue(feature, "[\"has\", \"int3\"]")
+        );
+        //in
+        Assert.assertEquals(true,
+                getValue(feature, "[\"in\", 1,[0,1]]")
+        );
+        Assert.assertEquals(false,
+                getValue(feature, "[\"in\", 1,[0,2]]")
+        );
+        Assert.assertEquals(true,
+                getValue(feature, "[\"in\", \"a\",\"abc\"]")
+        );
+        Assert.assertEquals(false,
+                getValue(feature, "[\"in\", \"a\",\"bbc\"]")
+        );
+        //index-of
+        Assert.assertEquals(2,
+                getValue(feature, "[\"index-of\", \"a\",\"ihas\"]")
+        );
+        Assert.assertEquals(-1,
+                getValue(feature, "[\"index-of\", \"a\",\"ihs\"]")
+        );
+        Assert.assertEquals(1,
+                getValue(feature, "[\"index-of\", \"a\",[\"i\",\"a\",\"a\"]]")
+        );
+        Assert.assertEquals(2,
+                getValue(feature, "[\"index-of\", \"a\",[\"i\",\"a\",\"a\"],2]")
+        );
+        //length
+        Assert.assertEquals(4,
+                getValue(feature, "[\"length\", \"ihas\"]")
+        );
+        Assert.assertEquals(3,
+                getValue(feature, "[\"length\", [\"i\",\"a\",\"a\"]]")
+        );
+        //slice
+        Assert.assertArrayEquals(new Object[]{2, 3, 4},
+                ((ArrayList) getValue(feature, "[\"slice\",[1,2,3,4],1]")).toArray()
+        );
+        Assert.assertArrayEquals(new Object[]{2, 3},
+                ((ArrayList) getValue(feature, "[\"slice\",[1,2,3,4],1,3]")).toArray()
+        );
+        Assert.assertEquals("bcd",
+                getValue(feature, "[\"slice\",\"abcd\",1]")
+        );
+        Assert.assertEquals("bc",
+                getValue(feature, "[\"slice\",\"abcd\",1,3]")
+        );
     }
 
     @org.junit.Test