Merge branch 'dev' into 'master' (c986db5f) · Commits · REDMIC Project / Server / Library / DB

pom.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		<groupId>es.redmic.lib</groupId>
		<artifactId>db</artifactId>
		<packaging>jar</packaging>
		<version>0.6.0</version>
		<version>0.6.1</version>
		<name>DB</name>
		<description>Services, repository and models in DB</description>

		@@ -26,7 +26,7 @@

		<!-- REDMIC -->
		<redmic.db-commons.version>0.6.0</redmic.db-commons.version>
		<redmic.models.version>0.6.0</redmic.models.version>
		<redmic.models.version>0.6.1</redmic.models.version>
		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<!-- OTHER -->

+19 −9

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@ import com.vividsolutions.jts.geom.Geometry;

		import es.redmic.db.geodata.common.model.GeoDataModel;


		/**
		* The persistent class for the surveystation database table.
		*
		@@ -38,6 +37,9 @@ public class FixedSurvey extends GeoDataModel implements Serializable {
		@Column(length = 2, nullable = false)
		private String prefixtype;

		@Column(length = 500)
		private String dashboard;

		@Column(name = "shape", nullable = false)
		Geometry geometry;

		@@ -80,6 +82,14 @@ public class FixedSurvey extends GeoDataModel implements Serializable {
		this.prefixtype = prefixtype;
		}

		public String getDashboard() {
		return dashboard;
		}

		public void setDashboard(String dashboard) {
		this.dashboard = dashboard;
		}

		public Geometry getGeometry() {
		return geometry;
		}