Añade nuevos campo, actualiza nombres y tipos (9f670459) · Commits · REDMIC Project / Server / Atlas

atlas-view/src/main/java/es/redmic/atlasview/mapper/layer/LayerESMapper.java

+15 −4

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ package es.redmic.atlasview.mapper.layer;
		import org.springframework.stereotype.Component;

		import es.redmic.atlaslib.dto.layer.ActivityDTO;
		import es.redmic.atlaslib.dto.layer.AttributionDTO;
		import es.redmic.atlaslib.dto.layer.ContactDTO;
		import es.redmic.atlaslib.dto.layer.DimensionDTO;
		import es.redmic.atlaslib.dto.layer.LatLonBoundingBoxDTO;
		@@ -30,6 +31,7 @@ import es.redmic.atlaslib.dto.layer.LayerDTO;
		import es.redmic.atlaslib.dto.layer.ProtocolDTO;
		import es.redmic.atlaslib.dto.layer.StyleLayerDTO;
		import es.redmic.atlaslib.dto.themeinspire.ThemeInspireDTO;
		import es.redmic.atlasview.model.layer.Attribution;
		import es.redmic.atlasview.model.layer.Contact;
		import es.redmic.atlasview.model.layer.Dimension;
		import es.redmic.atlasview.model.layer.LatLonBoundingBox;
		@@ -47,8 +49,8 @@ public class LayerESMapper extends CustomMapper<Layer, LayerDTO> {
		@Override
		public void mapAtoB(Layer a, LayerDTO b, MappingContext context) {

		if (a.getStyleLayer() != null) {
		b.setStyleLayer(mapperFacade.map(a.getStyleLayer(), StyleLayerDTO.class));
		if (a.getStylesLayer() != null) {
		b.setStylesLayer(mapperFacade.mapAsList(a.getStylesLayer(), StyleLayerDTO.class));
		}

		if (a.getContact() != null) {
		@@ -78,14 +80,19 @@ public class LayerESMapper extends CustomMapper<Layer, LayerDTO> {
		if (a.getElevationDimension() != null) {
		b.setElevationDimension(mapperFacade.map(a.getElevationDimension(), DimensionDTO.class));
		}

		if (a.getAttribution() != null) {
		b.setAttribution(mapperFacade.map(a.getAttribution(), AttributionDTO.class));
		}

		super.mapAtoB(a, b, context);
		}

		@Override
		public void mapBtoA(LayerDTO b, Layer a, MappingContext context) {

		if (b.getStyleLayer() != null) {
		a.setStyleLayer(mapperFacade.map(b.getStyleLayer(), StyleLayer.class));
		if (b.getStylesLayer() != null) {
		a.setStylesLayer(mapperFacade.mapAsList(b.getStylesLayer(), StyleLayer.class));
		}

		if (b.getContact() != null) {
		@@ -116,6 +123,10 @@ public class LayerESMapper extends CustomMapper<Layer, LayerDTO> {
		a.setElevationDimension(mapperFacade.map(b.getElevationDimension(), Dimension.class));
		}

		if (b.getAttribution() != null) {
		a.setAttribution(mapperFacade.map(b.getAttribution(), Attribution.class));
		}

		super.mapBtoA(b, a, context);
		}
		}

atlas-view/src/main/java/es/redmic/atlasview/model/layer/Layer.java

+15 −15

Original line number	Diff line number	Diff line
		@@ -30,9 +30,9 @@ public class Layer extends LayerModelCompact {

		private String title;
		private String abstractLayer;
		private List<String> keyword;
		private List<String> keywords;
		private List<String> srs;
		private StyleLayer styleLayer;
		private List<StyleLayer> stylesLayer;
		private Contact contact;
		private List<ActivityCompact> activities;
		private String urlSource;
		@@ -43,7 +43,7 @@ public class Layer extends LayerModelCompact {
		private List<Protocol> protocols;
		private Polygon geometry;
		private String legend;
		private Boolean opaque = false;
		private Attribution attribution;
		private Dimension timeDimension;
		private Dimension elevationDimension;

		@@ -66,12 +66,12 @@ public class Layer extends LayerModelCompact {
		this.title = title;
		}

		public List<String> getKeyword() {
		return keyword;
		public List<String> getKeywords() {
		return keywords;
		}

		public void setKeyword(List<String> keyword) {
		this.keyword = keyword;
		public void setKeywords(List<String> keywords) {
		this.keywords = keywords;
		}

		public List<String> getSrs() {
		@@ -90,12 +90,12 @@ public class Layer extends LayerModelCompact {
		this.abstractLayer = abstractLayer;
		}

		public StyleLayer getStyleLayer() {
		return styleLayer;
		public List<StyleLayer> getStylesLayer() {
		return stylesLayer;
		}

		public void setStyleLayer(StyleLayer styleLayer) {
		this.styleLayer = styleLayer;
		public void setStylesLayer(List<StyleLayer> stylesLayer) {
		this.stylesLayer = stylesLayer;
		}

		public Polygon getGeometry() {
		@@ -114,12 +114,12 @@ public class Layer extends LayerModelCompact {
		this.legend = legend;
		}

		public Boolean getOpaque() {
		return opaque;
		public Attribution getAttribution() {
		return attribution;
		}

		public void setOpaque(Boolean opaque) {
		this.opaque = opaque;
		public void setAttribution(Attribution attribution) {
		this.attribution = attribution;
		}

		public Dimension getTimeDimension() {

atlas-view/src/test/resources/data/dto/layer/layer.json

+42 −11

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		"refresh": 0,
		"title": "Especies en cuadrículas 100x100m",
		"abstractLayer": "Registros de especies representados en cuadrículas de cuadrículas 100x100m",
		"keyword": [
		"keywords": [
		"100m"
		],
		"srs": [
		@@ -22,13 +22,36 @@
		"EPSG:32628",
		"CRS:84"
		],
		"styleLayer": {
		"name": "sd:citationgrid100",
		"stylesLayer": [
		{
		"name": "el:batimetria50mCanarias",
		"title": "Isobatas cada 50 m azules",
		"abstractStyle": "Apropiado para representar isobatas con 50 m de equidistancia, en varios niveles de escala o zoom, en los que se adapta el etiquetado para mejorar la visualización",
		"format": "image/png",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias"
		},
		{
		"name": "el:batimetriaMacaronesia",
		"title": null,
		"abstractStyle": null,
		"format": "image/png",
		"url": "https://atlas.redmic.es/geoserver/sd/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=SpeciesInCell100m",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias&style=batimetriaMacaronesia"
		},
		{
		"name": "el:batimetria1mCanarias",
		"title": null,
		"abstractStyle": null
		"abstractStyle": null,
		"format": "image/png",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias&style=batimetria1mCanarias"
		},
		{
		"name": "el:batimetria50mCanariasGroup",
		"title": null,
		"abstractStyle": null,
		"format": "image/png",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias&style=batimetria50mCanariasGroup"
		}
		],
		"contact": {
		"name": "José Andrés Sevilla",
		"organization": "Observatorio Ambiental Granadilla",
		@@ -64,7 +87,7 @@
		],
		"image": "/api/mediastorage/photobank/layers/635.png",
		"latLonBoundsImage": {
		"minY": 28.56990337371826,
		"minY": 28.56990337371826,"unitSymbol": "m",
		"minX": -16.3326358795166,
		"maxY": 28.58088970184326,
		"maxX": -16.3216495513916
		@@ -88,7 +111,14 @@
		]
		},
		"legend": "https://redmic.local/ww",
		"opaque": false,
		"attribution": {
		"title": "Observatorio Ambiental Granadilla",
		"onlineResource": "http://www.oag-fundacion.org",
		"logoURL": {
		"format": "image/jpeg",
		"onlineResource": "http://www.oag-fundacion.org/content/logos/oag_sinmedusa.jpg"
		}
		},
		"timeDimension": {
		"name": "time",
		"units": "ISO8601",
		@@ -97,7 +127,8 @@
		"elevationDimension": {
		"name": "elevation",
		"units": "ISO8601",
		"defaultValue": "z1"
		"unitSymbol": "m",
		"defaultValue": "1"
		},
		"parent": {
		"id": "category-333",

atlas-view/src/test/resources/data/dto/layer/searchWrapperLayerDTO.json

+41 −10

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		"title": "Especies en cuadrículas 100x100m",
		"refresh": 0,
		"abstractLayer": "Registros de especies representados en cuadrículas de cuadrículas 100x100m",
		"keyword": [
		"keywords": [
		"100m"
		],
		"srs": [
		@@ -36,13 +36,36 @@
		"EPSG:32628",
		"CRS:84"
		],
		"styleLayer": {
		"name": "sd:citationgrid100",
		"stylesLayer": [
		{
		"name": "el:batimetria50mCanarias",
		"title": "Isobatas cada 50 m azules",
		"abstractStyle": "Apropiado para representar isobatas con 50 m de equidistancia, en varios niveles de escala o zoom, en los que se adapta el etiquetado para mejorar la visualización",
		"format": "image/png",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias"
		},
		{
		"name": "el:batimetriaMacaronesia",
		"title": null,
		"abstractStyle": null,
		"format": "image/png",
		"url": "https://atlas.redmic.es/geoserver/sd/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=SpeciesInCell100m",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias&style=batimetriaMacaronesia"
		},
		{
		"name": "el:batimetria1mCanarias",
		"title": null,
		"abstractStyle": null
		"abstractStyle": null,
		"format": "image/png",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias&style=batimetria1mCanarias"
		},
		{
		"name": "el:batimetria50mCanariasGroup",
		"title": null,
		"abstractStyle": null,
		"format": "image/png",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias&style=batimetria50mCanariasGroup"
		}
		],
		"contact": {
		"name": "José Andrés Sevilla",
		"organization": "Observatorio Ambiental Granadilla",
		@@ -102,7 +125,14 @@
		]
		},
		"legend": "https://redmic.local/ww",
		"opaque": false,
		"attribution": {
		"title": "Observatorio Ambiental Granadilla",
		"onlineResource": "http://www.oag-fundacion.org",
		"logoURL": {
		"format": "image/jpeg",
		"onlineResource": "http://www.oag-fundacion.org/content/logos/oag_sinmedusa.jpg"
		}
		},
		"timeDimension": {
		"name": "time",
		"units": "ISO8601",
		@@ -111,7 +141,8 @@
		"elevationDimension": {
		"name": "elevation",
		"units": "ISO8601",
		"defaultValue": "z1"
		"unitSymbol": "m",
		"defaultValue": "1"
		},
		"parent": null,
		"updated": "2017-05-23T12:35:12.052+00:00",

atlas-view/src/test/resources/data/model/layer/layer.json

+41 −10

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		"refresh": 0,
		"title": "Especies en cuadrículas 100x100m",
		"abstractLayer": "Registros de especies representados en cuadrículas de cuadrículas 100x100m",
		"keyword": [
		"keywords": [
		"100m"
		],
		"srs": [
		@@ -22,13 +22,36 @@
		"EPSG:32628",
		"CRS:84"
		],
		"styleLayer": {
		"name": "sd:citationgrid100",
		"stylesLayer": [
		{
		"name": "el:batimetria50mCanarias",
		"title": "Isobatas cada 50 m azules",
		"abstractStyle": "Apropiado para representar isobatas con 50 m de equidistancia, en varios niveles de escala o zoom, en los que se adapta el etiquetado para mejorar la visualización",
		"format": "image/png",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias"
		},
		{
		"name": "el:batimetriaMacaronesia",
		"title": null,
		"abstractStyle": null,
		"format": "image/png",
		"url": "https://atlas.redmic.es/geoserver/sd/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=SpeciesInCell100m",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias&style=batimetriaMacaronesia"
		},
		{
		"name": "el:batimetria1mCanarias",
		"title": null,
		"abstractStyle": null
		"abstractStyle": null,
		"format": "image/png",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias&style=batimetria1mCanarias"
		},
		{
		"name": "el:batimetria50mCanariasGroup",
		"title": null,
		"abstractStyle": null,
		"format": "image/png",
		"url": "http://atlas.redmic.es:80/el/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=batimetriaCanarias&style=batimetria50mCanariasGroup"
		}
		],
		"contact": {
		"name": "José Andrés Sevilla",
		"organization": "Observatorio Ambiental Granadilla",
		@@ -88,7 +111,14 @@
		]
		},
		"legend": "https://redmic.local/ww",
		"opaque": false,
		"attribution": {
		"title": "Observatorio Ambiental Granadilla",
		"onlineResource": "http://www.oag-fundacion.org",
		"logoURL": {
		"format": "image/jpeg",
		"onlineResource": "http://www.oag-fundacion.org/content/logos/oag_sinmedusa.jpg"
		}
		},
		"timeDimension": {
		"name": "time",
		"units": "ISO8601",
		@@ -97,7 +127,8 @@
		"elevationDimension": {
		"name": "elevation",
		"units": "ISO8601",
		"defaultValue": "z1"
		"unitSymbol": "m",
		"defaultValue": "1"
		},
		"updated": "2017-05-23T12:35:12.052+00:00",
		"inserted": "2017-05-23T12:35:12.052+00:00"