diff --git a/src/lib/ngsi/Scope.cpp b/src/lib/ngsi/Scope.cpp index caaf012595..188a9a0f5f 100644 --- a/src/lib/ngsi/Scope.cpp +++ b/src/lib/ngsi/Scope.cpp @@ -250,8 +250,6 @@ int Scope::fill return -1; } - polygon.invertedSet(geometry.external); - for (unsigned int ix = 0; ix < pointV.size(); ++ix) { polygon.vertexAdd(pointV[ix]); diff --git a/src/lib/orionTypes/areas.cpp b/src/lib/orionTypes/areas.cpp index d83b602626..aa487bbf5b 100644 --- a/src/lib/orionTypes/areas.cpp +++ b/src/lib/orionTypes/areas.cpp @@ -190,17 +190,6 @@ void Box::fill(Point* lowerLeftP, Point* upperRightP) -/* **************************************************************************** -* -* Polygon::invertedSet - -*/ -void Polygon::invertedSet(bool inverted) -{ - _inverted = (inverted == true)? "true" : "false"; -} - - - /* **************************************************************************** * * Polygon::vertexAdd - @@ -337,7 +326,7 @@ int Georel::parse(const char* in, std::string* errorString) * * Geometry::Geometry - */ -Geometry::Geometry(): areaType(""), radius(-1), external(false) +Geometry::Geometry(): areaType("") { } @@ -369,20 +358,6 @@ int Geometry::parse(const char* in, std::string* errorString) areaType = items[ix]; } - else if (strncmp(items[ix].c_str(), "radius", 6) == 0) - { - radius = atoi((char*) &items[ix].c_str()[7]); - - if (radius == 0) - { - *errorString = "Invalid value of /radius/"; - return -1; - } - } - else if (items[ix] == "external") - { - external = true; - } else { *errorString = "Invalid selector in geometry specification"; @@ -390,12 +365,6 @@ int Geometry::parse(const char* in, std::string* errorString) } } - if ((areaType == "polygon") && (radius != -1)) - { - *errorString = "radius set for polygon"; - return -1; - } - return 0; } diff --git a/src/lib/orionTypes/areas.h b/src/lib/orionTypes/areas.h index 50f1d88ce1..df07aa4aec 100644 --- a/src/lib/orionTypes/areas.h +++ b/src/lib/orionTypes/areas.h @@ -113,12 +113,8 @@ class Box */ class Polygon { - private: - ::std::string _inverted; - public: ::std::vector vertexList; - void invertedSet(bool inverted); void vertexAdd(Point* p); void release(void); }; @@ -154,8 +150,6 @@ class Geometry int parse(const char* in, std::string* errorString); std::string areaType; - float radius; - bool external; }; }