Feature/1677 geo location #1801

kzangeli · 2016-02-16T08:12:44Z

Added some stuff missing for geo-location in URI params #1677

functest running ...

fgalan · 2016-02-16T08:22:24Z

src/lib/rest/rest.cpp

@@ -243,7 +243,7 @@ static int uriArgumentGet(void* cbDataP, MHD_ValueKind kind, const char* ckey, c
  {
    containsForbiddenChars = forbiddenChars(val, ";");
  }
-  else if ((key != "q") && (key != "idPattern"))
+  else if ((key != "q") && (key != "idPattern") && (key != "geometry") && (key != "georel"))


Note that geometry has its own "if clause" some lines above (around 238).

ok, this was already taken care of.
Didn't see that ...

Fixed in 6bcd211 (georel treated as geometry)

…iware-orion into feature/1677_geo_location

…descriptions

kzangeli · 2016-02-16T16:23:07Z

Finally got some time to run functests on this branch ...
Had a few failures, now fixed (01ec8be)

Complete 'make test' running (again) right now

…iware-orion into feature/1677_geo_location

fgalan · 2016-02-16T17:02:34Z

doc/apiary/v2/fiware-ngsiv2-reference.apib

@@ -299,7 +299,7 @@ Fields used as identifiers in the NGSIv2 API follow special rules regarding allo

 The rules are:

-* Allowed characters are the ones in the plain ASCII set except the following ones: whitespace, `&`, ?`, `/` and `#`.
+* Allowed characters are the ones in the plain ASCII set except the following ones: whitespace, `&`, `?`, `/` and `#`.


Not actually related with this PR, but a small typo known time ago now being fixed. NTC

fgalan · 2016-02-16T19:39:04Z

CHANGES_NEXT_RELEASE

@@ -20,3 +20,5 @@
 - Add: detect forbidden chars in entity ids and attr names in URI (Issue #1793)
 - Add: dates support in attribute values (Issue #1038)
 - Add: implemented new operation: POST /v2/op/query (Issue #1080)
+- Fix: NGSIv2 URI param 'georel' (along with 'geometry' and 'coords') proper support (Issue #1677)
+- Add: scope FIWARE::Location::NGSIv2 to allow using NGSIv2 geo-queries also with NGSIv1 (Issue #1677)


This last line is not actually part of this PR, but soon to be added.

NTC

fgalan · 2016-02-16T19:40:55Z

src/lib/mongoBackend/MongoGlobal.cpp

+  else if (scoP->areaType == orion::BoxType)
+  {
+    BSONArrayBuilder ps;
+    ps.append(BSON_ARRAY(scoP->box.lowerLeft.longitude()  << scoP->box.lowerLeft.latitude()));


In order this to work, lowerLeft has to be the real lower left corner and upperRight has to be the real upper right corner. Is the fill() method at Scope class ensuring this?

As discussed over skype - no, there is no check/fix for that right now. Must be implemented.

Fixed in 92aaa61

fgalan · 2016-02-16T19:44:36Z

Ready for review!

@kzangeli
@crbrox

kzangeli · 2016-02-17T08:52:31Z

src/lib/ngsi/Scope.cpp

+  {
+    type = FIWARE_LOCATION_V2;
+  }
+


I think I wrote these 8 lines ..

Now I wish I had done it like this, on one line:

type = (apiVersion == "v1")? FIWARE_LOCATION : FIWARE_LOCATION_V2:

Fixed in 92aaa61

kzangeli · 2016-02-17T09:02:17Z

I just realized a thing I've forgotten to implement - the release of the area objects.
Look at the method Scope::release():

/* ****************************************************************************
*
* release -
*/
void Scope::release(void)
{
  polygon.release();
}

We need to call the release() methods also for point, line, and box (and circle?), and create the methods if they don't exist.

Conflicts: CHANGES_NEXT_RELEASE

kzangeli · 2016-02-17T12:03:14Z

src/lib/ngsi/Scope.cpp

@@ -281,7 +309,31 @@ int Scope::fill
      pointV.clear();
      return -1;
    }
-    box.fill(pointV[0], pointV[1]);
+
+    // Check that points are different an not aligned (either horizontally or vertically)


type: an => and

Fixed in 367b713

kzangeli · 2016-02-17T12:40:38Z

LGTM

crbrox · 2016-02-17T12:41:19Z

LGTM

Feature/1677 geo location

Ken Zangelin added 2 commits February 16, 2016 08:24

Implemented what got lost

f67a239

functests for error cases

c7f2fef

kzangeli assigned fgalan Feb 16, 2016

kzangeli added this to the 0.28.0 milestone Feb 16, 2016

fgalan reviewed Feb 16, 2016
View reviewed changes

Ken Zangelin and others added 5 commits February 16, 2016 15:33

PR review fixes

6bcd211

Merge branch 'develop' into feature/1677_geo_location

4df9ca9

ADD $near working

9a99d59

Merge branch 'feature/1677_geo_location' of github.com:telefonicaid/f…

0f40c87

…iware-orion into feature/1677_geo_location

Added V2 scopes for mongoBackend. Modified functest for more text in …

01ec8be

…descriptions

fgalan added 3 commits February 16, 2016 17:23

ADD disjoint georel

c4ddd77

ADD Line multipoint

566ec7c

Merge branch 'feature/1677_geo_location' of github.com:telefonicaid/f…

d1364a6

…iware-orion into feature/1677_geo_location

fgalan reviewed Feb 16, 2016
View reviewed changes

fgalan added 4 commits February 16, 2016 18:56

FIX adjust geometry_and_coords_errors.test

ed83024

FIX test harness

4095d69

MOVE test case to another directory

869bae9

FIX test harness

8f4dcf4

fgalan reviewed Feb 16, 2016
View reviewed changes

REMOVE #if 0 leftover

e84c1ea

fgalan reviewed Feb 16, 2016
View reviewed changes

fgalan mentioned this pull request Feb 16, 2016

APIv2: align geo-location queries with last changes in spec #1677

Closed

kzangeli reviewed Feb 17, 2016
View reviewed changes

fgalan added 3 commits February 17, 2016 12:40

FIX issues raised in code review

92aaa61

ADD case coverage for degenerated box in NGSIv2 geoqueries

f40a707

Merge branch 'develop' into feature/1677_geo_location

15ec2b1

Conflicts: CHANGES_NEXT_RELEASE

kzangeli reviewed Feb 17, 2016
View reviewed changes

FIX issues raised in code review

367b713

fgalan mentioned this pull request Feb 17, 2016

use the $near operator for circle geospatial queries #1651

Closed

crbrox added a commit that referenced this pull request Feb 17, 2016

Merge pull request #1801 from telefonicaid/feature/1677_geo_location

ae86f89

Feature/1677 geo location

crbrox merged commit ae86f89 into develop Feb 17, 2016

crbrox deleted the feature/1677_geo_location branch February 17, 2016 12:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/1677 geo location #1801

Feature/1677 geo location #1801

kzangeli commented Feb 16, 2016

fgalan Feb 16, 2016

kzangeli Feb 16, 2016

kzangeli Feb 16, 2016

kzangeli commented Feb 16, 2016

fgalan Feb 16, 2016

fgalan Feb 16, 2016

fgalan Feb 16, 2016

kzangeli Feb 17, 2016

fgalan Feb 17, 2016

fgalan commented Feb 16, 2016

kzangeli Feb 17, 2016

fgalan Feb 17, 2016

kzangeli commented Feb 17, 2016

kzangeli Feb 17, 2016

fgalan Feb 17, 2016

kzangeli commented Feb 17, 2016

crbrox commented Feb 17, 2016

Feature/1677 geo location #1801

Feature/1677 geo location #1801

Conversation

kzangeli commented Feb 16, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kzangeli commented Feb 16, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fgalan commented Feb 16, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kzangeli commented Feb 17, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kzangeli commented Feb 17, 2016

crbrox commented Feb 17, 2016