fix map handling of null geometries

jyrimatti · jyrimatti · commit e933dddf0ce1 · 2023-05-10T11:32:29.000+03:00
diff --git a/.project b/.project
@@ -20,4 +20,24 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1683120924267</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-bin</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1683120924280</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-out</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.solita.utils</groupId>
     <artifactId>api-utils</artifactId>
-    <version>0.12.83</version>
+    <version>0.12.84</version>
     <build>
         <resources>
             <resource>
@@ -27,8 +27,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.7.0</version>
                 <configuration>
-                    <source>9</source>
-                    <target>9</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <encoding>UTF-8</encoding>
                     <optimize>true</optimize>
                     <proc>none</proc>
diff --git a/src/main/java/fi/solita/utils/api/Includes.java b/src/main/java/fi/solita/utils/api/Includes.java
@@ -146,6 +146,7 @@ public static final <T> Includes<T> resolveIncludes(ResolvableMemberProvider pro
                 case JSON:
                 case JSONL:
                 case XML:
+                case COUNT:
                     ret = Includes.withNestedMembers(members, Includes.Include.All, builders);
                     break;
             }
@@ -173,6 +174,7 @@ public static final <T> Includes<T> resolveIncludes(ResolvableMemberProvider pro
             case CSV:
             case XLSX:
             case XML:
+            case COUNT:
         }
         
         // Exclusions. Also excludes geometries if explicitly excluded.
diff --git a/src/main/java/fi/solita/utils/api/Transform.java b/src/main/java/fi/solita/utils/api/Transform.java
@@ -4,7 +4,6 @@
 import static fi.solita.utils.functional.Collections.newList;
 import static fi.solita.utils.functional.Functional.filter;
 import static fi.solita.utils.functional.Functional.flatten;
-import static fi.solita.utils.functional.Functional.head;
 import static fi.solita.utils.functional.Predicates.equalTo;
 
 import java.math.BigDecimal;
diff --git a/src/main/java/fi/solita/utils/api/format/HtmlConversionService.java b/src/main/java/fi/solita/utils/api/format/HtmlConversionService.java
@@ -358,7 +358,7 @@ static String uriWithIncrementedStartIndex(HttpServletRequest request, boolean l
             int count = Integer.parseInt(cm.group(1));
             
             String uri = RequestUtil.getApiVersionBasePath(request) + drop(1, RequestUtil.getAPIVersionRelativePathWithoutRevision(request)) + Option.of(request.getQueryString()).map(Transformers.prepend("?")).getOrElse("");
-            StringBuilder sb = new StringBuilder();
+            StringBuffer sb = new StringBuffer();
             Matcher m = START_INDEX.matcher(uri);
             if (m.find()) {
                 m.appendReplacement(sb, "startIndex=" + (Integer.parseInt(m.group(1)) + count));
diff --git a/src/main/java/fi/solita/utils/api/format/JsonObjectMapper.java b/src/main/java/fi/solita/utils/api/format/JsonObjectMapper.java
@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.cfg.DeserializerFactoryConfig;
 import com.fasterxml.jackson.databind.cfg.SerializerFactoryConfig;
@@ -174,6 +173,7 @@ public JsonSerializer<Object> createSerializer(SerializerProvider prov, JavaType
         
         private static final JsonSerializer<Object> stdStringKeySerializer = StdKeySerializers.getStdKeySerializer(null, String.class, false);
 
+        @SuppressWarnings("unchecked")
         @Override
         public JsonSerializer<Object> createKeySerializer(final SerializerProvider ctxt, JavaType type, final JsonSerializer<Object> defaultImpl) throws JsonMappingException {
             JsonSerializer<Object> serializer = super.createKeySerializer(ctxt, type, defaultImpl);
diff --git a/src/main/java/fi/solita/utils/api/format/XmlConversionService.java b/src/main/java/fi/solita/utils/api/format/XmlConversionService.java
@@ -5,7 +5,6 @@
 import static fi.solita.utils.functional.Collections.newMutableMap;
 import static fi.solita.utils.functional.Functional.concat;
 import static fi.solita.utils.functional.Functional.flatMap;
-import static fi.solita.utils.functional.FunctionalA.concat;
 
 import java.util.Map;
 
diff --git a/src/main/java/fi/solita/utils/api/request/SupportServiceBase.java b/src/main/java/fi/solita/utils/api/request/SupportServiceBase.java
@@ -20,7 +20,6 @@
 import org.joda.time.LocalDate;
 import org.joda.time.Period;
 
-import fi.solita.utils.api.NotFoundException;
 import fi.solita.utils.api.base.http.HttpSerializers.InvalidValueException;
 import fi.solita.utils.api.format.SerializationFormat;
 import fi.solita.utils.api.util.RequestUtil;
diff --git a/src/main/java/fi/solita/utils/api/resolving/GeojsonResolver.java b/src/main/java/fi/solita/utils/api/resolving/GeojsonResolver.java
@@ -1,12 +1,12 @@
 package fi.solita.utils.api.resolving;
 
-import static fi.solita.utils.functional.Collections.emptyList;
 import static fi.solita.utils.functional.Collections.newList;
-import static fi.solita.utils.functional.Functional.concat;
+import static fi.solita.utils.functional.Collections.newMutableList;
 import static fi.solita.utils.functional.Functional.filter;
 import static fi.solita.utils.functional.Functional.flatMap;
 
 import java.util.Collection;
+import java.util.List;
 
 import fi.solita.utils.api.Includes;
 import fi.solita.utils.api.format.geojson.FeatureObject;
@@ -19,15 +19,15 @@ public abstract class GeojsonResolver {
     
     @SuppressWarnings("unchecked")
     public <DTO> Collection<FeatureObject> getResolvedFeatures(Iterable<DTO> d, Includes<DTO> includes) {
-        Iterable<FeatureObject> ret = emptyList();
+        List<FeatureObject> ret = newMutableList();
         for (final MetaNamedMember<DTO,Object> member: (Iterable<MetaNamedMember<DTO,Object>>)(Object)filter(ResolvableMemberProvider_.isResolvableMember, includes)) {
             for (DTO t: d) {
-                ret = concat(ret, flatMap(new Apply<Object, Collection<FeatureObject>>() {
+                ret.addAll(newList(flatMap(new Apply<Object, Collection<FeatureObject>>() {
                     @Override
                     public Collection<FeatureObject> apply(Object resolvable) {
                         return getFeaturesForResolvable(member, resolvable);
                     }
-                }, ResolvableMemberProvider.unwrapResolvable(((ResolvableMember<DTO>)member).original, t)));
+                }, ResolvableMemberProvider.unwrapResolvable(((ResolvableMember<DTO>)member).original, t))));
             }
         }
         return newList(ret);
diff --git a/src/main/java/fi/solita/utils/api/util/MemberUtil.java b/src/main/java/fi/solita/utils/api/util/MemberUtil.java
@@ -7,7 +7,6 @@
 import static fi.solita.utils.functional.Functional.sort;
 import static fi.solita.utils.functional.Option.None;
 import static fi.solita.utils.functional.Option.Some;
-import static fi.solita.utils.functional.Predicates.equalTo;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;
diff --git a/src/main/resources/r/js/olstuff.js b/src/main/resources/r/js/olstuff.js
@@ -370,9 +370,9 @@ var olstuff = function(constants, util) {
 
                           // openlayers throws error if coordinates == null
                           if (response.type == 'FeatureCollection') {
-                              response.features.filter(f => f.geometry.coordinates == null).forEach((f => f.geometry.coordinates = []));
+                              response.features.filter(f => f.geometry && f.geometry.coordinates == null).forEach((f => f.geometry.coordinates = []));
                           } else if (response.type == 'Feature') {
-                              if (response.geometry.coordinates == null) {
+                              if (response.geometry && response.geometry.coordinates == null) {
                                   response.geometry.coordinates = [];
                               }
                           }

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ public static final <T> Includes<T> resolveIncludes(ResolvableMemberProvider pro`
`146`	`146`	`case JSON:`
`147`	`147`	`case JSONL:`
`148`	`148`	`case XML:`
	`149`	`+ case COUNT:`
`149`	`150`	`ret = Includes.withNestedMembers(members, Includes.Include.All, builders);`
`150`	`151`	`break;`
`151`	`152`	`}`
`@@ -173,6 +174,7 @@ public static final <T> Includes<T> resolveIncludes(ResolvableMemberProvider pro`
`173`	`174`	`case CSV:`
`174`	`175`	`case XLSX:`
`175`	`176`	`case XML:`
	`177`	`+ case COUNT:`
`176`	`178`	`}`
`177`	`179`
`178`	`180`	`// Exclusions. Also excludes geometries if explicitly excluded.`
Original file line number	Diff line number	Diff line change
`@@ -370,9 +370,9 @@ var olstuff = function(constants, util) {`
`370`	`370`
`371`	`371`	`// openlayers throws error if coordinates == null`
`372`	`372`	`if (response.type == 'FeatureCollection') {`
`373`		`- response.features.filter(f => f.geometry.coordinates == null).forEach((f => f.geometry.coordinates = []));`
	`373`	`+ response.features.filter(f => f.geometry && f.geometry.coordinates == null).forEach((f => f.geometry.coordinates = []));`
`374`	`374`	`} else if (response.type == 'Feature') {`
`375`		`- if (response.geometry.coordinates == null) {`
	`375`	`+ if (response.geometry && response.geometry.coordinates == null) {`
`376`	`376`	`response.geometry.coordinates = [];`
`377`	`377`	`}`
`378`	`378`	`}`