Skip to content

Commit

Permalink
FIX issues raised in code review
Browse files Browse the repository at this point in the history
  • Loading branch information
@fgalan
fgalan committed Feb 17, 2016
1 parent e84c1ea commit 92aaa61
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 64 deletions.
146 changes: 82 additions & 64 deletions src/lib/ngsi/Scope.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,7 @@ int Scope::fill
int points;
std::vector<orion::Point*> pointV;

if (apiVersion == "v1")
{
type = FIWARE_LOCATION;
}
else
{
type = FIWARE_LOCATION_V2;
}
type = (apiVersion == "v1")? FIWARE_LOCATION : FIWARE_LOCATION_V2;

//
// parse geometry
Expand All @@ -122,33 +115,68 @@ int Scope::fill


//
// Split coordsString into a vector of points, or pairs of coordinates
// Parse georel?
//
if (coordsString == "")
if (georelString != "")
{
*errorStringP = "no coordinates for geometry";
if (georel.parse(georelString.c_str(), errorStringP) != 0)
{
return -1;
}
}

// Check invalid combinations
if ((geometry.areaType == "line") && (georel.type == "coveredBy"))
{
/* It seems that MongoDB 3.2 doesn't support this kind of queries, we get this error:
*
* { $err: "Can't canonicalize query: BadValue $within not supported with provided geometry:
* { $geoWithin: { $geometry: { type: "LineString", coordinates: [ [ 5.0...", code: 17287 }
*/

*errorStringP = "line geometry cannot be used with coveredBy georel";
return -1;
}
points = stringSplit(coordsString, ';', pointStringV);

if (points == 0)
if ((geometry.areaType == "point") && (georel.type == "coveredBy"))
{
*errorStringP = "erroneous coordinates for geometry";
/* It seems that MongoDB 3.2 doesn't support this kind of queries, we get this error:
*
* { $err: "Can't canonicalize query: BadValue $within not supported with provided geometry:
* { $geoWithin: { $geometry: { type: "Point", coordinates: [ [ 5.0...", code: 17287 }
*/

*errorStringP = "point geometry cannot be used with coveredBy georel";
return -1;
}

if ((geometry.areaType != "point") && (georel.type == "near"))
{
/* It seems that MongoDB 3.2 doesn't support this kind of queries, we get this error:
*
* { $err: "Can't canonicalize query: BadValue invalid point in geo near query $geometry argument:
* { type: "Polygon", coordinates: [ [ [ 2.0, 1.0 ], [ 4.0, 3.0 ],...", code: 17287 }
*/

*errorStringP = "georel /near/ used with geometry different than point";
return -1;
}

//
// Parse georel?
// Split coordsString into a vector of points, or pairs of coordinates
//
if (georelString != "")
if (coordsString == "")
{
if (georel.parse(georelString.c_str(), errorStringP) != 0)
{
return -1;
}
*errorStringP = "no coordinates for geometry";
return -1;
}
points = stringSplit(coordsString, ';', pointStringV);

if (points == 0)
{
*errorStringP = "erroneous coordinates for geometry";
return -1;
}

//
// Convert point-strings into instances of the orion::Point class
Expand Down Expand Up @@ -209,6 +237,8 @@ int Scope::fill
circle.radiusSet(geometry.radius);
circle.invertedSet(geometry.external);
circle.centerSet(pointV[0]);

pointVectorRelease(pointV);
pointV.clear();
}
}
Expand Down Expand Up @@ -279,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)
if ((pointV[0]->latitude() == pointV[1]->latitude()) || (pointV[0]->longitude() == pointV[1]->longitude()))
{
*errorStringP = "invalid number of coordinates for /box/";
pointVectorRelease(pointV);
pointV.clear();
return -1;
}

double minLat = (pointV[0]->latitude() < pointV[1]->latitude())? pointV[0]->latitude() : pointV[1]->latitude();
double maxLat = (pointV[0]->latitude() > pointV[1]->latitude())? pointV[0]->latitude() : pointV[1]->latitude();
double minLon = (pointV[0]->longitude() < pointV[1]->longitude())? pointV[0]->longitude() : pointV[1]->longitude();
double maxLon = (pointV[0]->longitude() > pointV[1]->longitude())? pointV[0]->longitude() : pointV[1]->longitude();

// Lower left: smaller lat and long, upper right: greater lat and long
Point ll;
ll.latitudeSet(minLat);
ll.longitudeSet(minLon);
Point ur;
ur.latitudeSet(maxLat);
ur.longitudeSet(maxLon);
box.fill(&ll, &ur);

pointVectorRelease(pointV);
pointV.clear();
}
else if (geometry.areaType == "point")
Expand All @@ -294,58 +348,20 @@ int Scope::fill
return -1;
}
point.fill(pointV[0]);

pointVectorRelease(pointV);
pointV.clear();
}
else
{
areaType = orion::NoArea;

areaType = orion::NoArea;
*errorStringP = "invalid area-type";

pointVectorRelease(pointV);
pointV.clear();
return -1;
}

//pointVectorRelease(pointV); ??
pointV.clear();

// Check invalid combinations
if ((geometry.areaType == "line") && (georel.type == "coveredBy"))
{
/* It seems that MongoDB 3.2 doesn't support this kind of queries, we get this error:
*
* { $err: "Can't canonicalize query: BadValue $within not supported with provided geometry:
* { $geoWithin: { $geometry: { type: "LineString", coordinates: [ [ 5.0...", code: 17287 }
*/

*errorStringP = "line geometry cannot be used with coveredBy georel";
return -1;
}

if ((geometry.areaType == "point") && (georel.type == "coveredBy"))
{
/* It seems that MongoDB 3.2 doesn't support this kind of queries, we get this error:
*
* { $err: "Can't canonicalize query: BadValue $within not supported with provided geometry:
* { $geoWithin: { $geometry: { type: "Point", coordinates: [ [ 5.0...", code: 17287 }
*/

*errorStringP = "point geometry cannot be used with coveredBy georel";
return -1;
}

if ((geometry.areaType != "point") && (georel.type == "near"))
{
/* It seems that MongoDB 3.2 doesn't support this kind of queries, we get this error:
*
* { $err: "Can't canonicalize query: BadValue invalid point in geo near query $geometry argument:
* { type: "Polygon", coordinates: [ [ [ 2.0, 1.0 ], [ 4.0, 3.0 ],...", code: 17287 }
*/

*errorStringP = "georel /near/ used with geometry different than point";
return -1;
}

return 0;
}

Expand Down Expand Up @@ -631,6 +647,8 @@ void Scope::present(const std::string& indent, int ix)
* release -
*/
void Scope::release(void)
{
{
// note that georel, circle, box, point don't use dynamic memory, so they dont' need release methods
polygon.release();
line.release();
}
22 changes: 22 additions & 0 deletions src/lib/orionTypes/areas.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,28 @@ void Point::longitudeSet(::std::string longitude)



/* ****************************************************************************
*
* Point::latitudeSet -
*/
void Point::latitudeSet(double latitude)
{
lat = latitude;
}



/* ****************************************************************************
*
* Point::longitudeSet -
*/
void Point::longitudeSet(double longitude)
{
lon = longitude;
}



/* ****************************************************************************
*
* Point::equals -
Expand Down

0 comments on commit 92aaa61

Please sign in to comment.