From 2134e111e944c880dfb24e5e020daeb79726d2bd Mon Sep 17 00:00:00 2001 From: rubenmoya Date: Mon, 21 May 2018 14:19:37 +0200 Subject: [PATCH 1/3] Allow only numeric values in georeference latitude/longitude --- .../analyses/analysis-form-models/georeference-form-model.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model.js b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model.js index b21b6c529d9a..84ea69b08b92 100755 --- a/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model.js +++ b/lib/assets/javascripts/builder/editor/layers/layer-content-views/analyses/analysis-form-models/georeference-form-model.js @@ -128,7 +128,7 @@ module.exports = BaseAnalysisFormModel.extend({ latitude: { type: 'Select', title: _t('editor.layers.analysis-form.latitude'), - options: this._columnOptions.filterByType(['string', 'number']), + options: this._columnOptions.filterByType('number'), dialogMode: 'float', validators: this._getFieldValidator('latitude'), placeholder: _t('editor.layers.analysis-form.georeference.select-latitude'), @@ -137,7 +137,7 @@ module.exports = BaseAnalysisFormModel.extend({ longitude: { type: 'Select', title: _t('editor.layers.analysis-form.longitude'), - options: this._columnOptions.filterByType(['string', 'number']), + options: this._columnOptions.filterByType('number'), dialogMode: 'float', validators: this._getFieldValidator('longitude'), placeholder: _t('editor.layers.analysis-form.georeference.select-longitude'), From 218c52d64bb5ed18e25c01111ac90eb644008012 Mon Sep 17 00:00:00 2001 From: rubenmoya Date: Mon, 21 May 2018 14:19:41 +0200 Subject: [PATCH 2/3] Add spec --- .../georeference-form-model.spec.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/georeference-form-model.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/georeference-form-model.spec.js index 07a8c50287c5..729fb3d0cbac 100644 --- a/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/georeference-form-model.spec.js +++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-form-models/georeference-form-model.spec.js @@ -144,4 +144,16 @@ describe('editor/layers/layer-content-views/analyses/analysis-form-models/georef expect(this.model.schema.postal_code_country.validators[0]).toBe('required'); }); }); + + fit('should return only numeric columns for latitude and longitude', function () { + this.model._columnOptions._columnOptions = { + cartodb_id: { type: 'number' }, + title: { type: 'string' }, + created_at: { type: 'date' } + }; + this.model._setSchema(); + + expect(this.model.schema.latitude.options.length).toBe(1); + expect(this.model.schema.longitude.options.length).toBe(1); + }); }); From e08fd27ac0960ffa03eccba7cf0aa4db247929e2 Mon Sep 17 00:00:00 2001 From: rubenmoya Date: Mon, 21 May 2018 14:24:51 +0200 Subject: [PATCH 3/3] Update NEWS.md --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 4acf291964e3..d4eeffac009a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -184,6 +184,7 @@ ion for time-series (#12670) * Hide legend title and header if not enabled (https://github.com/CartoDB/support/issues/1349) ### Bug fixes / enhancements +* Allow only numeric values in latitude/longitude select in georeference analysis (https://github.com/CartoDB/cartodb/pull/13974) * Fix widgets not updating (https://github.com/CartoDB/cartodb/pull/13971) * Fix legend paddings/margins (https://github.com/CartoDB/cartodb/pull/13966) * Fix the name of the bundle for public_Table on production (#13965)