Commit 9788466e authored by Noel Alonso's avatar Noel Alonso
Browse files

Unifica joinIndex de layer y category

parent 81d076c1

atlas-view/src/main/java/es/redmic/atlasview/model/category/Category.java

+12 −3
Original line number Diff line number Diff line 
package es.redmic.atlasview.model.category;



import com.fasterxml.jackson.annotation.JsonIgnore;



import es.redmic.elasticsearchlib.common.model.JoinIndex;



/*-

 * #%L

 * Atlas-query-endpoint
@@ -24,11 +28,16 @@ import es.redmic.models.es.common.model.BaseAbstractStringES; 


public class Category extends BaseAbstractStringES {



	@JsonIgnore

	public static final String JOIN_INDEX_NAME = "category";



	private String name;



	private String joinIndex = "category";

	private JoinIndex joinIndex;



	public Category() {

		joinIndex = new JoinIndex();

		joinIndex.setName(JOIN_INDEX_NAME);

	}



	public String getName() {
@@ -39,11 +48,11 @@ public class Category extends BaseAbstractStringES { 
		this.name = name;

	}



	public String getJoinIndex() {

	public JoinIndex getJoinIndex() {

		return joinIndex;

	}



	public void setJoinIndex(String joinIndex) {

	public void setJoinIndex(JoinIndex joinIndex) {

		this.joinIndex = joinIndex;

	}

}

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

+6 −1
Original line number Diff line number Diff line
@@ -24,11 +24,16 @@ import java.util.List; 


import org.locationtech.jts.geom.Polygon;



import com.fasterxml.jackson.annotation.JsonIgnore;



import es.redmic.elasticsearchlib.common.model.JoinIndex;

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



public class Layer extends LayerModelCompact {



	@JsonIgnore

	public static final String JOIN_INDEX_NAME = "layer";



	private JoinIndex joinIndex;



	private String title;
@@ -53,7 +58,7 @@ public class Layer extends LayerModelCompact { 
	public Layer() {



		joinIndex = new JoinIndex();

		joinIndex.setName("layer");

		joinIndex.setName(JOIN_INDEX_NAME);

	}



	public JoinIndex getJoinIndex() {