Commit 9a27156e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'hotfix-fixCitationEditionMode' into 'master' 

Hotfix fix citation edition mode

Closes #31

See merge request redmic-project/client/web!25
parents cae64bc2 04390aa5

package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "REDMIC",

  "version": "0.12.4",

  "version": "0.12.5",

  "author": "Observatorio Ambiental Granadilla",

  "homepage": "https://redmic.es",

  "description": "Integrated marine data repository of Canary Islands - Client",

public/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js

+2 −0
Original line number Diff line number Diff line
@@ -488,6 +488,8 @@ define([ 
					objToPublish.data = data;

				}

			}



			return objToPublish;

		},



		_actionWhenNoActivity: function() {

public/javascript/app/nls/es/translation.js

+2 −1
Original line number Diff line number Diff line
@@ -1159,5 +1159,6 @@ define({ 
	, "descriptio": "Descripción"

	, "featurecod": "Feature code"



	, "sexagesimalDegrees": "Grados sexagesimales"

	, "wgs84DecimalDegrees": "WGS84 [EPSG: 4326] (grados decimales)"

	, "wgs84SexagesimalDegrees": "WGS84 [EPSG: 4326] (grados sexagesimales)"

});

public/javascript/app/nls/translation.js

+2 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,8 @@ define({ 
		, "descriptio": "Description"

		, "featurecod": "Feature code"



		, "sexagesimalDegrees": "Sexagesimal degrees"

		, "wgs84DecimalDegrees": "WGS84 [EPSG: 4326] (decimal degrees)"

		, "wgs84SexagesimalDegrees": "WGS84 [EPSG: 4326] (sexagesimal degrees)"

	}



	, "es": true

public/javascript/redmic/modules/form/input/PointImpl.js

+5 −5
Original line number Diff line number Diff line
@@ -43,8 +43,12 @@ define([ 
				initialSr: 1,

				spatialReferences: [{

					id: 4326,

					name: "WGS84 [EPSG: 4326]",

					name: this.i18n.wgs84DecimalDegrees,

					crs: "urn:ogc:def:crs:OGC:1.3:CRS84"

				},{

					id: 1,

					name: this.i18n.wgs84SexagesimalDegrees,

					crs: "1"

				},{

					id: 3857,

					name: "WGS84 Web Mercator (Auxiliary Sphere) [EPSG: 3857]",
@@ -53,10 +57,6 @@ define([ 
					id: 32628,

					name: "WGS84 / UTM 28N [EPSG: 32628]",

					crs: "32628"

				},{

					id: 1,

					name: this.i18n.sexagesimalDegrees,

					crs: "1"

				}],

				_inputsNodes: {},

				_inputsInstances: {},