Merge pull request #1138 from Framstag/issue_1045_4

Issue #1045 - further cleanup
Framstag · Oct 15, 2021 · d03bf24 · d03bf24
2 parents f498f98 + 9bfd01e
commit d03bf24
Show file tree

Hide file tree

Showing 5 changed files with 213 additions and 132 deletions.
diff --git a/libosmscout-map/include/osmscoutmap/MapPainter.h b/libosmscout-map/include/osmscoutmap/MapPainter.h
@@ -295,6 +295,19 @@ namespace osmscout {
                            const Way& way,
                            WayPathData &pathData);
 
+    double CalculateLineWith(const Projection& projection,
+                             const FeatureValueBuffer& buffer,
+                             const LineStyle& lineStyle) const;
+
+    double CalculateLineOffset(const Projection& projection,
+                               const LineStyle& lineStyle,
+                               double lineWidth) const;
+
+    Color CalculateLineColor(const FeatureValueBuffer& buffer,
+                             const LineStyle& lineStyle) const;
+
+    int8_t CalculateLineLayer(const FeatureValueBuffer& buffer) const;
+
     void CalculatePaths(const StyleConfig& styleConfig,
                         const Projection& projection,
                         const MapParameter& parameter,
@@ -643,7 +656,7 @@ namespace osmscout {
 
     //@}
 
-    std::vector<OffsetRel> ParseLaneTurns(const LanesFeatureValue&);
+    std::vector<OffsetRel> ParseLaneTurns(const LanesFeatureValue&) const;
 
   public:
     explicit MapPainter(const StyleConfigRef& styleConfig);

diff --git a/libosmscout-map/include/osmscoutmap/Styles.h b/libosmscout-map/include/osmscoutmap/Styles.h
@@ -60,6 +60,9 @@ namespace osmscout {
 
   extern bool IsLaneOffset(OffsetRel rel);
 
+  extern OffsetRel ParseForwardTurnStringToOffset(const std::string& turn);
+  extern OffsetRel ParseBackwardTurnStringToOffset(const std::string& turn);
+
   /**
    * \ingroup Stylesheet
    *