w

@@ -50,6 +50,8 @@ public:
     void setHeader(const std::string &name, const std::string &value);
     void setHeader(const std::string &name, const std::string &value);
     Headers headers() const { return headers_; }
     Headers headers() const { return headers_; }
     bool isRestful() const { return isRestful_; }
     bool isRestful() const { return isRestful_; }
+    std::string serviceName() const { return serviceName_;}
+    void setServiceName(const std::string &serviceName) { serviceName_ = serviceName;}
 
 
     DmpServerParameters serverParameters() const { return params_; }
     DmpServerParameters serverParameters() const { return params_; }
     void setParameter(const std::string &name, const std::string &value);
     void setParameter(const std::string &name, const std::string &value);
@@ -68,6 +70,7 @@ protected:
     std::string port_;
     std::string port_;
     std::string path_;
     std::string path_;
     std::string query_;
     std::string query_;
+    std::string serviceName_;
     bool isRestful_;
     bool isRestful_;
 
 
 private:   
 private:   

@@ -65,6 +65,7 @@ void DmpTileServer::executeRequest(DmpServerRequest &request, DmpServerResponse
         if(what.size() == 4) {
         if(what.size() == 4) {
             std::string serviceName = what[1].str();
             std::string serviceName = what[1].str();
             std::string serverType = what[2].str();
             std::string serverType = what[2].str();
+            request.setServiceName(serviceName);
             if(request.isRestful()) {
             if(request.isRestful()) {
                 std::string queryString = what[3].str();
                 std::string queryString = what[3].str();
                 request.setQuery(queryString);
                 request.setQuery(queryString);

@@ -45,29 +45,6 @@ namespace DmpWmts
     return method == DmpServerRequest::GET_METHOD;                   
     return method == DmpServerRequest::GET_METHOD;                   
   }
   }
 
 
-  std::string getWMTSServiceName(const std::string& url) 
-  {
-      std::string service_name;
-      boost::cmatch what;
-      std::string path_("^/DMap/Services/?(/[\\w./]*)/TileServer/WMTSService"); 
-      boost::regex reg(path_,  boost::regex_constants::icase);
-      if(boost::regex_search(url.c_str(), what, reg)) 
-      {
-         if(what.size() >= 2) {
-            std::string server_path = what[1].str();
-            std::string::size_type pos = server_path.find_first_of("/");
-           
-            if(pos != std::string::npos) {
-              service_name = server_path.substr(pos+1,server_path.length()-1);             
-            }
-            else {
-              service_name = server_path;
-            }
-            
-         }
-      }
-      return service_name;
-  }
   void DmpWMTSService::executeRequest(const DmpServerContext &context)
   void DmpWMTSService::executeRequest(const DmpServerContext &context)
   {
   {
     DmpWmtsParameters *params = nullptr;
     DmpWmtsParameters *params = nullptr;
@@ -106,7 +83,7 @@ namespace DmpWmts
     else if (boost::iequals(req, "GetCapabilities"))
     else if (boost::iequals(req, "GetCapabilities"))
     {
     {
       const std::string host_=context.request()->domain()+":"+context.request()->port();;
       const std::string host_=context.request()->domain()+":"+context.request()->port();;
-      const std::string servicename_=getWMTSServiceName(context.request()->path());
+      const std::string servicename_=context.request()->serviceName();
       
       
       boost::property_tree::ptree pt;
       boost::property_tree::ptree pt;
       pt.add("Layer.ows:Title",tileLayer->title());
       pt.add("Layer.ows:Title",tileLayer->title());
@@ -148,93 +125,5 @@ namespace DmpWmts
       capOper.WriteCapabilities(pt,host_,servicename_,*context.response());
       capOper.WriteCapabilities(pt,host_,servicename_,*context.response());
 
 
     }
     }
-
-    //std::string Msg_,connMsg_;
-    //std::string strsql_="SELECT \"Id\", \"Name\" FROM public.\"TileMapItem\";";
-    //PgsqlUtils *pg_=new PgsqlUtils(connMsg_);
-    //pg_->ExecuteQuery(strsql_,Msg_);
-    
-    //获取服务的实例
-    // std::string service_name = GetServiceName(context.request()->path());
-    // DmpService* service_ = GetService(service_name);
-    // if(!service_) {
-    //   context.response()->write("找不到服务：" + service_name + "请确保服务已发布！");
-    // }
-    //判断RESTful、Kvp请求方式
-    /*
-      std::string path_= context.request()->path();
-      if(strstr(path_.c_str(), "?") == NULL)
-      {
-        int row_,col_,matrix_;
-        std::string format_;
-        vector<string> vec;
-        boost::split(vec,path_,boost::is_any_of("/"),boost::token_compress_on);
-        int isize=vec.size();
-        if(isize<8)
-        {
-          context.response()->write("Tms,Operation is null");
-        }
-        if(vec[isize-1].compare(".png")||vec[isize-1].compare(".jpg"))
-        {
-          vector<string> vec0;
-          boost::split(vec0,vec[isize-1],boost::is_any_of("."),boost::token_compress_on);
-          format_=vec0[1];
-          col_=atoi(vec0[0].c_str());
-          row_=atoi(vec[isize-2].c_str());
-          matrix_=atoi(vec[isize-3].c_str());
-          std::shared_ptr<DmpTileProvider> provider = TileProviderFactory::GetProvider(service_);
-          provider->WriteTile(row_, col_, matrix_, format_, *context.response()); 
-        }
-        else
-        {
-          context.response()->write("Tms,Operation is null");
-        }
-        
-      }
-      */
-    //   const DmpWmtsParameters params(context.request()->serverParameters());
-    //   int tile_col = params.TileCol();
-    //   int tile_row = params.TileRow();
-    //   int tile_matrix = params.TileMatrix();
-    //   string req = params.Request();
-    //   DmpWmtsParameters::Format format = params.ImageFormat();
-    // if (req.empty())
-    // {
-    //   context.response()->write("wmts,Operation is null");
-    // }
-    // if (boost::iequals(req, "GetTile"))
-    // {
-    //   string f = (format == DmpWmtsParameters::Format::JPG) ? "jpg" : "png";
-    //   std::shared_ptr<DmpTileProvider> provider = TileProviderFactory::GetProvider(service_);
-    //   provider->WriteTile(tile_row, tile_col, tile_matrix, f, *context.response());
-    // }
-    // else if (boost::iequals(req, "GetCapabilities"))
-    // {
-    //std::shared_ptr<DmpCapabiliTilesProvider> provider = CapabiliTileProviderFactory::GetProvider();
-    //provider->WriteCapabilities(*context.response());
-
-    //  std::string host_=context.request()->domain()+":"+context.request()->port();
-
-    //  std::shared_ptr<DmpCapabiliTilesProvider> provider = CapabiliTileProviderFactory::GetProvider();
-    //  boost::property_tree::ptree pt_;
-    //  if(context.manager()->GetTilePTree(service_name,pt_))
-    //  {
-    //    //provider->WriteCapabilities(pt_,host_,service_name,*context.response());
-    //    provider->WriteCapabilities(*context.response());
-    //  }
-    //  else
-    //  {
-    //    context.response()->write("GetTileInfo false");
-    //  }
-
-    // }
-    // else if (boost::iequals(req, "GetFeatureInfo"))
-    // {
-    //   context.response()->write("wmts, GetFeatureInfo");
-    // }
-    // else
-    // {
-    //   context.response()->write("wmts,Operation not supported");
-    // }
   }
   }
 } // namespace DmpWmts
 } // namespace DmpWmts