Merge pull request #20262 from vespa-engine/arnej/add-v8geopos-in-document-config

Arnej/add v8geopos in document config

51 files changed, 76 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
index e86689c544f..87df21dc023 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
@@ -11,6 +11,7 @@ import com.yahoo.cloud.config.SlobroksConfig;
 import com.yahoo.cloud.config.ZookeepersConfig;
 import com.yahoo.cloud.config.log.LogdConfig;
 import com.yahoo.component.Version;
+import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.config.provision.ApplicationId;
@@ -76,6 +77,12 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
         this.applicationId = applicationId;
     }
 
+    private boolean useV8GeoPositions = false;
+
+    public void useFeatureFlags(ModelContext.FeatureFlags featureFlags) {
+        this.useV8GeoPositions = featureFlags.useV8GeoPositions();
+    }
+
     /**
      * @return an unmodifiable copy of the set of configIds in this VespaModel.
      */
@@ -151,12 +158,16 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
 
     @Override
     public void getConfig(DocumentmanagerConfig.Builder builder) {
-        new DocumentManager().produce(documentModel, builder);
+        new DocumentManager()
+            .useV8GeoPositions(this.useV8GeoPositions)
+            .produce(documentModel, builder);
     }
 
     @Override
     public void getConfig(DocumenttypesConfig.Builder builder) {
-        new DocumentTypes().produce(documentModel, builder);
+        new DocumentTypes()
+            .useV8GeoPositions(this.useV8GeoPositions)
+            .produce(documentModel, builder);
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
index 8605389e1c2..59387c28287 100644
--- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
+++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
@@ -20,9 +20,17 @@ import java.util.Set;
  */
 public class DocumentManager {
 
+    private boolean useV8GeoPositions = false;
+
+    public DocumentManager useV8GeoPositions(boolean value) {
+        this.useV8GeoPositions = value;
+        return this;
+    }
+
     public DocumentmanagerConfig.Builder produce(DocumentModel model,
                                                  DocumentmanagerConfig.Builder documentConfigBuilder) {
         documentConfigBuilder.enablecompression(false);
+        documentConfigBuilder.usev8geopositions(this.useV8GeoPositions);
         Set<DataType> handled = new HashSet<>();
         for(NewDocumentType documentType : model.getDocumentManager().getTypes()) {
             buildConfig(documentType, documentConfigBuilder, handled);
diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java
index 3b0b63f277e..ed6511f6efa 100644
--- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java
+++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java
@@ -15,8 +15,15 @@ import java.util.*;
  * @author baldersheim
  */
 public class DocumentTypes {
+    private boolean useV8GeoPositions = false;
+
+    public DocumentTypes useV8GeoPositions(boolean value) {
+        this.useV8GeoPositions = value;
+        return this;
+    }
 
     public DocumenttypesConfig.Builder produce(DocumentModel model, DocumenttypesConfig.Builder builder) {
+        builder.usev8geopositions(this.useV8GeoPositions);
         Map<NewDocumentType.Name, NewDocumentType> produced = new HashMap<>();
         for (NewDocumentType documentType : model.getDocumentManager().getTypes()) {
             produceInheritOrder(documentType, builder, produced);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index f584b4cd207..13b0f6216b2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -194,6 +194,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
 
         HostSystem hostSystem = root.hostSystem();
         if (complete) { // create a completed, frozen model
+            root.useFeatureFlags(deployState.getProperties().featureFlags());
             configModelRepo.readConfigModels(deployState, this, builder, root, new VespaConfigModelRegistry(configModelRegistry));
             addServiceClusters(deployState, builder);
             setupRouting(deployState);
diff --git a/config-model/src/test/configmodel/types/documentmanager.cfg b/config-model/src/test/configmodel/types/documentmanager.cfg
index f59dbeeb3ca..66002968586 100644
--- a/config-model/src/test/configmodel/types/documentmanager.cfg
+++ b/config-model/src/test/configmodel/types/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[0].id 1381038251
 datatype[0].structtype[0].name "position"
 datatype[0].structtype[0].version 0
diff --git a/config-model/src/test/configmodel/types/documenttypes.cfg b/config-model/src/test/configmodel/types/documenttypes.cfg
index 8f576715a4f..94551567352 100644
--- a/config-model/src/test/configmodel/types/documenttypes.cfg
+++ b/config-model/src/test/configmodel/types/documenttypes.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 documenttype[0].id -853072901
 documenttype[0].name "types"
 documenttype[0].version 0
diff --git a/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg b/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg
index 283e5c2fe79..9be843c89aa 100644
--- a/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg
+++ b/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 documenttype[0].id -1368624373
 documenttype[0].name "other_doc"
 documenttype[0].version 0
diff --git a/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg b/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg
index 7ae73c23685..bf7632a504c 100644
--- a/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg
+++ b/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[0].id 1381038251
 datatype[0].structtype[0].name "position"
 datatype[0].structtype[0].version 0
diff --git a/config-model/src/test/configmodel/types/references/documentmanager_ref_to_self_type.cfg b/config-model/src/test/configmodel/types/references/documentmanager_ref_to_self_type.cfg
index a613c2c034d..d105b894b63 100644
--- a/config-model/src/test/configmodel/types/references/documentmanager_ref_to_self_type.cfg
+++ b/config-model/src/test/configmodel/types/references/documentmanager_ref_to_self_type.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg
index 2b6e2e852a3..d7c9ddf8a70 100644
--- a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg
+++ b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[0].id 1381038251
 datatype[0].structtype[0].name "position"
 datatype[0].structtype[0].version 0
diff --git a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg
index bab281cca36..a99bac3a831 100644
--- a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg
+++ b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[0].id 1381038251
 datatype[0].structtype[0].name "position"
 datatype[0].structtype[0].version 0
diff --git a/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg b/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg
index 242310b57a4..d992839d5d9 100644
--- a/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg
+++ b/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 documenttype[0].id 2987301
 documenttype[0].name "ad"
 documenttype[0].version 0
diff --git a/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg b/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg
index f925ac99a25..19bcb81db38 100644
--- a/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg
+++ b/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 documenttype[].id 2987301
 documenttype[].name "ad"
 documenttype[].version 0
diff --git a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg
index c3aba21a498..68ed924615f 100644
--- a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg
+++ b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 documenttype[0].id 2987301
 documenttype[0].name "ad"
 documenttype[0].version 0
diff --git a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg
index c5930449dc1..6415e62cd7e 100644
--- a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg
+++ b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 documenttype[0].id 2987301
 documenttype[0].name "ad"
 documenttype[0].version 0
diff --git a/config-model/src/test/derived/advanced/documentmanager.cfg b/config-model/src/test/derived/advanced/documentmanager.cfg
index 4da92d82fb9..c317c19b09b 100644
--- a/config-model/src/test/derived/advanced/documentmanager.cfg
+++ b/config-model/src/test/derived/advanced/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg b/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg
index aa74ecebd5b..cdf554cb747 100644
--- a/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg b/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg
index e103218793d..9633eaa532b 100644
--- a/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg b/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg
index 5b5b2ac348f..85aef02bb3c 100644
--- a/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg b/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg
index 1f71057f268..a8d46f2a940 100644
--- a/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/annotationsreference/documentmanager.cfg b/config-model/src/test/derived/annotationsreference/documentmanager.cfg
index 737bcbf3cac..7ce09a97be1 100644
--- a/config-model/src/test/derived/annotationsreference/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsreference/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/annotationssimple/documentmanager.cfg b/config-model/src/test/derived/annotationssimple/documentmanager.cfg
index 3af65e96558..1342a179239 100644
--- a/config-model/src/test/derived/annotationssimple/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationssimple/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/annotationsstruct/documentmanager.cfg b/config-model/src/test/derived/annotationsstruct/documentmanager.cfg
index 0a1cda99a95..233c2f729fe 100644
--- a/config-model/src/test/derived/annotationsstruct/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsstruct/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg
index fca86c58ffa..19c1c5eda2f 100644
--- a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/arrays/documentmanager.cfg b/config-model/src/test/derived/arrays/documentmanager.cfg
index f542a936574..554cf017b54 100644
--- a/config-model/src/test/derived/arrays/documentmanager.cfg
+++ b/config-model/src/test/derived/arrays/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg
index dc208a86913..b26698d83a6 100644
--- a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg
+++ b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/complex/documentmanager.cfg b/config-model/src/test/derived/complex/documentmanager.cfg
index 50d5dac1ef9..bc5947ad2b5 100644
--- a/config-model/src/test/derived/complex/documentmanager.cfg
+++ b/config-model/src/test/derived/complex/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/emptydefault/documentmanager.cfg b/config-model/src/test/derived/emptydefault/documentmanager.cfg
index e69b2c5d8c3..f4234aee087 100644
--- a/config-model/src/test/derived/emptydefault/documentmanager.cfg
+++ b/config-model/src/test/derived/emptydefault/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/id/documentmanager.cfg b/config-model/src/test/derived/id/documentmanager.cfg
index 8ee82cdd946..dad69375887 100644
--- a/config-model/src/test/derived/id/documentmanager.cfg
+++ b/config-model/src/test/derived/id/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg b/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
index ca490b053f7..311c85a6bb1 100644
--- a/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
+++ b/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 documenttype[].id -94853056
 documenttype[].name "child_a"
 documenttype[].version 0
diff --git a/config-model/src/test/derived/indexswitches/documentmanager.cfg b/config-model/src/test/derived/indexswitches/documentmanager.cfg
index ffeaab177ba..8ba249ed751 100644
--- a/config-model/src/test/derived/indexswitches/documentmanager.cfg
+++ b/config-model/src/test/derived/indexswitches/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/inheritance/documentmanager.cfg b/config-model/src/test/derived/inheritance/documentmanager.cfg
index e054019bd8f..49bf53bce8d 100644
--- a/config-model/src/test/derived/inheritance/documentmanager.cfg
+++ b/config-model/src/test/derived/inheritance/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/inheritance/mother/documentmanager.cfg b/config-model/src/test/derived/inheritance/mother/documentmanager.cfg
index 71da9265521..3cf7eae655d 100644
--- a/config-model/src/test/derived/inheritance/mother/documentmanager.cfg
+++ b/config-model/src/test/derived/inheritance/mother/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[-126593034].id -126593034
 datatype[-126593034].structtype[single].name "child.body"
 datatype[-126593034].structtype[single].version 0
diff --git a/config-model/src/test/derived/inheritdiamond/documentmanager.cfg b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg
index df3f8908a60..06169c09969 100644
--- a/config-model/src/test/derived/inheritdiamond/documentmanager.cfg
+++ b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 336538650
 datatype[].structtype[].name "child_struct"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg b/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg
index 25872641741..8fa93b61569 100644
--- a/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg
+++ b/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/inheritfromparent/documentmanager.cfg b/config-model/src/test/derived/inheritfromparent/documentmanager.cfg
index c9cd6fd3042..e3b6ca87689 100644
--- a/config-model/src/test/derived/inheritfromparent/documentmanager.cfg
+++ b/config-model/src/test/derived/inheritfromparent/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg
index faef3f6923b..ea7a49b1acf 100644
--- a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg
+++ b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 documenttype[].id 1175161836
 documenttype[].name "parent"
 documenttype[].version 0
diff --git a/config-model/src/test/derived/mail/documentmanager.cfg b/config-model/src/test/derived/mail/documentmanager.cfg
index baf122d0241..b6fdbe8f210 100644
--- a/config-model/src/test/derived/mail/documentmanager.cfg
+++ b/config-model/src/test/derived/mail/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/mail/onlydoc/documentmanager.cfg b/config-model/src/test/derived/mail/onlydoc/documentmanager.cfg
index a19332685e9..27ac015e630 100644
--- a/config-model/src/test/derived/mail/onlydoc/documentmanager.cfg
+++ b/config-model/src/test/derived/mail/onlydoc/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/namecollision/documentmanager.cfg b/config-model/src/test/derived/namecollision/documentmanager.cfg
index 8d0d89dde35..99da89f4fbf 100644
--- a/config-model/src/test/derived/namecollision/documentmanager.cfg
+++ b/config-model/src/test/derived/namecollision/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg
index 9ab2da3f686..e37ea304b18 100644
--- a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/ranktypes/documentmanager.cfg b/config-model/src/test/derived/ranktypes/documentmanager.cfg
index a8bb9e904dc..dc02052c509 100644
--- a/config-model/src/test/derived/ranktypes/documentmanager.cfg
+++ b/config-model/src/test/derived/ranktypes/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/schemainheritance/documentmanager.cfg b/config-model/src/test/derived/schemainheritance/documentmanager.cfg
index 0dd87029f32..ec13eae92ff 100644
--- a/config-model/src/test/derived/schemainheritance/documentmanager.cfg
+++ b/config-model/src/test/derived/schemainheritance/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/streamingstruct/documentmanager.cfg b/config-model/src/test/derived/streamingstruct/documentmanager.cfg
index 63001ea38ca..567944d3b78 100644
--- a/config-model/src/test/derived/streamingstruct/documentmanager.cfg
+++ b/config-model/src/test/derived/streamingstruct/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/streamingstruct/onlydoc/documentmanager.cfg b/config-model/src/test/derived/streamingstruct/onlydoc/documentmanager.cfg
index 1a1cf522fdd..cb56da169fa 100644
--- a/config-model/src/test/derived/streamingstruct/onlydoc/documentmanager.cfg
+++ b/config-model/src/test/derived/streamingstruct/onlydoc/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/structanyorder/documentmanager.cfg b/config-model/src/test/derived/structanyorder/documentmanager.cfg
index 3ffc2f22a9b..be5e473e460 100644
--- a/config-model/src/test/derived/structanyorder/documentmanager.cfg
+++ b/config-model/src/test/derived/structanyorder/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/tensor/documenttypes.cfg b/config-model/src/test/derived/tensor/documenttypes.cfg
index acf5c7ed12f..879b455a711 100644
--- a/config-model/src/test/derived/tensor/documenttypes.cfg
+++ b/config-model/src/test/derived/tensor/documenttypes.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 documenttype[].id -1290043429
 documenttype[].name "tensor"
 documenttype[].version 0
diff --git a/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg b/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg
index 19d00483a5a..f121eb7628a 100644
--- a/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg
+++ b/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/derived/types/documentmanager.cfg b/config-model/src/test/derived/types/documentmanager.cfg
index 9556f77f6d9..ffdf090f761 100644
--- a/config-model/src/test/derived/types/documentmanager.cfg
+++ b/config-model/src/test/derived/types/documentmanager.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[].id 1381038251
 datatype[].structtype[].name "position"
 datatype[].structtype[].version 0
diff --git a/config-model/src/test/examples/fieldoftypedocument.cfg b/config-model/src/test/examples/fieldoftypedocument.cfg
index 8074d86b45f..5753ae556a6 100644
--- a/config-model/src/test/examples/fieldoftypedocument.cfg
+++ b/config-model/src/test/examples/fieldoftypedocument.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[0].id 1381038251
 datatype[0].structtype[0].name "position"
 datatype[0].structtype[0].version 0
diff --git a/config-model/src/test/examples/structresult.cfg b/config-model/src/test/examples/structresult.cfg
index ceaad2e6584..639d91c892d 100755
--- a/config-model/src/test/examples/structresult.cfg
+++ b/config-model/src/test/examples/structresult.cfg
@@ -1,4 +1,5 @@
 enablecompression false
+usev8geopositions false
 datatype[0].id 1381038251
 datatype[0].structtype[0].name "position"
 datatype[0].structtype[0].version 0