Commit 50108d0c authored by Noel Alonso's avatar Noel Alonso
Browse files

Cambia geometry por tipo polygon

parent 31770896

atlas-lib/src/main/java/es/redmic/atlaslib/dto/layer/LayerDTO.java

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import javax.validation.constraints.Size; 


import org.apache.avro.Schema;

import org.locationtech.jts.geom.Geometry;

import org.locationtech.jts.geom.Point;

import org.locationtech.jts.geom.Polygon;



import com.fasterxml.jackson.annotation.JsonIgnore;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -321,7 +321,7 @@ public class LayerDTO extends LayerCompactDTO { 
		case 11:

			try {

				if (value != null) {

					setGeometry(mapper.readValue((value.toString()), Point.class));

					setGeometry(mapper.readValue(value.toString(), Polygon.class));

				}

			} catch (IOException e) {

				e.printStackTrace();

atlas-lib/src/test/java/es/redmic/atlaslib/unit/utils/LayerDataUtil.java

+7 −5
Original line number Diff line number Diff line
@@ -26,9 +26,8 @@ import java.util.List; 
import java.util.Map;

import java.util.UUID;



import org.geotools.geometry.jts.JTSFactoryFinder;

import org.locationtech.jts.geom.Coordinate;

import org.locationtech.jts.geom.GeometryFactory;

import org.locationtech.jts.geom.Point;



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

import es.redmic.atlaslib.dto.layer.ContactDTO;
@@ -255,10 +254,13 @@ public abstract class LayerDataUtil { 
		formats.add("WMS");

		layer.setFormats(formats);



		GeometryFactory geometryFactory = new GeometryFactory();

		Coordinate[] coordinates = new Coordinate[] { new Coordinate(-18.1745567321777, 27.6111183166504),

				new Coordinate(-18.1745567321777, 29.4221172332764),

				new Coordinate(-13.3011913299561, 29.4221172332764),

				new Coordinate(-13.3011913299561, 27.6111183166504),

				new Coordinate(-18.1745567321777, 27.6111183166504) };



		Point geometry = geometryFactory.createPoint(new Coordinate(44.56433, 37.94388));

		layer.setGeometry(geometry);

		layer.setGeometry(JTSFactoryFinder.getGeometryFactory().createPolygon(coordinates));



		ActivityDTO activity = new ActivityDTO();

		activity.setId("3");