ljh

@@ -31,7 +31,7 @@ namespace DmpWmts
         }
         }
       }
       }
       l = "L" + l;
       l = "L" + l;
-      string r = IntToHexStr(rGroup);
+      string r = DmpWmtsUtils::IntToHexStr(rGroup);
     
     
       int rLength = r.length();
       int rLength = r.length();
       if (rLength < 4)
       if (rLength < 4)
@@ -43,7 +43,7 @@ namespace DmpWmts
       }
       }
       r = "R" + r;
       r = "R" + r;
 
 
-      string c = IntToHexStr(cGroup);
+      string c = DmpWmtsUtils::IntToHexStr(cGroup);
       int cLength = c.length();
       int cLength = c.length();
       if (cLength < 4)
       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)
     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 row_str = "R" + IntToHex8Str(row);
         std::string col_str = "C" + IntToHex8Str(col);
         std::string col_str = "C" + IntToHex8Str(col);
         
         

@@ -33,7 +33,7 @@ namespace DmpWmts
       std::string tilePath_=dmpTileLayer->getDataSource();
       std::string tilePath_=dmpTileLayer->getDataSource();
       //std::string tilePath_ = "/mnt/d/Code/tiles/gdmap/_alllayers";
       //std::string tilePath_ = "/mnt/d/Code/tiles/gdmap/_alllayers";
       //std::string tileVersion_ = "ESRI_V1";
       //std::string tileVersion_ = "ESRI_V1";
-      int iver_=StringToVector(tileVersion_);      
+      int iver_=StringToVector(tileVersion_);    
       Vector version = (Vector)boost::lexical_cast<int>(iver_);
       Vector version = (Vector)boost::lexical_cast<int>(iver_);
       switch(version)
       switch(version)
 		  {
 		  {
@@ -58,7 +58,27 @@ namespace DmpWmts
     
     
     return provider;
     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()
   // CapabiliTileProviderFactory::CapabiliTileProviderFactory()
   // {
   // {
   // }
   // }

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

@@ -11,9 +11,8 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <string>
 #include <string>
 namespace DmpWmts
 namespace DmpWmts
-{
-
-    std::string IntToFormatStr(const int num)
+{   
+    std::string DmpWmtsUtils::IntToFormatStr(const int num)
     {
     {
         std::string str = std::to_string(num);    
         std::string str = std::to_string(num);    
         if(num>=0 && num<10)
         if(num>=0 && num<10)
@@ -23,7 +22,7 @@ namespace DmpWmts
 	    return str;
 	    return str;
     }
     }
 
 
-    std::string IntToHexStr(const int num)
+    std::string DmpWmtsUtils::IntToHexStr(const int num)
     {
     {
         char* buffer = new char[8];
         char* buffer = new char[8];
         sprintf(buffer,"%x",num);
         sprintf(buffer,"%x",num);
@@ -31,26 +30,5 @@ namespace DmpWmts
         delete[] buffer;
         delete[] buffer;
         return str;
         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
 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__
 #endif //__dmpwmtsutils_h__