Merge pull request #1137 from Framstag/issue_1045_3

Further cleanup of MapPainter and Co.
Framstag · Oct 14, 2021 · f498f98 · f498f98
2 parents 4049f28 + 8cf50ec
commit f498f98
Show file tree

Hide file tree

Showing 11 changed files with 277 additions and 243 deletions.
diff --git a/libosmscout-map-agg/src/osmscout/MapPainterAgg.cpp b/libosmscout-map-agg/src/osmscout/MapPainterAgg.cpp
@@ -665,9 +665,9 @@ namespace osmscout {
       for (const auto& data : area.clippings) {
         agg::path_storage clipPath;
 
-         clipPath.move_to(coordBuffer.buffer[data.transStart].GetX(),
-                          coordBuffer.buffer[data.transStart].GetY());
-        for (size_t i=data.transStart+1; i<=data.transEnd; i++) {
+         clipPath.move_to(coordBuffer.buffer[data.GetStart()].GetX(),
+                          coordBuffer.buffer[data.GetStart()].GetY());
+        for (size_t i=data.GetStart()+1; i<=data.GetEnd(); i++) {
           clipPath.line_to(coordBuffer.buffer[i].GetX(),
                            coordBuffer.buffer[i].GetY());
         }

diff --git a/libosmscout-map-cairo/src/osmscout/MapPainterCairo.cpp b/libosmscout-map-cairo/src/osmscout/MapPainterCairo.cpp
@@ -1347,9 +1347,9 @@ namespace osmscout {
         cairo_new_sub_path(draw);
         cairo_set_line_width(draw,0.0);
         cairo_move_to(draw,
-                      coordBuffer.buffer[data.transStart].GetX(),
-                      coordBuffer.buffer[data.transStart].GetY());
-        for (size_t i=data.transStart+1; i<=data.transEnd; i++) {
+                      coordBuffer.buffer[data.GetStart()].GetX(),
+                      coordBuffer.buffer[data.GetStart()].GetY());
+        for (size_t i=data.GetStart()+1; i<=data.GetEnd(); i++) {
           cairo_line_to(draw,
                         coordBuffer.buffer[i].GetX(),
                         coordBuffer.buffer[i].GetY());

diff --git a/libosmscout-map-directx/src/osmscout/MapPainterDirectX.cpp b/libosmscout-map-directx/src/osmscout/MapPainterDirectX.cpp
@@ -976,10 +976,7 @@ namespace osmscout
       m_pRenderTarget->DrawGeometry(pPathGeometry, GetColorBrush(borderStyle->GetColor()), borderWidth, GetStrokeStyle(borderStyle->GetDash()));
     pPathGeometry->Release();
 
-    for (std::list<PolyData>::const_iterator c = area.clippings.begin();
-         c != area.clippings.end();
-         c++) {
-      const PolyData    &data = *c;
+    for (const auto& data : area.clippings) {
       ID2D1PathGeometry* pPathGeometry;
       HRESULT hr = m_pDirect2dFactory->CreatePathGeometry(&pPathGeometry);
       if (SUCCEEDED(hr))
@@ -988,9 +985,11 @@ namespace osmscout
         hr = pPathGeometry->Open(&pSink);
         if (SUCCEEDED(hr))
         {
-          pSink->BeginFigure(POINTF(coordBuffer.buffer[data.transStart].GetX(), coordBuffer.buffer[data.transStart].GetY()), D2D1_FIGURE_BEGIN_FILLED);
+          pSink->BeginFigure(POINTF(coordBuffer.buffer[data.GetStart()].GetX(),
+                                    coordBuffer.buffer[data.GetStart()].GetY()),
+                             D2D1_FIGURE_BEGIN_FILLED);
 
-          for (size_t i = data.transStart + 1; i <= data.transEnd; i++) {
+          for (size_t i = data.GetStart() + 1; i <= data.GetEnd(); i++) {
             pSink->AddLine(POINTF(coordBuffer.buffer[i].GetX(), coordBuffer.buffer[i].GetY()));
           }
           pSink->EndFigure(D2D1_FIGURE_END_CLOSED);

diff --git a/libosmscout-map-gdi/src/osmscout/MapPainterGDI.cpp b/libosmscout-map-gdi/src/osmscout/MapPainterGDI.cpp
@@ -747,13 +747,10 @@ namespace osmscout {
 			Gdiplus::Region* region;
 		};
 		std::vector<clippingRegion> clippingInfo;
-		for (std::list<PolyData>::const_iterator c = area.clippings.begin();
-			c != area.clippings.end();
-			++c) {
-			const PolyData &data = *c;
+		for (const auto& data : area.clippings) {
 			clippingRegion cr;
 			cr.points = new PointFBuffer();
-			for (size_t i = data.transStart; i <= data.transEnd; i++) {
+			for (size_t i = data.GetStart(); i <= data.GetEnd(); i++) {
 				cr.points->AddPoint(coordBuffer.buffer[i].GetX(), coordBuffer.buffer[i].GetY());
 			}
 			cr.points->Close();

diff --git a/libosmscout-map-iosx/src/osmscout/MapPainterIOS.mm b/libosmscout-map-iosx/src/osmscout/MapPainterIOS.mm
@@ -914,9 +914,9 @@ static void DrawPattern (void * info,CGContextRef cg){
 
         if (!area.clippings.empty()) {
             for (const auto& data : area.clippings) {
-                CGContextMoveToPoint(cg,coordBuffer.buffer[data.transStart].GetX(),
-                            coordBuffer.buffer[data.transStart].GetY());
-                for (size_t i=data.transStart+1; i<=data.transEnd; i++) {
+                CGContextMoveToPoint(cg,coordBuffer.buffer[data.GetStart()].GetX(),
+                            coordBuffer.buffer[data.GetStart()].GetY());
+                for (size_t i=data.GetStart()+1; i<=data.GetEnd(); i++) {
                     CGContextAddLineToPoint(cg,coordBuffer.buffer[i].GetX(),
                                 coordBuffer.buffer[i].GetY());
                 }

diff --git a/libosmscout-map-qt/src/osmscout/MapPainterQt.cpp b/libosmscout-map-qt/src/osmscout/MapPainterQt.cpp
@@ -901,10 +901,10 @@ namespace osmscout {
 
     if (!area.clippings.empty()) {
       for (const auto& data : area.clippings) {
-        path.moveTo(coordBuffer.buffer[data.transStart].GetX(),
-                    coordBuffer.buffer[data.transStart].GetY());
+        path.moveTo(coordBuffer.buffer[data.GetStart()].GetX(),
+                    coordBuffer.buffer[data.GetStart()].GetY());
 
-        for (size_t i=data.transStart+1; i<=data.transEnd; i++) {
+        for (size_t i=data.GetStart()+1; i<=data.GetEnd(); i++) {
           path.lineTo(coordBuffer.buffer[i].GetX(),
                       coordBuffer.buffer[i].GetY());
         }

diff --git a/libosmscout-map-svg/src/osmscout/MapPainterSVG.cpp b/libosmscout-map-svg/src/osmscout/MapPainterSVG.cpp
@@ -1013,13 +1013,9 @@ namespace osmscout {
     }
     stream << " Z";
 
-    for (std::list<PolyData>::const_iterator c=area.clippings.begin();
-        c!=area.clippings.end();
-        ++c) {
-      const PolyData    &data=*c;
-
-      stream << "M " << coordBuffer.buffer[data.transStart].GetX() << " " << coordBuffer.buffer[data.transStart].GetY();
-      for (size_t i=data.transStart+1; i<=data.transEnd; i++) {
+    for (const auto& data : area.clippings) {
+      stream << "M " << coordBuffer.buffer[data.GetStart()].GetX() << " " << coordBuffer.buffer[data.GetStart()].GetY();
+      for (size_t i=data.GetStart()+1; i<=data.GetEnd(); i++) {
         stream << " L " << coordBuffer.buffer[i].GetX() << " " << coordBuffer.buffer[i].GetY();
       }
       stream << " Z";

diff --git a/libosmscout-map/include/osmscoutmap/MapPainter.h b/libosmscout-map/include/osmscoutmap/MapPainter.h
@@ -167,26 +167,20 @@ namespace osmscout {
       double                   mainSlotWidth;   //!< Width of main slot, used for relative positioning
     };
 
-    struct OSMSCOUT_MAP_API PolyData
-    {
-      size_t                   transStart;      //!< Start of coordinates in transformation buffer
-      size_t                   transEnd;        //!< End of coordinates in transformation buffer (inclusive)
-    };
-
     /**
      * Data structure for holding temporary data about areas
      */
     struct OSMSCOUT_MAP_API AreaData
     {
-      ObjectFileRef            ref;
-      TypeInfoRef              type;
-      const FeatureValueBuffer *buffer;         //!< Features of the line segment, can be NULL in case of border only areas
-      FillStyleRef             fillStyle;       //!< Fill style
-      BorderStyleRef           borderStyle;     //!< Border style
-      GeoBox                   boundingBox;     //!< Bounding box of the area
-      bool                     isOuter;         //!< flag if this area is outer ring of some relation
-      CoordBufferRange         coordRange;      //!< Range of coordinates in transformation buffer
-      std::list<PolyData>      clippings;       //!< Clipping polygons to be used during drawing of this area
+      ObjectFileRef               ref;
+      TypeInfoRef                 type;
+      const FeatureValueBuffer    *buffer;         //!< Features of the line segment, can be NULL in case of border only areas
+      FillStyleRef                fillStyle;       //!< Fill style
+      BorderStyleRef              borderStyle;     //!< Border style
+      GeoBox                      boundingBox;     //!< Bounding box of the area
+      bool                        isOuter;         //!< flag if this area is outer ring of some relation
+      CoordBufferRange            coordRange;      //!< Range of coordinates in transformation buffer
+      std::list<CoordBufferRange> clippings;       //!< Clipping polygons to be used during drawing of this area
     };
 
     using WayPathDataIt=std::list<WayPathData>::iterator;
@@ -316,6 +310,15 @@ namespace osmscout {
                        const MapParameter& parameter,
                        const MapData& data);
 
+    bool PrepareAreaRing(const StyleConfig& styleConfig,
+                         const Projection& projection,
+                         const MapParameter& parameter,
+                         const std::vector<CoordBufferRange>& coordRanges,
+                         const Area& area,
+                         const Area::Ring& ring,
+                         size_t i,
+                         const TypeInfoRef& type);
+
     void PrepareArea(const StyleConfig& styleConfig,
                      const Projection& projection,
                      const MapParameter& parameter,