Renamed "grouped custom layers" to "grouped overlay layers"
This commit is contained in:
parent
f5785268ef
commit
6a38ebc0c8
|
@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
||||||
## [v2.2.0-SNAPSHOT]
|
## [v2.2.0-SNAPSHOT]
|
||||||
|
|
||||||
- Integrated the cross-filtering configuration [#25074]
|
- Integrated the cross-filtering configuration [#25074]
|
||||||
- Integrated the grouped custom layers configuration [#25110]
|
- Integrated the grouped overlay layers configuration [#25110]
|
||||||
|
|
||||||
## [v2.1.0] - 2023-05-11
|
## [v2.1.0] - 2023-05-11
|
||||||
|
|
||||||
|
|
|
@ -375,7 +375,7 @@ public class ConvertToDataValueObjectModel {
|
||||||
return hdDV;
|
return hdDV;
|
||||||
}
|
}
|
||||||
|
|
||||||
case grouped_custom_layers: {
|
case grouped_overlay_layers: {
|
||||||
|
|
||||||
List<GroupedCustomLayersDV> listGroupedCL = new ArrayList<GroupedCustomLayersDV>(
|
List<GroupedCustomLayersDV> listGroupedCL = new ArrayList<GroupedCustomLayersDV>(
|
||||||
jsonConfigurations.size());
|
jsonConfigurations.size());
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package org.gcube.application.geoportalcommon.shared.geoportal.ucd;
|
package org.gcube.application.geoportalcommon.shared.geoportal.ucd;
|
||||||
|
|
||||||
public enum GEOPORTAL_CONFIGURATION_TYPE {
|
public enum GEOPORTAL_CONFIGURATION_TYPE {
|
||||||
item_fields("itemFields"), gcube_profiles("gcubeProfiles"), actions_definition("actionsDefinition"), grouped_custom_layers("grouped_custom_layers");
|
item_fields("itemFields"), gcube_profiles("gcubeProfiles"), actions_definition("actionsDefinition"), grouped_overlay_layers("grouped_overlay_layers");
|
||||||
|
|
||||||
String id;
|
String id;
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ public enum GEOPORTAL_DATA_HANDLER {
|
||||||
geoportal_workflow_action_list("org.gcube.portlets.user.geoportal-workflow-action-list","WORKFLOW_ACTION_LIST_GUI"),
|
geoportal_workflow_action_list("org.gcube.portlets.user.geoportal-workflow-action-list","WORKFLOW_ACTION_LIST_GUI"),
|
||||||
geoportal_timeline_json_template("org.gcube.portlets.user.geoportal-timeline-json-template","TIMELINE_JSON_TEMPLATE"),
|
geoportal_timeline_json_template("org.gcube.portlets.user.geoportal-timeline-json-template","TIMELINE_JSON_TEMPLATE"),
|
||||||
geoportal_cross_filtering("org.gcube.portlets.user.cross-filtering","CROSS_FILTERING"),
|
geoportal_cross_filtering("org.gcube.portlets.user.cross-filtering","CROSS_FILTERING"),
|
||||||
geoportal_grouped_custom_layers("org.gcube.portlets.user.grouped_custom_layers","GROUPED_CUSTOM_LAYERS"),
|
geoportal_grouped_overlay_layers("org.gcube.portlets.user.grouped_overlay_layers","GROUPED_OVERLAY_LAYERS"),
|
||||||
gna_concessioni_lc("GNA-CONCESSIONI-LC", "LifecycleManagement");
|
gna_concessioni_lc("GNA-CONCESSIONI-LC", "LifecycleManagement");
|
||||||
|
|
||||||
String id;
|
String id;
|
||||||
|
|
|
@ -243,7 +243,7 @@ public class UCD_Tests {
|
||||||
UseCaseDescriptorCaller client = GeoportalClientCaller.useCaseDescriptors();
|
UseCaseDescriptorCaller client = GeoportalClientCaller.useCaseDescriptors();
|
||||||
|
|
||||||
if (handlersIds == null) {
|
if (handlersIds == null) {
|
||||||
handlersIds = Arrays.asList(GEOPORTAL_DATA_HANDLER.geoportal_grouped_custom_layers.getId());
|
handlersIds = Arrays.asList(GEOPORTAL_DATA_HANDLER.geoportal_grouped_overlay_layers.getId());
|
||||||
System.out.println("handlersIds is null, so using default: " + handlersIds);
|
System.out.println("handlersIds is null, so using default: " + handlersIds);
|
||||||
}
|
}
|
||||||
listUseCaseDescriptor = client.getListForHandlerIds(handlersIds);
|
listUseCaseDescriptor = client.getListForHandlerIds(handlersIds);
|
||||||
|
@ -276,7 +276,7 @@ public class UCD_Tests {
|
||||||
ScopeProvider.instance.set(CONTEXT);
|
ScopeProvider.instance.set(CONTEXT);
|
||||||
SecurityTokenProvider.instance.set(TOKEN);
|
SecurityTokenProvider.instance.set(TOKEN);
|
||||||
|
|
||||||
String handlerType = GEOPORTAL_DATA_HANDLER.geoportal_grouped_custom_layers.getType();
|
String handlerType = GEOPORTAL_DATA_HANDLER.geoportal_grouped_overlay_layers.getType();
|
||||||
|
|
||||||
UseCaseDescriptor ucd = null;
|
UseCaseDescriptor ucd = null;
|
||||||
List<HandlerDeclaration> handlers = null;
|
List<HandlerDeclaration> handlers = null;
|
||||||
|
@ -293,7 +293,7 @@ public class UCD_Tests {
|
||||||
for (HandlerDeclaration handlerDeclaration : handlers) {
|
for (HandlerDeclaration handlerDeclaration : handlers) {
|
||||||
System.out.println(handlerDeclaration);
|
System.out.println(handlerDeclaration);
|
||||||
System.out.println("Config json: "+handlerDeclaration.getConfiguration().toJson());
|
System.out.println("Config json: "+handlerDeclaration.getConfiguration().toJson());
|
||||||
HandlerDeclarationDV handlerDV = ConvertToDataValueObjectModel.toHandlerDeclarationDV(handlerDeclaration, ucd, GEOPORTAL_CONFIGURATION_TYPE.grouped_custom_layers);
|
HandlerDeclarationDV handlerDV = ConvertToDataValueObjectModel.toHandlerDeclarationDV(handlerDeclaration, ucd, GEOPORTAL_CONFIGURATION_TYPE.grouped_overlay_layers);
|
||||||
System.out.println("handlerDV is: "+handlerDV);
|
System.out.println("handlerDV is: "+handlerDV);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue