Remove template argument of Cql2Cpp

Change-Id: Ie506852b4006fcc93e1ea4e32546d4e83bdaa240
Signed-off-by: Kunlin Yu <yukunlin@syriusrobotics.com>

Author: kunlinyu

include/cql2cpp/cql2cpp.h

@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include <map>
 #include <string>
 #include <variant>
 #include <vector>
@@ -30,10 +29,10 @@
 
 namespace cql2cpp {
 
-template <typename FeatureType>
+
 class Cql2Cpp {
  private:
-  std::map<FeatureSourcePtr, FeatureType> feature_source_2_type_;
+  std::vector<FeatureSourcePtr> features_;
   std::ostream& ostr_;
   Evaluator evaluator_;
 
@@ -44,18 +43,18 @@ class Cql2Cpp {
 
   Cql2Cpp(std::ostream& ostr) : ostr_(ostr) {}
 
-  void set_feature_source(const std::map<FeatureSourcePtr, FeatureType> fs2t) {
-    feature_source_2_type_ = fs2t;
+  void set_feature_source(const std::vector<FeatureSourcePtr> feature_source) {
+    features_ = feature_source;
   }
 
-  void clear() { feature_source_2_type_.clear(); }
+  void clear() { features_.clear(); }
 
   void RegisterFunctor(const FunctorPtr functor) {
     evaluator_.RegisterFunctor(functor);
   }
 
   bool filter(const std::string& cql2_query,
-              std::vector<FeatureType>* result) const {
+              std::vector<FeatureSourcePtr>* result) const {
     // Parse
     AstNodePtr root;
     if (not Parse(cql2_query, &root, &error_msg_)) return false;
@@ -64,8 +63,8 @@ class Cql2Cpp {
     ValueT value;
 
     // Loop over all features
-    for (const auto& [fs, f] : feature_source_2_type_) {
-      if (evaluator_.Evaluate(root, fs.get(), &value)) {
+    for (const auto& f : features_) {
+      if (evaluator_.Evaluate(root, f.get(), &value)) {
         if (std::holds_alternative<bool>(value)) {
           if (std::get<bool>(value)) result->emplace_back(f);
         } else {

src/main.cc

@@ -98,7 +98,7 @@ int main(int argc, char** argv) {
       cql2cpp::AstNode::set_ostream(&std::cout);
     std::string dot;
     std::string error_msg;
-    cql2cpp::Cql2Cpp<geos::io::GeoJSONFeature> cql2cpp;
+    cql2cpp::Cql2Cpp cql2cpp;
     if (cql2cpp.ToDot(parse_command.get<std::string>("query"), &dot,
                       &error_msg)) {
       if (parse_command.is_used("--output")) {
@@ -146,23 +146,26 @@ int main(int argc, char** argv) {
     LOG(INFO) << "load " << fc.getFeatures().size() << " features from "
               << features;
 
+    std::vector<cql2cpp::FeatureSourcePtr> fs_feature;
     std::map<cql2cpp::FeatureSourcePtr, const geos::io::GeoJSONFeature*>
-        fs_feature;
+        fs_to_geojson;
     for (const auto& feature : fc.getFeatures()) {
       cql2cpp::FeatureSourcePtr fp =
           std::make_shared<cql2cpp::FeatureSourceGeoJson>(feature);
-      fs_feature[fp] = &feature;
+      fs_feature.emplace_back(fp);
+      fs_to_geojson[fp] = &feature;
     }
 
     std::string query = filter_command.get<std::string>("query");
 
-    cql2cpp::Cql2Cpp<const geos::io::GeoJSONFeature*> cql2cpp;
+    cql2cpp::Cql2Cpp cql2cpp;
     cql2cpp.set_feature_source(fs_feature);
-    std::vector<const geos::io::GeoJSONFeature*> result;
+    std::vector<cql2cpp::FeatureSourcePtr> result;
     if (cql2cpp.filter(query, &result)) {
       LOG(INFO) << result.size() << " features match the filter:";
       geos::io::GeoJSONWriter writer;
-      for (const auto& feature : result) LOG(INFO) << writer.write(*feature);
+      for (const auto& feature : result)
+        LOG(INFO) << writer.write(*fs_to_geojson[feature]);
     } else {
       LOG(ERROR) << "filter error: " << cql2cpp.error_msg();
     }
@@ -172,7 +175,7 @@ int main(int argc, char** argv) {
     std::string query = sql_command.get<std::string>("query");
     std::string sql_where;
     std::string error_msg;
-    if (cql2cpp::Cql2Cpp<void*>::ConvertToSQL(query, &sql_where, &error_msg)) {
+    if (cql2cpp::Cql2Cpp::ConvertToSQL(query, &sql_where, &error_msg)) {
       LOG(INFO) << sql_where;
     } else {
       LOG(ERROR) << error_msg;
@@ -213,7 +216,7 @@ int main(int argc, char** argv) {
     cql2cpp::FeatureSourceGeoJson fs(fc.getFeatures().at(index));
     std::string query = eval_command.get<std::string>("query");
 
-    cql2cpp::Cql2Cpp<const geos::io::GeoJSONFeature*> cql2cpp;
+    cql2cpp::Cql2Cpp cql2cpp;
 
     std::string dot;
     bool eval_result;

test/test_parse.cc

@@ -53,7 +53,7 @@ class ParseTest : public testing::Test {
 
     std::string dot;
     cql2cpp::AstNode::set_ostream(&std::cout);
-    bool ret = cql2cpp::Cql2Cpp<void*>::ToDot(query, &dot, nullptr);
+    bool ret = cql2cpp::Cql2Cpp::ToDot(query, &dot, nullptr);
     if (ret and gen_dot_) {
       std::string dot_filename = case_name + ".dot";
       std::ofstream fout(dot_filename);

test/test_sql.cc

@@ -102,7 +102,7 @@ class SqlTest : public testing::Test {
                  NULL, 0, &error_msg);
 
     // Parse query to get queryables
-    cql2cpp::Cql2Cpp<void *> cql2cpp;
+    cql2cpp::Cql2Cpp cql2cpp;
     std::string error_str;
     auto root = cql2cpp.ParseAsAst(query, &error_str);