Merge pull request #1238 from DenverCoder544/myfeatures_attributes

handle attributes in myfeatures

Author: ZakarFin

control-myfeatures/src/main/java/org/oskari/control/myfeatures/MyFeaturesLayerHandler.java

@@ -136,6 +136,7 @@ public void handlePut(ActionParameters params) throws ActionException {
 
         layer.setLocale(new JSONObject(updateLayer.getLocale()));
         layer.getLayerOptions().setDefaultFeatureStyle(new JSONObject(updateLayer.getStyle()));
+        layer.setAttributes(new JSONObject(updateLayer.getAttributes()));
 
         service.updateLayer(layer);
 

control-myfeatures/src/main/java/org/oskari/control/myfeatures/MyFeaturesWFSHelper.java

@@ -1,6 +1,7 @@
 package org.oskari.control.myfeatures;
 
 import fi.nls.oskari.annotation.Oskari;
+import org.json.JSONArray;
 import org.oskari.user.User;
 
 import fi.nls.oskari.domain.map.OskariLayer;
@@ -38,6 +39,8 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -218,19 +221,60 @@ private List<FeatureProperties> getProperties(MyFeaturesLayer layer, String lang
         List<FeatureProperties> props = new ArrayList<>();
 
         int i = 0;
+        JSONObject attributes = layer.getAttributes();
+
         for (MyFeaturesFieldInfo field : layer.getLayerFields()) {
             FeatureProperties p = new FeatureProperties();
             p.name = field.getName();
             p.type = field.getType().getSimpleType();
             p.rawType = field.getType().getOutputBinding().getName();
-            p.label = field.getName();
-            p.hidden = false;
-            p.format = null;
-            p.order = i++;
+            p.label = getLocalizedName(field, attributes, lang);
+            p.hidden = getHidden(field, attributes);
+            p.format = getFieldFormat(field, attributes);
+            p.order = getFieldOrder(field, attributes, i);
             props.add(p);
         }
 
         return props;
     }
 
+    private String getLocalizedName(MyFeaturesFieldInfo field, JSONObject attributes, String lang) {
+        JSONObject locale = Optional.ofNullable(attributes.optJSONObject("data"))
+                .map(o -> o.optJSONObject("locale"))
+                .map(o -> o.optJSONObject(lang, null)).orElse(null);
+        return locale == null ? field.getName() : locale.optString(field.getName(), field.getName());
+    }
+
+    private Boolean getHidden(MyFeaturesFieldInfo field, JSONObject attributes) {
+        List<String> list = getFilter(attributes);
+        return !list.contains(field.getName());
+    }
+
+    private Map<String, Object> getFieldFormat(MyFeaturesFieldInfo field, JSONObject attributes) {
+        JSONObject formatJSON = Optional.ofNullable(attributes.optJSONObject("data"))
+                .map(o -> o.optJSONObject("format"))
+                .map(o -> o.optJSONObject(field.getName())).orElse(null);
+        return formatJSON != null ? formatJSON.toMap() : null;
+    }
+
+    private List<String> getFilter(JSONObject attributes) {
+        JSONArray filter = Optional.ofNullable(attributes.optJSONObject("data"))
+                .map(o -> o.optJSONObject("filter"))
+                .map(o -> o.optJSONArray("default")).orElse(null);
+        List<String> list = filter == null
+                ? Collections.emptyList()
+                : filter.toList().stream()
+                .map(Object::toString)
+                .toList();
+        return list;
+    }
+
+    private int getFieldOrder(MyFeaturesFieldInfo field, JSONObject attributes, int index) {
+        List<String> list = getFilter(attributes);
+        if (!list.contains(field.getName())) {
+            return index;
+        }
+
+        return list.indexOf(field.getName());
+    }
 }

control-myfeatures/src/main/java/org/oskari/control/myfeatures/dto/CreateMyFeaturesLayer.java

@@ -13,6 +13,7 @@ public class CreateMyFeaturesLayer {
     private List<MyFeaturesFieldInfo> layerFields;
     private Map<String, Map<String, Object>> locale;
     private Map<String, Object> style;
+    private Map<String, Map<String, Object>> attributes;
 
     public List<MyFeaturesFieldInfo> getLayerFields() {
         return layerFields;
@@ -52,4 +53,11 @@ public List<String> validate() {
         return errors;
     }
 
+    public Map<String, Map<String, Object>> getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(Map<String, Map<String, Object>> attributes) {
+        this.attributes = attributes;
+    }
 }

control-myfeatures/src/main/java/org/oskari/control/myfeatures/dto/UpdateMyFeaturesLayer.java

@@ -14,6 +14,7 @@ public class UpdateMyFeaturesLayer {
     private String id;
     private Map<String, Map<String, Object>> locale;
     private Map<String, Object> style;
+    private Map<String, Map<String, Object>> attributes;
 
     public String getId() {
         return id;
@@ -55,4 +56,11 @@ public List<String> validate() {
         return errors;
     }
 
+    public Map<String, Map<String, Object>> getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(Map<String, Map<String, Object>> attributes) {
+        this.attributes = attributes;
+    }
 }