Commit 17d3951b authored by Noel Alonso's avatar Noel Alonso
Browse files

Cambia tipos y nombre de campos de layer

parent 92590363

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

+11 −14
Original line number Diff line number Diff line
@@ -22,12 +22,9 @@ package es.redmic.atlasview.model.layer; 


import java.util.List;



import org.locationtech.jts.geom.Geometry;

import org.locationtech.jts.geom.Polygon;



import es.redmic.models.es.administrative.model.ActivityReferences;

import es.redmic.models.es.atlas.Contact;

import es.redmic.models.es.atlas.LatLonBoundingBox;

import es.redmic.models.es.atlas.StyleLayer;

import es.redmic.models.es.administrative.model.ActivityCompact;



public class Layer extends LayerModelCompact {
@@ -37,15 +34,15 @@ public class Layer extends LayerModelCompact { 
	private List<String> srs;

	private StyleLayer styleLayer;

	private Contact contact;

	private List<ActivityReferences> activities;

	private List<ActivityCompact> activities;

	private String urlSource;

	private Boolean queryable;

	private List<String> formats;

	private String image;

	private LatLonBoundingBox latLonBoundsImage;

	private List<Protocols> protocols;

	private List<Protocol> protocols;



	private Geometry geometry;

	private Polygon geometry;



	public Layer() {

	}
@@ -98,19 +95,19 @@ public class Layer extends LayerModelCompact { 
		this.styleLayer = styleLayer;

	}



	public Geometry getGeometry() {

	public Polygon getGeometry() {

		return geometry;

	}



	public void setGeometry(Geometry geometry) {

	public void setGeometry(Polygon geometry) {

		this.geometry = geometry;

	}



	public List<ActivityReferences> getActivities() {

	public List<ActivityCompact> getActivities() {

		return activities;

	}



	public void setActivities(List<ActivityReferences> activities) {

	public void setActivities(List<ActivityCompact> activities) {

		this.activities = activities;

	}
@@ -154,11 +151,11 @@ public class Layer extends LayerModelCompact { 
		this.latLonBoundsImage = latLonBoundsImage;

	}



	public List<Protocols> getProtocols() {

	public List<Protocol> getProtocols() {

		return protocols;

	}



	public void setProtocols(List<Protocols> protocols) {

	public void setProtocols(List<Protocol> protocols) {

		this.protocols = protocols;

	}

}

atlas-view/src/main/java/es/redmic/atlasview/model/layer/Protocols.java→atlas-view/src/main/java/es/redmic/atlasview/model/layer/Protocol.java

+2 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ package es.redmic.atlasview.model.layer; 


import es.redmic.models.es.common.model.BaseAbstractStringES;



public class Protocols extends BaseAbstractStringES {

public class Protocol extends BaseAbstractStringES {



	private String type;



	private String url;



	public Protocols() {

	public Protocol() {

	}



	public String getType() {