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

qingxiongf
src/server/dmpservermanager.cpp
src/server/services/managerapi/dmpmanagerapihandler.cpp
src/server/services/tileserver/tms/dmptmstileprovider.cpp
src/server/services/tileserver/wmts/dmpesritileprovider.cpp
--- a/src/server/dmpservermanager.cpp
查看文件 @b6ba294
+++ b/src/server/dmpservermanager.cpp
查看文件 @b6ba294
@@ -182,7 +182,12 @@ bool DmpServerManager::loadServices()
                 std::string type = e.second.get<std::string>("type");
                 int capabilities = e.second.get<int>("capabilities");
                 std::string project = e.second.get<std::string>("project");
+                std::string state = e.second.get<std::string>("state");
                 this->initServices(type, name, title, capabilities, project);
+                if(state=="0")
+                {
+                    serverRegistry_->getServer(type)->stop(name);
+                }
             }
         }
     }
@@ -208,7 +213,7 @@ bool DmpServerManager::initServices(const std::string &serverName, const std::st
         delete project;
         return false;
     }
-
+    
     project->initVectorLayerVacuate([](const std::string &tableguid)
                                     { return DmpHttp::get(DmpServerConfig::Instance()->getMetaUrl() + URL_VACUATE + tableguid); });
--- a/src/server/services/managerapi/dmpmanagerapihandler.cpp
查看文件 @b6ba294
+++ b/src/server/services/managerapi/dmpmanagerapihandler.cpp
查看文件 @b6ba294
@@ -181,7 +181,21 @@ void DmpManagerApiHandler::startService(const DmpServerApiContext &context) cons
             params.getValue("servername", serverName);
             std::string serviceName;
             params.getValue("servicename",serviceName);
-            context.manager()->startService(serverName, serviceName);
+            if(serverName.empty()||serviceName.empty())
+            {
+                context.response()->write("{\"status\":\"false\",\"message\":"+serviceName+"\"服务启动失败\"}");
+                return;
+            }
+            
+            bool flag=context.manager()->startService(serverName, serviceName);
+            if(flag)
+            {
+                context.response()->write("{\"status\":\"true\",\"message\":"+serviceName+"\"服务启动\"}");
+            }
+            else
+            {
+                context.response()->write("{\"status\":\"false\",\"message\":"+serviceName+"\"服务启动失败\"}");
+            }
             break;
         }
         case DmpServerRequest::Method::POST_METHOD:
@@ -206,7 +220,20 @@ void DmpManagerApiHandler::stopService(const DmpServerApiContext &context) const
             params.getValue("servername", serverName);
             std::string serviceName;
             params.getValue("servicename",serviceName);
-            context.manager()->stopService(serverName, serviceName);
+            if(serverName.empty()||serviceName.empty())
+            {
+                context.response()->write("{\"status\":\"false\",\"message\":"+serviceName+"\"服务启动失败\"}");
+                return;
+            }
+            bool flag=context.manager()->stopService(serverName, serviceName);
+            if(flag)
+            {
+                context.response()->write("{\"status\":\"true\",\"message\":"+serviceName+"\"服务停止\"}");
+            }
+            else
+            {
+                context.response()->write("{\"status\":\"false\",\"message\":"+serviceName+"\"服务停止失败\"}");
+            }
             break;
         }
         case DmpServerRequest::Method::POST_METHOD:
@@ -310,7 +337,7 @@ void DmpManagerApiHandler::GetTileServiceInfo(const DmpServerApiContext &context
                     boost::property_tree::read_json(stream, pt);                    
                     path= pt.get<std::string>("projectlayers.maplayer.datasource");
-                    path="/mnt/d/Code/tiles";
+                    //path="/mnt/d/Code/tiles";
                     confcdipath=path+"/conf.cdi";
                     confxmlpath=path+"/conf.xml";
                     std::ifstream fread(confxmlpath, std::ifstream::binary);
--- a/src/server/services/tileserver/tms/dmptmstileprovider.cpp
查看文件 @b6ba294
+++ b/src/server/services/tileserver/tms/dmptmstileprovider.cpp
查看文件 @b6ba294
@@ -75,7 +75,11 @@ namespace tileserver
                //cairo_surface_write_to_png (surface, "./tms.png");
                //LOGGER_DEBUG(filepath);
            }
-       }       
+       }    
+
+
+       
+          
        //cairo_surface_write_to_png (surface, "./tms.png");      
        std::string responseData;
        cairo_surface_write_to_png_stream(surface, cairo_write_func, &responseData);
--- a/src/server/services/tileserver/wmts/dmpesritileprovider.cpp
查看文件 @b6ba294
+++ b/src/server/services/tileserver/wmts/dmpesritileprovider.cpp
查看文件 @b6ba294
@@ -19,7 +19,7 @@ namespace tileserver
     DmpEsriTileProvider::DmpEsriTileProvider(const std::string& rootPath)
         : DmpTileProvider(rootPath)
     {
-        // this->_rootPath ="/mnt/d/Data/tile/ShareMap2014/Layers/_alllayers/";
+        //rootPath_ ="/mnt/d/Code/tiles/SD_2014/Layers/_alllayers";    
     }
     std::string DmpEsriTileProvider::IntToHex8Str(const int num)
@@ -36,7 +36,7 @@ namespace tileserver
         std::string row_str = "R" + IntToHex8Str(row);
         std::string col_str = "C" + IntToHex8Str(col);
-        std::string tile_path = rootPath_ + level_str + "/"+ row_str+"/"+ col_str + "." + format;
+        std::string tile_path = rootPath_ +"/"+ level_str + "/"+ row_str+"/"+ col_str + "." + format;
         std::ifstream fread(tile_path, std::ifstream::binary);
         if(!fread)
@@ -70,8 +70,8 @@ namespace tileserver
         DmpRectangle rectangle=dmpTileLayer->extent();
         std::string format=dmpTileLayer->getFormat();
-        DmpPoint min=DmpPoint(rectangle.xmin(),rectangle.ymin());
-        DmpPoint max=DmpPoint(rectangle.xmax(),rectangle.ymax());
+        DmpPoint min=DmpPoint(rectangle.xmin(),rectangle.ymax());
+        DmpPoint max=DmpPoint(rectangle.xmax(),rectangle.ymin());
         std::vector<DmpTileMatrixSet*> tileMatrixSets;
         dmpTileLayer->getTileMatrixSets(tileMatrixSets); 
         double resolution;
@@ -97,16 +97,41 @@ namespace tileserver
                     TileProviderFactory::BufferCopy(image,surface,cr,i*256,j*256);
                 }
                 //TileProviderFactory::BufferCopy(image,surface,cr,i*256,j*256);
-                //cairo_surface_write_to_png (surface, "./wmts.png");
+                
             }
         }
+        cairo_surface_write_to_png (surface, "./wmts.png");
+        cairo_surface_t* newimage=surface;
+        
+        int w,h;
+        w = cairo_image_surface_get_width (newimage);
+        h = cairo_image_surface_get_height (newimage);   
+        DmpPoint topLeft;
+        TileProviderFactory::RowColToPoint(origin,xMinTile,yMaxTile,resolution,topLeft);
+
+        DmpPoint clipPoint;
+        int wClip,hClip;
+        TileProviderFactory::GetClipBox(topLeft,min,max,resolution,clipPoint,wClip,hClip);
+
+        cairo_surface_t *surface0 = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,wClip, hClip);
+        cairo_t *cr0 =cairo_create (surface0);
+
+        //cairo_rectangle(cr0,clipPoint.x(),clipPoint.y(),wClip,hClip);         
+        cairo_rectangle(cr0,0,0,wClip,hClip);
+        cairo_set_source_surface (cr0, surface,-clipPoint.x(), -clipPoint.y());
+        cairo_clip(cr0);
+        cairo_paint(cr0);   
+
+
         std::string responseData;
-        cairo_surface_write_to_png_stream(surface, TileProviderFactory::cairo_write_func, &responseData);
+        cairo_surface_write_to_png_stream(surface0, TileProviderFactory::cairo_write_func, &responseData);
         response.removeHeader("Content-Type"); 
         std::string f = (format == "jpg") ? "image/jpg" : "image/png";     
         response.setHeader("Content-Type", f);
-        response.write(responseData);    
+        response.write(responseData);  
+        // cairo_destroy (cr0);
+        // cairo_surface_destroy (surface0);   
         cairo_destroy (cr);
         cairo_surface_destroy (surface);   
     }
@@ -115,14 +140,13 @@ namespace tileserver
         std::string level_str = "L" + DmpWmtsUtils::IntToFormatStr(level);
         std::string row_str = "R" + IntToHex8Str(row);
         std::string col_str = "C" + IntToHex8Str(col);
-        
-        reTilePath = rootPath_ + level_str + "/"+ row_str+"/"+ col_str + "." + format;
+        std::string f = (format == "image/jpg") ? "jpg" : "png";
+        reTilePath = rootPath_ + "/"+level_str + "/"+ row_str+"/"+ col_str + "." + f;
-        std::ifstream fread(reTilePath, std::ifstream::binary);
+       std::ifstream fread(reTilePath, std::ifstream::binary);
         if(!fread)
         {
             return false;
         }
-        
     }
 }