Merge branch 'master' of http://gitlab.ctune.cn/DMapServer/DMapServer4.1

@@ -14,6 +14,7 @@ SET (TILESERVER_SRCS
   # dmpwmtsservice.cpp
   wmts/dmpwmtsutils.cpp
   tms/dmptms.cpp
+  tms/dmptmstileprovider.cpp
 )
 
 SET (TILESERVER_HDRS
@@ -30,6 +31,7 @@ SET (TILESERVER_HDRS
   # dmpwmtsservice.h
   wmts/dmpwmtsutils.h
   tms/dmptms.h
+  tms/dmptmstileprovider.h
 )
 ########################################################
 # Build

@@ -6,10 +6,16 @@
 * Email:             zhongpingw@chinadci.com
 * copyright:         广州城市信息研究所有限公司
 ***************************************************************************/
+#include <map>
 #include "dmptms.h"
 #include "dmptilelayer.h"
+#include "dmpserverrequest.h"
+#include "dmpserverresponse.h"
 #include "dmpservercontext.h"
 #include "dmplogger.h"
+#include "dmptilelayer.h"
+#include "dmpproject.h"
+#include "dmptmstileprovider.h"
  
 namespace DmpTms
 {
@@ -26,5 +32,54 @@ namespace DmpTms
 
   void DmpTMSService::executeRequest(const DmpServerContext &context) 
   {
+    
+    if(context.request()->isRestful())
+    {
+      std::string path_=context.request()->path();
+      std::vector<std::string> vec_;
+      boost::split(vec_,context.request()->path(),boost::is_any_of("/"),boost::token_compress_on);
+      int isize_=vec_.size();
+      if(isize_<4)
+      {
+        context.response()->write("Tms,Operation is null");
+        return;
+      }
+      std::string::size_type idx0_,idx1_;
+      idx0_=vec_[isize_-1].find("png");
+      idx1_=vec_[isize_-1].find("jpg");
+      
+      if((idx0_!=std::string::npos)||(idx1_!=std::string::npos))
+      {
+        std::vector<std::string> vec0_;
+        boost::split(vec0_,vec_[isize_-1],boost::is_any_of("."),boost::token_compress_on);
+        int tileCol_=atoi(vec0_[0].c_str());
+        int tileRow_=atoi(vec_[isize_-2].c_str());
+        int tileMatrix_=atoi(vec_[isize_-3].c_str());
+        const DmpProject *project = context.project();
+        DmpTileLayer *tileLayer = static_cast<DmpTileLayer *>(project->getLayer("layer"));
+        std::string format_=vec0_[1].c_str();
+        std::string filePath_=tileLayer->getDataSource();
+        if(filePath_.empty())
+        {
+          context.response()->write("Tms,Operation is null");
+        }
+        else
+        {
+          DmpTmsTileProvider provider_=DmpTmsTileProvider(filePath_);
+          provider_.WriteTile(tileRow_, tileCol_, tileMatrix_, format_, *context.response()); 
+        }
+      }
+      else
+      {
+        context.response()->write("Tms,Operation is null");
+        return;
+      }        
+    }
+    else
+    {
+      context.response()->write("非TMS请求");
+    }
+    
   }
+
 } // namespace DmpTms
\ No newline at end of file

@@ -15,7 +15,7 @@
 
 namespace DmpTms
 {
-  class DmpTMSService : public DmpService
+  class DmpTMSService : public DmpService 
   {
   public:
     DmpTMSService();

-/**************************************************************************
-* file:              dmpserverparameters.cpp
-
-* Author:            lijiahuan
-* Date:              2021-12-09 17:41:00
-* Email:             jiahuanl@chinadci.com
-* copyright:         广州城市信息研究所有限公司
-***************************************************************************/
-#include <iostream>
-#include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
-#include "dmplogger.h"
-#include "dmpserverutils.h"
-#include "dmptmsparameters.h"
-
-
-namespace DmpTms
-{
-    DmpTmsParameters::DmpTmsParameters(const DmpServerParameters &parameters)
-    {
-        params_ = parameters.Parameters();
-    }
-    DmpTmsParameters::DmpTmsParameters() : DmpServerParameters()
-    {
-
-    }
-    int DmpTmsParameters::TileMatrix() const
-    {
-        std::map<std::string, std::string>::const_iterator iter;
-        iter = params_.find("TILEMATRIX");
-        if (iter != params_.end())
-        {
-            try
-            {
-                int num_tile_atrix = boost::lexical_cast<int>(iter->second);
-                return num_tile_atrix;
-            }
-            catch (boost::bad_lexical_cast &e)
-            {
-               LOGGER_ERROR(e.what());
-            }
-        }
-        return -1;
-    }
-    int DmpTmsParameters::TileRow() const
-    {
-        std::map<std::string, std::string>::const_iterator iter;
-        iter = params_.find("TILEROW");
-        if (iter != params_.end())
-        {
-            try
-            {
-                int num_tile_row = boost::lexical_cast<int>(iter->second);
-                return num_tile_row;
-            }
-            catch (boost::bad_lexical_cast &e)
-            {
-               LOGGER_ERROR(e.what());
-            }
-        }
-        return -1;
-    }
-    int DmpTmsParameters::TileCol() const
-    {
-        std::map<std::string, std::string>::const_iterator iter;
-        iter = params_.find("TILECOL");
-        if (iter != params_.end())
-        {
-            try
-            {
-                int num_tile_col = boost::lexical_cast<int>(iter->second);
-                return num_tile_col;
-            }
-            catch (boost::bad_lexical_cast &e)
-            {
-               LOGGER_ERROR(e.what());
-            }
-        }
-        return -1;
-    }
-
-    std::string DmpTmsParameters::TileMatrixSet() const
-    {
-        std::string tile_matrix_set;
-        std::map<std::string, std::string>::const_iterator iter;
-        iter = params_.find("TILEMATRIXSET");
-        if (iter != params_.end())
-        {
-            tile_matrix_set = iter->second;
-        }
-        return tile_matrix_set;
-    }
-    std::string DmpTmsParameters::Layer() const
-    {
-        std::string layer;
-        std::map<std::string, std::string>::const_iterator iter;
-        iter = params_.find("LAYER");
-        if (iter != params_.end())
-        {
-            layer = iter->second;
-        }
-        return layer;
-    }
-
-    DmpTmsParameters::Format DmpTmsParameters::ImageFormat() const
-    {
-        std::string frm;
-        std::map<std::string, std::string>::const_iterator iter;
-        iter = params_.find("format");
-        if (iter != params_.end())
-        {
-            frm = iter->second;
-            if (frm.empty()) {
-              return Format::NONE;
-            }
-            Format f = Format::PNG;
-            boost::to_lower(frm);
-            if (frm.compare("jpg") == 0 || frm.compare("jpeg") == 0 || frm.compare("image/jpeg") == 0 ) {
-              f = Format::JPG;
-            }
-            return f;
-        }
-        return Format::NONE;
-    }
-}
\ No newline at end of file

-/**************************************************************************
-* file:              dmpserverparameters.h
-
-* Author:            lijiahuan
-* Date:              2021-12-09 17:41:00
-* Email:             jiahuanl@chinadci.com
-* copyright:         广州城市信息研究所有限公司
-***************************************************************************/
-#ifndef __dmptmsparameters_h__
-#define __dmptmsparameters_h__
-
-#include "dmpserverparameters.h"
-namespace DmpTms
-{
-    class DmpTmsParameters : public DmpServerParameters
-    {
-    public:
-        enum class Format
-        {
-            NONE,
-            JPG,
-            PNG
-        };
-        DmpTmsParameters(const DmpServerParameters &parameters);
-        DmpTmsParameters();
-        virtual ~DmpTmsParameters() = default;
-        std::string Layer() const;
-        Format ImageFormat() const;
-        std::string TileMatrixSet() const;
-        int TileMatrix() const;
-        int TileRow() const;
-        int TileCol() const;
-    };
-}
-#endif //__dmptmsparameters_h__
\ No newline at end of file

@@ -19,8 +19,7 @@ namespace DmpTms
         std::string tile_path = file_rootPath+"/"+std::to_string(level)+"/"+std::to_string(row)+"/"+std::to_string(col)+"."+format;
         std::ifstream fread(tile_path, std::ifstream::binary);
         if(!fread)
-        {
-            
+        {           
             response.sendError(500, "找不到瓦片:(");
             return;
         }

@@ -16,11 +16,13 @@ namespace DmpTms
 {
   class DmpTmsTileProvider 
   {
-    public:
+    public:      
+      std::string ImageFormat() const;
       DmpTmsTileProvider(const std::string& root_path);
       void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) ;
-      protected:
+    protected:
       std::string file_rootPath;
   };
 }
+
 #endif 
\ No newline at end of file

@@ -31,7 +31,7 @@ namespace DmpWmts
         }
       }
       l = "L" + l;
-      string r = IntToHexStr(rGroup);
+      string r = DmpWmtsUtils::IntToHexStr(rGroup);
     
       int rLength = r.length();
       if (rLength < 4)
@@ -43,7 +43,7 @@ namespace DmpWmts
       }
       r = "R" + r;
 
-      string c = IntToHexStr(cGroup);
+      string c = DmpWmtsUtils::IntToHexStr(cGroup);
       int cLength = c.length();
       if (cLength < 4)
       {

@@ -28,7 +28,7 @@ namespace DmpWmts
     }
     void DmpEsriTileProvider::WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response)
     { 
-        std::string level_str = "L" + IntToFormatStr(level);
+        std::string level_str = "L" + DmpWmtsUtils::IntToFormatStr(level);
         std::string row_str = "R" + IntToHex8Str(row);
         std::string col_str = "C" + IntToHex8Str(col);
         

@@ -58,7 +58,27 @@ namespace DmpWmts
     
     return provider;
   }
-
+  int TileProviderFactory::StringToVector(std::string& strVector)
+  {
+        int iVector_=-1;
+        if(std::strcmp(strVector.c_str(),"ESRI_V0")==0)
+        {
+            iVector_=0;
+        }
+        else if(std::strcmp(strVector.c_str(),"ESRI_V1")==0)
+        {
+            iVector_=1;
+        }    
+        else if(std::strcmp(strVector.c_str(),"ESRI_V2")==0)
+        {
+            iVector_=2;
+        } 
+        else
+        {
+            iVector_=3;
+        }        
+        return iVector_;
+  } 
   // CapabiliTileProviderFactory::CapabiliTileProviderFactory()
   // {
   // }

@@ -31,7 +31,8 @@ namespace DmpWmts
   class TileProviderFactory 
   {
   public:
-    static std::shared_ptr<DmpTileProvider> GetProvider( DmpTileLayer* dmpTileLayer);   
+    static std::shared_ptr<DmpTileProvider> GetProvider( DmpTileLayer* dmpTileLayer);
+    static int StringToVector(std::string& strVector);
   private:
     TileProviderFactory();
   };

@@ -11,9 +11,8 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <string>
 namespace DmpWmts
-{
-
-    std::string IntToFormatStr(const int num)
+{   
+    std::string DmpWmtsUtils::IntToFormatStr(const int num)
     {
         std::string str = std::to_string(num);    
         if(num>=0 && num<10)
@@ -23,7 +22,7 @@ namespace DmpWmts
 	    return str;
     }
 
-    std::string IntToHexStr(const int num)
+    std::string DmpWmtsUtils::IntToHexStr(const int num)
     {
         char* buffer = new char[8];
         sprintf(buffer,"%x",num);
@@ -31,26 +30,5 @@ namespace DmpWmts
         delete[] buffer;
         return str;
     }
-    int StringToVector(std::string& strVector)
-    {
-        int iVector_=-1;
-        if(std::strcmp(strVector.c_str(),"ESRI_V0")==0)
-        {
-            iVector_=0;
-        }
-        else if(std::strcmp(strVector.c_str(),"ESRI_V1")==0)
-        {
-             iVector_=1;
-        }    
-        else if(std::strcmp(strVector.c_str(),"ESRI_V2")==0)
-        {
-             iVector_=2;
-        } 
-        else
-        {
-            iVector_=3;
-        }        
-        return iVector_;
-    }
     
 }

@@ -15,9 +15,13 @@
 
 namespace DmpWmts
 {
-    std::string IntToFormatStr(const int num);
-    std::string IntToHexStr(const int num);
-    int StringToVector(std::string& strVector);  
+    class DmpWmtsUtils
+    {
+        public:
+        static std::string IntToFormatStr(const int num);
+        static std::string IntToHexStr(const int num);
+        
+    };
 }
 
 #endif //__dmpwmtsutils_h__