Commit 109be7e2 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'hotfix-windRoseLimits' into 'dev' 

Aumenta versión hotfix

See merge request redmic-project/server/time-series!3
parents e9aecf74 4085d8d8

pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
	<groupId>es.redmic.time-series</groupId>

	<artifactId>time-series</artifactId>

	<packaging>pom</packaging>

	<version>0.2.0</version>

	<version>0.2.1</version>

	<name>Time series</name>



	<properties>
@@ -31,7 +31,7 @@ 
		<!-- Añadir versión de la librería del tipo de vista elegida (elasticsearch/postgresql) -->

		<redmic.view-lib.version>0.9.0</redmic.view-lib.version>



		<redmic.time-series-lib.version>0.1.0</redmic.time-series-lib.version>

		<redmic.time-series-lib.version>0.2.0</redmic.time-series-lib.version>



		<!-- Versions of the OTHERS library used in the children -->

		<ma.glasnost.orika.core.version>1.5.2</ma.glasnost.orika.core.version>

time-series-commands/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	<parent>

		<groupId>es.redmic.time-series</groupId>

		<artifactId>time-series</artifactId>

		<version>0.2.0</version>

		<version>0.2.1</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>

time-series-lib/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<parent>

		<groupId>es.redmic.time-series</groupId>

		<artifactId>time-series</artifactId>

		<version>0.2.0</version>

		<version>0.2.1</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>

time-series-view/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	<parent>

		<groupId>es.redmic.time-series</groupId>

		<artifactId>time-series</artifactId>

		<version>0.2.0</version>

		<version>0.2.1</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>

time-series-view/src/main/java/es/redmic/timeseriesview/converter/WindRoseDataConverter.java

+10 −2
Original line number Diff line number Diff line
@@ -37,9 +37,17 @@ public class WindRoseDataConverter extends CustomConverter<Aggregations, WindRos 
		

		partitionNumber = (Integer) mappingContext.getProperty("partitionNumber");

		

		System.out.println(source.getAttributes().toString());



		Integer count = (Integer) ElasticSearchUtils.getMapValue(source.getAttributes(),

				"filter#dataDefinitionFilter").get("doc_count");

		

		StatsDTO stats = (StatsDTO) ElasticSearchUtils.getStatsFromAggregation(

				ElasticSearchUtils.getMapValue(source.getAttributes(), "filter#dataDefinitionFilter"),

					"stats#speed_stats", StatsDTO.class);

				source.getAttributes(),

					"stats_bucket#stats-buckets", StatsDTO.class);

		

		// Sobrescribe count para tener en cuenta todos los datos

		stats.setCount(count);

		

		List<Map<String, Object>> values = (List<Map<String, Object>>) 

				(ElasticSearchUtils.getMapValue(source.getAttributes(), "date_histogram#avg_values_by_interval"))