Merge branch 'develop' into feature/IM-384-KEYCLOAK

integratedmodelling · Jun 13, 2024 · 8556bbb · 8556bbb
2 parents 01b9b4a + 630a835
commit 8556bbb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/adapters/klab.ogc/src/main/java/org/integratedmodelling/klab/stac/STACService.java b/adapters/klab.ogc/src/main/java/org/integratedmodelling/klab/stac/STACService.java
@@ -42,8 +42,6 @@ public HMStacCollection getCollection() {
 
     public IGeometry getGeometry(IParameters<String> parameters) {
         GeometryBuilder gBuilder = Geometry.builder();
-        gBuilder.time().generic();
-
         ReferencedEnvelope envelope = collection.getSpatialBounds();
         double[] upperCorner = {envelope.getMaxX(), envelope.getMaxY()};
         double[] lowerCorner = {envelope.getMinX(), envelope.getMinY()};
@@ -52,7 +50,8 @@ public IGeometry getGeometry(IParameters<String> parameters) {
 
         setTemporalInterval(gBuilder);
 
-        Geometry ret = gBuilder.build().withProjection(Projection.DEFAULT_PROJECTION_CODE);
+        Geometry ret = gBuilder.build().withProjection(Projection.DEFAULT_PROJECTION_CODE)
+                .withTimeType("grid");
         return ret;
     }
 

diff --git a/...org.integratedmodelling.kim/src/org/integratedmodelling/kim/validation/KimValidator.xtend b/...org.integratedmodelling.kim/src/org/integratedmodelling/kim/validation/KimValidator.xtend
@@ -2378,11 +2378,12 @@ class KimValidator extends AbstractKimValidator {
 
 						if (fits) {
 							ret.emergenceTriggers.add(countable)
-						} else {
+						} 
+						/* else {
 							error("inconsistent use of the 'emerges from' clause", concept,
 								KimPackage.Literals.CONCEPT_STATEMENT_BODY__EMERGENCE_TRIGGERS)
 							ok = false
-						}
+						} */
 						i++
 					}
 				}

diff --git a/...ntegratedmodelling.kim/xtend-gen/org/integratedmodelling/kim/validation/KimValidator.java b/...ntegratedmodelling.kim/xtend-gen/org/integratedmodelling/kim/validation/KimValidator.java
@@ -2900,10 +2900,6 @@ public KimConceptStatement validateConceptBody(final ConceptStatementBody concep
               }
               if (fits) {
                 ret.getEmergenceTriggers().add(countable);
-              } else {
-                this.error("inconsistent use of the \'emerges from\' clause", concept, 
-                  KimPackage.Literals.CONCEPT_STATEMENT_BODY__EMERGENCE_TRIGGERS);
-                ok = false;
               }
               i_2++;
             }