Merge pull request oskariorg#1246 from DenverCoder544/default_attributes_clean

do not add default attributes on import

Author: ZakarFin

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

@@ -22,7 +22,6 @@
 
 import fi.nls.oskari.control.*;
 
-import org.json.JSONArray;
 import org.oskari.log.AuditLog;
 import org.oskari.map.myfeatures.service.MyFeaturesService;
 import org.oskari.map.userlayer.input.FeatureCollectionParser;
@@ -100,10 +99,6 @@ public class ImportMyFeaturesHandler extends RestActionHandler {
     private static final String PARAM_SOURCE_EPSG_KEY = "sourceEpsg";
     private static final String KEY_STYLE = "style";
     private static final String KEY_LOCALE = "locale";
-    // attributes json
-    private static final String KEY_DEFAULT = "default";
-    private static final String KEY_FILTER = "filter";
-    private static final String KEY_DATA = "data";
 
     private static final int KB = 1024;
     private static final int MB = 1024 * KB;
@@ -590,9 +585,6 @@ private MyFeaturesLayer createLayer(String ownerUuid, List<MyFeaturesFieldInfo>
         JSONObject locale = JSONHelper.createJSONObject(formParams.get(KEY_LOCALE));
         JSONObject style = JSONHelper.createJSONObject(formParams.get(KEY_STYLE));
 
-        // create default attributes which only allow showing the fields defined in dataset
-        JSONObject attributes = getAttributesJSON(fields);
-
         WFSLayerOptions options = new WFSLayerOptions();
         options.setDefaultFeatureStyle(style);
 
@@ -607,25 +599,10 @@ private MyFeaturesLayer createLayer(String ownerUuid, List<MyFeaturesFieldInfo>
         layer.setLayerFields(layerFields);
         layer.setLocale(locale);
         layer.setLayerOptions(options);
-        layer.setAttributes(attributes);
         myFeaturesService.createLayer(layer);
         return layer;
     }
 
-    private static JSONObject getAttributesJSON(List<MyFeaturesFieldInfo> fields ) {
-        JSONObject attributes = new JSONObject();
-        JSONObject data = new JSONObject();
-        JSONObject filter = new JSONObject();
-        List<String> fieldNames = fields.stream().map(MyFeaturesFieldInfo::getName).toList();
-        JSONArray defaultFieldNames = new JSONArray(fieldNames);
-
-        filter.put(KEY_DEFAULT, defaultFieldNames);
-        data.put(KEY_FILTER, filter);
-        attributes.put(KEY_DATA, data);
-        return attributes;
-
-    }
-
     private static Optional<MyFeaturesFieldInfo> attribute(AttributeDescriptor attr) {
         String name = attr.getLocalName();
         Class<?> c = attr.getType().getBinding();