在线配图

@@ -9,7 +9,7 @@
 #include "dmpservermanager.h"
 #include "dmpserver.h"
 #include "dmphttputils.h"
-#include "dmpserverConfig.h"
+#include "dmpserverconfig.h"
 #include <memory>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>

@@ -110,6 +110,10 @@ void DmpManagerApiHandler::regService(const DmpServerApiContext &context) const
                     // context.response()->removeHeader("Content-Type");
                     // context.response()->setHeader("Content-Type", "text/xml;charset=utf-8");
                     // context.response()->write(projData);
+
+
+
+                    
                 }
                 else
                 {

@@ -21,6 +21,7 @@ SET (MAPSERVER_SRCS
   mapping/dmpmapping.cpp
   mapping/dmpeditservice.cpp
   mapping/dmpmappingparameters.cpp
+  mapping/dmpimageinfo.cpp
 )
 
 SET (MAPSERVER_HDRS
@@ -42,6 +43,7 @@ SET (MAPSERVER_HDRS
   mapping/dmpmapping.h
   mapping/dmpeditservice.h
   mapping/dmpmappingparameters.h
+  mapping/dmpimageinfo.h
 )
 
 ########################################################

@@ -91,13 +91,6 @@ namespace DmpMapping
              context.response()->writeJson("{\"status\":\"false\",\"message\":\"post 参数错误!\"}");
              return false;
         }
-
-        if(!context.serverProject())
-        {
-             LOGGER_ERROR("加载服务信息失败，服务名称是否错误");
-             context.response()->writeJson("{\"status\":\"false\",\"message\":\"加载服务信息失败，服务名称是否错误!\"}");
-             return false;
-        }
         
         try
         {

+/**************************************************************************
+* file:              dmpimageinfo.cpp
+
+* Author:            qingxiongf
+* Date:              2022-01-04 10:50:35
+* Email:             qingxiongf@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+#include <unistd.h>
+#include <dirent.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <map>
+#include <set>
+#include <fontconfig/fontconfig.h>
+
+#include <boost/foreach.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/date_time.hpp>
+#include <boost/property_tree/ptree.hpp> 
+#include <boost/property_tree/json_parser.hpp> 
+#include <boost/typeof/typeof.hpp>
+#include "dmplogger.h"
+#include "dmpserverresponse.h"
+#include "dmpserverrequest.h"
+
+#include "dmpimageinfo.h"
+
+namespace DmpMapping
+{
+    void getTypefaceList(const DmpServerContext &context) 
+    {
+        FcConfig *config = FcInitLoadConfigAndFonts();
+        FcPattern *pat = FcPatternCreate();
+        FcObjectSet *os = FcObjectSetBuild(FC_FAMILY, FC_STYLE, FC_LANG, FC_FILE, (char *)0);
+        FcFontSet *fs = FcFontList(config, pat, os);
+        if (fs == nullptr)
+        {
+            context.response()->writeJson("{\"error\":\"load FcFontSet  failed\"}");
+            return;
+        }
+        //printf("Total matching fonts: %d\n", fs->nfont);
+        boost::property_tree::ptree ptDoc;
+        boost::property_tree::ptree ptRoot;
+
+        std::map<std::string, std::string> mapFont;
+        mapFont["SimSun"] = "宋体";
+        mapFont["NSimSun"] = "新宋体";
+        mapFont["SimHei"] = "黑体";
+        mapFont["FangSong"] = "仿宋";
+        mapFont["KaiTi"] = "楷体";
+        mapFont["LiSu"] = "隶书";
+        mapFont["YouYuan"] = "幼圆";
+        mapFont["STXihei"] = "华文细黑";
+        mapFont["STKaiti"] = "华文楷体";
+        mapFont["STSong"] = "华文宋体";
+        mapFont["STZhongsong"] = "华文中宋";
+        mapFont["STFangsong"] = "华文仿宋";
+        mapFont["FZShuTi"] = "方正舒体";
+        mapFont["FZYaoti"] = "方正姚体";
+        mapFont["STCaiyun"] = "华文彩云";
+        mapFont["STHupo"] = "华文琥珀";
+        mapFont["STLiti"] = "华文隶书";
+        mapFont["STXingkai"] = "华文行楷";
+        mapFont["STXinwei"] = "华文新魏";
+        mapFont["Microsoft YaHei"] = "微软雅黑";
+        mapFont["Microsoft JhengHei"] = "微軟正黑體";
+        mapFont["DengXian"] = "等线";
+        mapFont["MingLiU"] = "細明體";
+        mapFont["MingLiU_HKSCS"] = "細明體_HKSCS";
+        mapFont["MingLiU"] = "細明體";
+
+        std::set<std::string> setFont;
+        char buff[1000];
+        for (int i = 0; fs && i < fs->nfont; ++i)
+        {
+
+            FcPattern *font = fs->fonts[i];
+            FcChar8 *file, *style, *family, *prgname;
+            if (FcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch &&
+                FcPatternGetString(font, FC_FAMILY, 0, &family) == FcResultMatch &&
+                FcPatternGetString(font, FC_STYLE, 0, &style) == FcResultMatch)
+            {
+                sprintf(buff, "%s", family);
+                if (setFont.find(buff) == setFont.end())
+                {
+
+                    setFont.insert(buff);
+                    if (mapFont.find(buff) != mapFont.end())
+                    {
+                        boost::property_tree::ptree ptNode;
+                        ptNode.put("", buff);
+                        ptRoot.push_back(std::make_pair("", ptNode));
+                    }
+                }
+            }
+        }
+
+        for (std::set<std::string>::iterator iter = setFont.begin();
+             iter != setFont.end(); iter++)
+        {
+            if (mapFont.find(*iter) == mapFont.end())
+            {
+                boost::property_tree::ptree ptNode;
+                ptNode.put("", *iter);
+                ptRoot.push_back(std::make_pair("", ptNode));
+            }
+        }
+
+        FcFontSetDestroy(fs);
+
+        ptDoc.add_child("value", ptRoot);
+        std::stringstream stream;
+        write_json(stream, ptDoc);
+        std::string responseStr = stream.str();
+        context.response()->writeJson(responseStr);
+    }
+
+    void getImage(const DmpServerContext &context) 
+    {
+        DmpServerParameters params = context.request()->serverParameters();
+        std::string name;
+        params.getValue("name", name);
+
+        std::string imagePath = getFilePath("../symbollib/" + name);
+        FILE *file = fopen(imagePath.c_str(), "rb");
+
+        try
+        {
+            char buff[1024];
+            if (file == 0)
+            {
+                context.response()->writeJson("{\"error\":\"open file failed\"}");
+                return;
+            }
+
+            context.response()->removeHeader("Content-Type");
+            context.response()->setHeader("Content-Type", "image/png");
+
+            for (int i = 0; i < 20000; i++)
+            {
+                size_t t = fread(buff, 1, sizeof(buff), file);
+                context.response()->writeContent(buff, t);
+
+                if (t != sizeof(buff))
+                    break;
+            }
+            fclose(file);
+            return;
+        }
+        catch (...)
+        {
+            if (file)
+                fclose(file);
+        }
+        context.response()->writeJson("{\"error\":\"Parameter name is null\"}");
+    }
+
+    void getImageTypeList(const DmpServerContext &context) 
+    {
+        DIR *dirp;
+        struct dirent *dp;
+        std::string imagePath = getFilePath("../symbollib");
+        dirp = opendir(imagePath.c_str());
+
+        boost::property_tree::ptree ptDoc;
+        boost::property_tree::ptree ptRoot;
+
+        if (dirp)
+        {
+            while ((dp = readdir(dirp)) != NULL)
+            {
+                if (dp->d_name == NULL || dp->d_name[0] == '.')
+                {
+                    continue;
+                }
+
+                boost::property_tree::ptree ptDir;
+
+                ptDir.add("name", dp->d_name);
+                ptRoot.push_back(std::make_pair("", ptDir));
+                //ptRoot.add_child("imageType",ptDir);
+            }
+            closedir(dirp);
+        }
+        else
+        {
+            LOGGER_ERROR("not find dir " + imagePath);
+        }
+
+        ptDoc.add_child("value", ptRoot);
+        std::stringstream stream;
+        write_json(stream, ptDoc);
+        std::string responseStr = stream.str();
+        context.response()->writeJson(responseStr);
+    }
+
+    void getImageList(const DmpServerContext &context) 
+    {
+        DmpServerParameters params = context.request()->serverParameters();
+        std::string name;
+        params.getValue("name", name);
+
+        if (name.empty())
+        {
+            context.response()->writeJson("{\"error\":\"Parameter name is null\"}");
+            return;
+        }
+
+        struct dirent *dp;
+        std::string imagePath = getFilePath("../symbollib/" + name);
+        DIR *dirp = opendir(imagePath.c_str());
+
+        boost::property_tree::ptree ptDoc;
+        boost::property_tree::ptree ptRoot;
+
+        if (dirp)
+        {
+            while ((dp = readdir(dirp)) != NULL)
+            {
+                boost::property_tree::ptree ptDir;
+                if (dp->d_name == NULL || dp->d_name[0] == '.')
+                {
+                    continue;
+                }
+                ptDir.add("name", dp->d_name);
+                ptDir.add("path", ("../symbollib/" + name + "/" + dp->d_name));
+                ptRoot.push_back(std::make_pair("", ptDir));
+            }
+            closedir(dirp);
+        }
+        else
+        {
+            LOGGER_ERROR("not find dir " + imagePath);
+        }
+
+        ptDoc.add_child("value", ptRoot);
+        std::stringstream stream;
+        write_json(stream, ptDoc);
+        std::string responseStr = stream.str();
+        context.response()->writeJson(responseStr);
+    }
+
+    std::string getFilePath(const std::string &path) 
+    {
+        char sz[300] = {0};
+        if (getCurrentFolderPath(sz, sizeof(sz)) > 0)
+        {
+            std::string s;
+            s = sz;
+            size_t t = s.rfind('/');
+            sz[t] = 0;
+            if (path[0] == '/')
+            {
+                return path;
+            }
+            int i = 0;
+            if (path[0] == '.')
+            {
+                if (path[1] == '.')
+                {
+                    i++;
+                    s = sz;
+                    t = s.rfind('/');
+                    sz[t] = 0;
+                }
+                i++;
+            }
+            if ((sz[t] == '/' || sz[t] == '\\') && (path[i] == '/' || path[i] == '\\'))
+            {
+                i++;
+            }
+
+            int j = t;
+            for (j = t; i < path.length(); i++, j++)
+            {
+                if (path[i] == '\\')
+                {
+                    sz[j] = '/';
+                }
+                else
+                {
+                    sz[j] = path[i];
+                }
+            }
+            sz[j] = 0;
+            //strcat(sz, path.c_str());
+            return sz;
+        }
+        else
+            return 0;
+    }
+
+    size_t getCurrentFolderPath(char *processdir, size_t len) 
+    {
+        char *path_end;
+        if (readlink("/proc/self/exe", processdir, len) <= 0)
+            return -1;
+        path_end = strrchr(processdir, '/');
+        if (path_end == NULL)
+            return -1;
+        ++path_end;
+        //strcpy(processname, path_end);
+        *path_end = '\0';
+        return (size_t)(path_end - processdir);
+    }
+
+}
\ No newline at end of file

+/**************************************************************************
+* file:              dmpimageinfo.h
+
+* Author:            qingxiongf
+* Date:              2022-01-04 10:03:50
+* Email:             qingxiongf@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+
+#ifndef __dmpimageinfo_h__
+#define __dmpimageinfo_h__
+
+#include <map>
+#include <memory>
+#include <functional>
+#include "dmpservercontext.h"
+
+
+
+namespace DmpMapping
+{
+    void getTypefaceList(const DmpServerContext &context) ; //获取字体列表
+    void getImageTypeList(const DmpServerContext &context) ; //获取图片目录列表
+    void getImageList(const DmpServerContext &context) ; //获取图片列表
+    void getImage(const DmpServerContext &context) ; //获取图片
+    std::string getFilePath(const std::string& path);
+    size_t  getCurrentFolderPath(char *processdir, size_t len);
+}
+
+#endif // __dmpimageinfo_h__
+

@@ -17,8 +17,11 @@
 #include "dmpserverresponse.h"
 #include "dmplogger.h"
 #include "../wms/dmpwmsgetmap.h"
+#include "../wms/dmpwmsparameters.h"
 #include "dmpmapping.h"
 #include "dmpmappingparameters.h"
+#include "dmpimageinfo.h"
+
 using namespace std;
 
 namespace DmpMapping
@@ -47,10 +50,37 @@ namespace DmpMapping
     {
       loadService(context, vectorMappingProjects_);
     }
+    else if (boost::iequals(request, "editService"))
+    {
+      editService(context, vectorMappingProjects_);
+    }
     else if (boost::iequals(request, "getmap"))
     {
-      DmpWms::writeGetMap(context, params, nullptr);
+      const std::string map = params.Map();
+      if(vectorMappingProjects_.find(map) != vectorMappingProjects_.end())
+      {
+          shared_ptr<DmpProject> project = vectorMappingProjects_.find(map)->second;
+          const DmpWms::DmpWmsParameters wmsParams(context.request()->serverParameters());
+          DmpWms::writeGetMap(context, wmsParams, project.get());
+      }
+    }
+    else if (boost::iequals(request,"gettypefacelist")) {
+       getTypefaceList(context);
+    }
+    else if (boost::iequals(request,"getimagetyplist")) {
+       getImageTypeList(context);
+    }
+    else if (boost::iequals(request,"getimagelist")) {
+       getImageList(context);
+    }
+    else if (boost::iequals(request,"getimage")) {
+       getImage(context);
     }
   }
+
+
+
+
+
 } 
 

@@ -87,4 +87,11 @@ namespace DmpMapping
         return value;
     }
 
+    std::string DmpMappingParameters::Map() const
+    {
+        std::string value = "";
+        GetStringParameter("MAP",value);
+        return value;
+    }
+
 } // namespace DmpWms
\ No newline at end of file

@@ -23,6 +23,8 @@ namespace DmpMapping
         std::string Request() const;  //必须 值为GetMap GetCapabilities GetFeatureInfo GetFeatureInfo GetLegendGraphic
         std::string Version() const; //必须  服务版本， 值为 1.0.0, 1.1.0, 1.1.1, 1.3
 
+        std::string Map() const; 
+
     private:
         bool GetStringParameter(const char* key, std::string &value) const;
         bool GetIntParameter(const char* key, int& value) const;

@@ -50,7 +50,7 @@ namespace DmpWms
       {
           writeGetMap(context,params, project);
       } 
-      else if(boost::iequals(request,"thumbnail"))
+      else if(boost::iequals(request,"thumbnail") || boost::iequals(request,"getthumbnail"))
       {
           writeThumbnail(context,params, project);
       }

@@ -125,6 +125,7 @@ namespace DmpWms
 	
 			shared_ptr<Rect> rect (new Rect(maxy, maxx, miny, minx));
 			mapRenderer.SetExtent(rect);
+			mapRenderer.AddWmsMapLayers(project);
 			mapRenderer.GetMap(nullptr, nullptr, nullptr, true);
 			string responseData;
 			mapRenderer.ToStream(responseData);

@@ -8,8 +8,6 @@
 ***************************************************************************/
 #include "dmptmstileprovider.h"
 #include "dmpserverresponse.h"
-#include <math.h>
-#include "dmplogger.h"
 namespace DmpTms
 {
     DmpTmsTileProvider::DmpTmsTileProvider(const std::string& root_path)
@@ -45,104 +43,4 @@ namespace DmpTms
         }
         fread.close();
     }
-    void DmpTmsTileProvider::GetTileThumbnail(DmpTileLayer* dmpTileLayer,DmpServerResponse& respons)
-    {
-       int tilematrix=0;
-       std::string tilePath=dmpTileLayer->getDataSource();
-
-       //tilePath="/mnt/d/Code/tiles/qgis";
-       DmpRectangle rectangle=dmpTileLayer->extent();
-       
-       DmpPoint min=DmpPoint(rectangle.xmin(),rectangle.ymin());
-       DmpPoint max=DmpPoint(rectangle.xmax(),rectangle.ymax());
-       tilematrix=this->screenMatrixSet(min,max);
-       int xMinTile, yMinTile,xMaxTile,yMaxTile;
-       this->degToNum(tilematrix,min.x(),min.y(),xMinTile,yMinTile);
-       this->degToNum(tilematrix,max.x(),max.y(),xMaxTile,yMaxTile);
-       int heigth=abs(yMaxTile-yMinTile);
-       int width=abs(xMaxTile-xMinTile);
-
-       cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 256*(width+1), 256*(heigth+1));
-       cairo_t *cr =cairo_create (surface);
-       for( int i = 0 ; i <= width ; i++ )
-       {
-           for(int j=0;j<=heigth;j++)
-           {
-               std::string filepath=tilePath+"/"+std::to_string(tilematrix)+"/"+std::to_string(xMinTile+i)+"/"+std::to_string(yMaxTile+j)+".png";
-               cairo_surface_t*  image = cairo_image_surface_create_from_png( filepath.c_str());
-               this->BufferCopy(image,surface,cr,i*256,j*256);
-               //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);
-       respons.removeHeader("Content-Type");
-       respons.setHeader("Content-Type", "image/png"); 
-       respons.write(responseData); 
-       cairo_destroy (cr);
-       cairo_surface_destroy (surface);       
-    }  
-    //经纬度到瓦片
-    void DmpTmsTileProvider::degToNum(int zoom, double lon_deg, double lat_deg,int& x,int& y)
-    {
-        double n = pow(2.0, zoom);
-        double xtile = n * ((lon_deg + 180) / 360);
-	    //角度转弧度
-	    double lat_rad = lat_deg * RAD2DEG;
-	    double ytile = n * (1 - (log(tan(lat_rad) + (1 / cos(lat_rad))) / pi)) / 2;
-        
-	    x = (int)floor(xtile);
-	    y = (int)floor(ytile);
-    }
-    //瓦片到经纬度
-    // double* DmpTmsTileProvider::numToDeg(int zoom, int xtile, int ytile)
-    // {
-    //     double n = pow(2.0, zoom);
-	//     double lon_deg = double(xtile) / n * 360.0 - 180.0;
-	//     double lat_rad = atan(sinh(pi * (1 - 2 * ytile / n)));
-	//     double lat_deg = lat_rad * 180.0 / pi;
-    //     double lonlat[2] = {};
-	//     lonlat[0] = lon_deg;
-	//     lonlat[1] = lat_deg;
-    //     return lonlat;
-    // }  
-    bool DmpTmsTileProvider::BufferCopy(cairo_surface_t *pClsCSFrom, cairo_surface_t *pClsCSTo, cairo_t *cr,int x,int y)
-    {
-        if (pClsCSFrom == NULL||pClsCSTo == NULL)
-        {
-            return false;
-        }
-        if(cr==NULL)
-        {
-            cr =  cairo_create (pClsCSTo);
-        }
-        cairo_set_source_surface(cr, pClsCSFrom, x, y); 
-        cairo_paint(cr);
-        return true;
-    }
-    cairo_status_t DmpTmsTileProvider::cairo_write_func(void *pbuff, const unsigned char *data, unsigned int length)
-    {
-        std::string *responseData = (std::string *)pbuff;
-        responseData->append((char *)data, length);
-        return CAIRO_STATUS_SUCCESS;
-    }
-    int DmpTmsTileProvider::screenMatrixSet(DmpPoint min,DmpPoint max)
-    {
-        int iMatrixSet=4;
-        for( ; iMatrixSet<=20 ; iMatrixSet++ )
-        {
-            int xMinTile, yMinTile,xMaxTile,yMaxTile;
-            this->degToNum(iMatrixSet,min.x(),min.y(),xMinTile,yMinTile);
-            this->degToNum(iMatrixSet,max.x(),max.y(),xMaxTile,yMaxTile);
-            int heigth=abs(yMaxTile-yMinTile);
-            int width=abs(xMaxTile-xMinTile);
-            if((heigth+1)*(width+1)<9 && (heigth+2)*(width+2)>10)
-            {
-                break;
-            }
-        }               
-        return iMatrixSet;
-    }
 }
\ No newline at end of file