Commit f4e77da5 authored by Noel Alonso's avatar Noel Alonso
Browse files

Ampĺia mapper para activities

parent 44b1279b

atlas-commands/src/main/java/es/redmic/atlascommands/mapper/LayerInfoDTOMapper.java

+13 −3
Original line number Diff line number Diff line 
package es.redmic.atlascommands.mapper;



import java.util.List;



/*-

 * #%L

 * Atlas-management
@@ -22,8 +24,10 @@ package es.redmic.atlascommands.mapper; 


import org.mapstruct.Mapper;

import org.mapstruct.Mapping;

import org.mapstruct.Named;

import org.mapstruct.NullValuePropertyMappingStrategy;



import es.redmic.atlaslib.dto.layer.LayerActivityDTO;

import es.redmic.atlaslib.dto.layer.LayerDTO;

import es.redmic.atlaslib.dto.layerinfo.LayerInfoDTO;

import es.redmic.atlaslib.dto.layerwms.LayerWMSDTO;
@@ -37,7 +41,13 @@ public interface LayerInfoDTOMapper { 
	@Mapping(target = "alias",

		expression = "java(layerInfoDTO.getAlias() != null ? "

				+ "layerInfoDTO.getAlias() : (layerDTO.getTitle() != null ? layerDTO.getTitle() : layerDTO.getName()))")

	@Mapping(source = "layerInfoDTO", target = "activities", qualifiedByName = "activities")

	LayerDTO map(LayerInfoDTO layerInfoDTO, LayerWMSDTO layerWMSDTO);



	@Named("activities")

	default List<LayerActivityDTO> getActivities(LayerInfoDTO value) {

		return value.getActivities();

	}



	// @formatter:on

}

atlas-commands/src/main/java/es/redmic/atlascommands/mapper/LayerWMSMapper.java

+0 −30
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ public interface LayerWMSMapper { 
	@Mapping(source = "layer", target = "elevationDimension", qualifiedByName = "elevationDimension")

	@Mapping(source = "layer", target = "stylesLayer", qualifiedByName = "stylesLayer")

	@Mapping(source = "layer", target = "abstractLayer", qualifiedByName = "abstractLayer")

	//@Mapping(source = "layer", target = "activities", qualifiedByName = "activities")

	@Mapping(source = "layer", target = "geometry", qualifiedByName = "geometry")

	@Mapping(source = "layer", target = "keywords", qualifiedByName = "keywords")

	@Mapping(source = "layer", target = "attribution", qualifiedByName = "attribution")
@@ -137,35 +136,6 @@ public interface LayerWMSMapper { 
		return abstractLayer;

	}



	/*-@Named("activities")

	default List<ActivityDTO> getActivities(Layer layer, @Context String urlSource) {



		if (layer.get_abstract() == null)

			return null;



		String abstractLayer = layer.get_abstract().replaceAll(endLineRegex, " ");



		if (!abstractLayer.matches(refInBracketsRegex))

			return null;



		String ref = abstractLayer.replaceAll(refInBracketsRegex, "$1");



		if (!ref.matches(refRegex))

			return null;



		List<ActivityDTO> activities = new ArrayList<>();



		String listAct = ref.replaceAll(refRegex, "$1");

		String[] listActSplit = listAct.split(",");



		for (int i = 0; i < listActSplit.length; i++) {

			ActivityDTO activity = new ActivityDTO();

			activity.setId(listActSplit[i]);

			activities.add(activity);

		}

		return activities;

	}-*/



	@Named("geometry")

	default Polygon getGeometry(Layer layer, @Context String urlSource) {