ValueCategory.SPATIAL -> ValueCategory.GEOMETRY

neo4j · Mar 26, 2018 · 5868fbe · 5868fbe
1 parent b1e2bcc
commit 5868fbe
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSelector00.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSelector00.java
@@ -53,7 +53,7 @@ public int selectSlot( Value... values )
         Value singleValue = values[0];
         switch ( singleValue.valueGroup().category() )
         {
-        case SPATIAL:
+        case GEOMETRY:
             return SPATIAL;
         case TEMPORAL:
             return TEMPORAL;
@@ -73,7 +73,7 @@ public IndexReader select( IndexReader[] instances, IndexQuery... predicates )
         IndexQuery predicate = predicates[0];
         switch ( predicate.valueGroup().category() )
         {
-        case SPATIAL:
+        case GEOMETRY:
             return instances[SPATIAL];
         case TEMPORAL:
             return instances[TEMPORAL];

diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSelector10.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSelector10.java
@@ -54,7 +54,7 @@ public int selectSlot( Value... values )
         {
         case NUMBER:
             return NUMBER;
-        case SPATIAL:
+        case GEOMETRY:
             return SPATIAL;
         case TEMPORAL:
             return TEMPORAL;
@@ -76,7 +76,7 @@ public IndexReader select( IndexReader[] instances, IndexQuery... predicates )
         {
         case NUMBER:
             return instances[NUMBER];
-        case SPATIAL:
+        case GEOMETRY:
             return instances[SPATIAL];
         case TEMPORAL:
             return instances[TEMPORAL];

diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSelector20.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSelector20.java
@@ -56,7 +56,7 @@ public int selectSlot( Value... values )
             return NUMBER;
         case TEXT:
             return STRING;
-        case SPATIAL:
+        case GEOMETRY:
             return SPATIAL;
         case TEMPORAL:
             return TEMPORAL;
@@ -80,7 +80,7 @@ public IndexReader select( IndexReader[] instances, IndexQuery... predicates )
             return instances[NUMBER];
         case TEXT:
             return instances[STRING];
-        case SPATIAL:
+        case GEOMETRY:
             return instances[SPATIAL];
         case TEMPORAL:
             return instances[TEMPORAL];

diff --git a/community/values/src/main/java/org/neo4j/values/storable/ValueCategory.java b/community/values/src/main/java/org/neo4j/values/storable/ValueCategory.java
@@ -23,7 +23,7 @@ public enum ValueCategory
 {
     NUMBER,
     TEXT,
-    SPATIAL,
+    GEOMETRY,
     TEMPORAL,
     REST,
     UNKNOWN,

diff --git a/community/values/src/main/java/org/neo4j/values/storable/ValueGroup.java b/community/values/src/main/java/org/neo4j/values/storable/ValueGroup.java
@@ -46,7 +46,7 @@ public enum ValueGroup
     TEXT_ARRAY(             REST ),
     BOOLEAN_ARRAY(          REST ),
     NUMBER_ARRAY(           REST ),
-    GEOMETRY(                ValueCategory.SPATIAL ),
+    GEOMETRY(               ValueCategory.GEOMETRY ),
     ZONED_DATE_TIME(        TEMPORAL ),
     LOCAL_DATE_TIME(        TEMPORAL ),
     DATE(                   TEMPORAL ),