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

Actualiza dependencias y adapta código a cambios

Al actualizar las librerías hay que actualizar las referencias a las
geometrías por cambios que rompen la compatibilidad
parent c58ee449
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@

	<properties>
		<!-- REDMIC -->
		<redmic.db-commons.version>0.6.0</redmic.db-commons.version>
		<redmic.models.version>0.6.1-legacy-0.6</redmic.models.version>
		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>
		<redmic.db-commons.version>0.7.0</redmic.db-commons.version>
		<redmic.models.version>0.12.0-feature-refactoring</redmic.models.version>
		<redmic.exceptions.version>0.10.0</redmic.exceptions.version>

		<!-- OTHER -->
		<powermock.version>1.7.3</powermock.version>
+5 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;

import com.vividsolutions.jts.geom.MultiPolygon;
import org.locationtech.jts.geom.MultiPolygon;

import es.redmic.db.geodata.common.model.GeoDataModel;
import es.redmic.db.maintenance.areas.model.AreaClassification;
@@ -80,6 +80,7 @@ public class Area extends GeoDataModel implements Serializable {
	private List<AreaClassification> areaClassification = new ArrayList<AreaClassification>();

	public Area() {
		super();
	}

	public String getPath() {
+9 −10
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ import javax.persistence.Table;
import org.hibernate.annotations.Parameter;
import org.hibernate.annotations.Type;
import org.joda.time.DateTime;

import com.vividsolutions.jts.geom.Point;
import org.locationtech.jts.geom.Point;

import es.redmic.db.administrative.taxonomy.model.Misidentification;
import es.redmic.db.administrative.taxonomy.model.Taxon;
+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQuery;
import javax.persistence.Table;

import com.vividsolutions.jts.geom.Point;
import org.locationtech.jts.geom.Point;

import es.redmic.db.geodata.common.model.GeoDataModel;
import es.redmic.db.maintenance.point.model.InfrastructureType;
+13 −13
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQuery;
import javax.persistence.Table;

import com.vividsolutions.jts.geom.MultiLineString;
import org.locationtech.jts.geom.MultiLineString;

import es.redmic.db.geodata.common.model.GeoDataModel;
import es.redmic.db.maintenance.line.model.LineType;
Loading