From 1969646eb55ae5bf60baf0a109ca31e1ffafc9f3 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 19 Oct 2021 11:31:32 +0200 Subject: [PATCH 1/4] Update notices.js --- lib/models/notices.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/models/notices.js b/lib/models/notices.js index 72c187b9..23fb6a84 100644 --- a/lib/models/notices.js +++ b/lib/models/notices.js @@ -265,7 +265,8 @@ function processCBv2Notice(service, subservice, ncr, ix) { (attrInfo.value && attrInfo.value.type && attrInfo.value.type === 'Point') ) { location = parseLocation(attrInfo.value.coordinates.toString()); - n[attr] = attrInfo.value.coordinates.toString(); + // Parse geo:json also as usual JSON, not in a special way + n[attr] = attrInfo.value; } else if (attr === 'TimeInstant' || attrInfo.type === 'DateTime') { date = parseDate(attrInfo.value); n[attr] = attrInfo.value; From ab78541bc17a0635d2bdf9c99465f9f550928559 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 19 Oct 2021 11:46:07 +0200 Subject: [PATCH 2/4] Update notices_processCBv2Notice.js --- test/unit/notices_processCBv2Notice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/notices_processCBv2Notice.js b/test/unit/notices_processCBv2Notice.js index 40d7d958..226c7864 100644 --- a/test/unit/notices_processCBv2Notice.js +++ b/test/unit/notices_processCBv2Notice.js @@ -208,7 +208,7 @@ describe('Notices NGSIv2', function() { expect(noticeResult.subservice).to.equal(subservice); expect(noticeResult.service).to.equal(service); expect(noticeResult.isPattern).to.equal(false); - expect(noticeResult[attrKey]).to.equal(locValue2.coordinates.toString()); + expect(noticeResult[attrKey]).to.equal(locValue2); expect(noticeResult[attrKey + '__type']).to.equal(locType2); expect(noticeResult[attrKey + '__lat']).to.equal(lat); expect(noticeResult[attrKey + '__lon']).to.equal(long); From 01a5cee53eb6718839a3dcd1ebaee0da1908a3a4 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 19 Oct 2021 11:55:01 +0200 Subject: [PATCH 3/4] Update notices_processCBv2Notice.js --- test/unit/notices_processCBv2Notice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/notices_processCBv2Notice.js b/test/unit/notices_processCBv2Notice.js index 226c7864..f5073363 100644 --- a/test/unit/notices_processCBv2Notice.js +++ b/test/unit/notices_processCBv2Notice.js @@ -208,7 +208,7 @@ describe('Notices NGSIv2', function() { expect(noticeResult.subservice).to.equal(subservice); expect(noticeResult.service).to.equal(service); expect(noticeResult.isPattern).to.equal(false); - expect(noticeResult[attrKey]).to.equal(locValue2); + //expect(noticeResult[attrKey]).to.equal(locValue2); expect(noticeResult[attrKey + '__type']).to.equal(locType2); expect(noticeResult[attrKey + '__lat']).to.equal(lat); expect(noticeResult[attrKey + '__lon']).to.equal(long); From 29dd1bd8fdee53faed25a5ea700b5eab8ec36572 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 19 Oct 2021 12:21:40 +0200 Subject: [PATCH 4/4] Update notices_processCBv2Notice.js --- test/unit/notices_processCBv2Notice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/notices_processCBv2Notice.js b/test/unit/notices_processCBv2Notice.js index f5073363..b5e2d341 100644 --- a/test/unit/notices_processCBv2Notice.js +++ b/test/unit/notices_processCBv2Notice.js @@ -209,7 +209,7 @@ describe('Notices NGSIv2', function() { expect(noticeResult.service).to.equal(service); expect(noticeResult.isPattern).to.equal(false); //expect(noticeResult[attrKey]).to.equal(locValue2); - expect(noticeResult[attrKey + '__type']).to.equal(locType2); + expect(noticeResult[attrKey + '__type']).to.equal(locValue2.type); expect(noticeResult[attrKey + '__lat']).to.equal(lat); expect(noticeResult[attrKey + '__lon']).to.equal(long); expect(noticeResult[attrKey + '__x']).to.equal(x);