Merge branch 'release-0.17.0' into 'master' (302ec6ee) · Commits · REDMIC Project / Client / Web

package.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "REDMIC",
		"version": "0.16.2",
		"version": "0.17.0",
		"author": "REDMIC",
		"homepage": "https://gitlab.com/redmic-project/client/web/blob/master/README.md",
		"description": "Integrated marine data repository of Canary Islands - Client",

public/javascript/app/components/steps/_DataListAndSaveRelationData.js

+28 −75

Original line number	Diff line number	Diff line
		@@ -19,32 +19,11 @@ define([

		constructor: function (args) {
		this.config = {
		previewDataIdProperty: 'idPreviewList',
		tableConfig: {
		columns: []
		},

		/*_relationDataDefault: {
		"date": {
		"columns": ["date"],
		"format": "YYYY-MM-DD HH:mm:ss"
		},
		"vFlag": {
		"columns": ["vFlag"]
		},
		"qFlag": {
		"columns": ["qFlag"]
		},
		"remark": {
		"columns": ["remark"]
		},
		"parameters": {
		"matching": [{
		"columns": ["value"],
		"dataDefinitionId": 63
		}]
		}
		},*/

		_defaultColumns: {
		width: '14',
		align: 'center',
		@@ -60,38 +39,18 @@ define([

		this.inherited(arguments);

		/*this.browserConfig = this._merge([{
		buttonsInTopZone: true,
		buttons: {
		"loadRelationData": {
		className: "fa-plus",
		title: this.i18n.loadRelationData
		}
		}
		}, this.browserConfig \|\| {}]);*/

		this.previewDataBrowserConfig = this._merge([{
		parentChannel: this.getChannel(),
		title: this.i18n.previewData,
		target: "viewPrevData",
		noDataMessage: null,
		tableConfig: {},
		pathSeparator: "//",
		idProperty: this.previewDataIdProperty,
		width: 8,
		height: "lg"
		}, this.previewDataBrowserConfig \|\| {}]);
		},

		/*_defineSubscriptions: function() {

		this.inherited(arguments);

		this.subscriptionsConfig.push({
		channel: this.browser.getChildChannel("iconKeypad", "KEYPAD_INPUT"),
		callback: "_subBrowserKeypadInput"
		});
		},*/

		postCreate: function() {

		this.inherited(arguments);
		@@ -104,37 +63,6 @@ define([
		}).placeAt(this.topLeftNode);
		},

		/*_subBrowserKeypadInput: function(res) {

		if (res.inputKey === "loadRelationData") {
		this._loadRelationData(this._relationDataDefault);
		}
		},*/

		/*_loadRelationData: function(relationData) {

		this._cleanData();

		this._blockLoadFormTypesInSelector = true;

		for (var key in relationData)
		this._loadItemRelationData(relationData[key], key);

		this._blockLoadFormTypesInSelector = false;
		this._currentValueSelect = null;
		this._loadFormTypesInSelector(true);
		},

		_loadItemRelationData: function(item, key) {

		if (this.formTypeOptions[key]) {
		this._currentValueSelect = key;
		this._formSubmitted({
		data: item
		});
		}
		},*/

		_processLoadedData: function(data) {

		this.tableConfig.columns = [];
		@@ -169,12 +97,37 @@ define([
		});

		this._emitEvt("INJECT_DATA", {
		data: this.data.data,
		data: this._buildPreviewData(this.data.data),
		target: "viewPrevData"
		});
		}

		this._publish(this.previewDataBrowser.getChannel("SHOW"));
		},

		_buildPreviewData: function(data) {

		var items = [];

		for (var i = 0; i < data.length; i++) {
		var item = data[i],
		itemKeys = Object.keys(item),
		itemValues = Object.values(item),
		itemObj = {};

		itemObj[this.previewDataIdProperty] = i;

		for (var j = 0; j < itemKeys.length; j++) {
		var itemKey = itemKeys[j],
		itemValue = itemValues[j];

		itemObj[itemKey] = itemValue;
		}

		items.push(itemObj);
		}

		return items;
		}
		});
		});

public/javascript/app/edition/views/dataLoader/AddDataOC.js

+7 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,13 @@ define([

		this.config = {
		idPropertySave: "uuid",
		replaceTarget: redmicConfig.services.activityObjectCollectingSeriesStations
		replaceTarget: redmicConfig.services.activityObjectCollectingSeriesStations,
		propsToClean: [
		"id", "uuid", "geometry.coordinates", "properties.site.name", "properties.site.code",
		"properties.site.description", "properties.site.dashboard",
		"properties.measurements.{i}.dataDefinition.id", "properties.measurements.{i}.dataDefinition.path",
		"properties.measurements.{i}.parameter.path"
		]
		};

		lang.mixin(this, this.config, args);

public/javascript/redmic/map/OpenBaseLayers.js

+39 −26

Original line number	Diff line number	Diff line
		@@ -2,62 +2,75 @@ define({
		// summary:
		// Definiciones de capas base para los mapas de Leaflet.
		// description:
		// Contiene la definición de las capas base para heredarse e instanciarlas desde el widget OpenLayers.
		// Contiene la definición de las capas base para instanciarlas desde OpenLayers.

		"topografico": {
		type: "wmts",
		url: "https://idecan3.grafcan.es/ServicioWMS/MTI",
		'topografico': {
		type: 'wmts',
		url: 'https://{s}.grafcan.es/ServicioWMS/MTI',
		props: {
		layers: 'WMS_MTI',
		format: 'image/png',
		//subdomains: ['2', '3'],
		subdomains: ['idecan2', 'idecan3'],
		uppercase: true,
		attribution: "GrafCan",
		attribution: '<a href="https://www.grafcan.es" target="_blank" title="GRAFCAN">GRAFCAN</a>',
		minZoom: 5,
		maxZoom: 21,
		tiled: true
		}
		},

		"ortofoto": {
		type: "wmts",
		url: "https://idecan3.grafcan.es/ServicioWMS/OrtoUrb_bat",
		'ortofoto': {
		type: 'wmts',
		url: 'https://{s}.grafcan.es/ServicioWMS/OrtoUrb_bat',
		props: {
		layers: 'WMS_OrtoExpressUrb',
		format: 'image/jpeg',
		uppercase: true,
		//subdomains: ['1', '3'],
		attribution: "GrafCan",
		subdomains: ['idecan3'],
		attribution: '<a href="https://www.grafcan.es" target="_blank" title="GRAFCAN">GRAFCAN</a>',
		minZoom: 5,
		maxZoom: 21,
		tiled: true
		}
		},

		"redmic": {
		type: "wmts",
		url: "https://atlas.redmic.es/geoserver/basemap/wms",
		'redmic': {
		type: 'wmts',
		url: 'https://atlas.redmic.es/geoserver/basemap/wms',
		props: {
		layers: 'Redmic',
		format: 'image/jpeg',
		uppercase: true,
		//subdomains: ['1', '3'],
		attribution: '<a href="http://www.oag-fundacion.org/" target="_blank" title="Observatorio Ambiental Granadilla">OAG</a>',
		attribution: '<a href="http://www.oag-fundacion.org" target="_blank" title="Observatorio Ambiental Granadilla">OAG</a>',
		minZoom: 1,
		maxZoom: 18,
		tiled: true
		}
		}/*,
		},

		"redmic": {
		type: "wms",
		url: "https://atlas.redmic.es/Basemap/gwc/service/wms",
		'eoc-map': {
		type: 'tileLayer',
		url: 'https://tiles.geoservice.dlr.de/service/tms/1.0.0/{layers}@{crs}@{format}/{z}/{x}/{-y}.{format}',
		props: {
		layers: "Basemap:basemapOceano",
		format: 'image/jpeg',
		attribution: '<a href="http://www.oag-fundacion.org/" target="_blank" title="Observatorio Ambiental Granadilla">OAG</a>',
		minZoom: 5,
		maxZoom: 18
		layers: 'eoc:basemap',
		crs: 'EPSG:4326',
		format: 'png',
		attribution: '<a href="https://geoservice.dlr.de" target="_blank" title="Earth Observation Center (EOC) of the German Aerospace Center (DLR)">EOC Geoservice</a>',
		minZoom: 1,
		maxZoom: 15
		}
		},

		'eoc-overlay': {
		type: 'tileLayer',
		url: 'https://tiles.geoservice.dlr.de/service/tms/1.0.0/{layers}@{crs}@{format}/{z}/{x}/{-y}.{format}',
		props: {
		layers: 'eoc:baseoverlay',
		crs: 'EPSG:4326',
		format: 'png',
		attribution: '<a href="https://geoservice.dlr.de" target="_blank" title="Earth Observation Center (EOC) of the German Aerospace Center (DLR)">EOC Geoservice</a>',
		minZoom: 1,
		maxZoom: 15
		}
		}
		}*/
		});

public/javascript/redmic/map/nls/OpenLayers.js

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ define({
		redmic: "REDMIC",
		topografico: "Topographic",
		ortofoto: "Orthophoto",
		"eoc-map": "World",

		zec: "ZEC",
		batimetrias: "Bathymetry",