From 959fbb505cc196a05ab68636aedbcd3649ba6956 Mon Sep 17 00:00:00 2001
From: Martin Dobias <wonder.sk@gmail.com>
Date: Fri, 18 Sep 2015 22:35:06 +0800
Subject: [PATCH] Remove obstacle flag for pal Layers as it is kept per feature

This code has been funded by Tuscany Region (Italy) - SITA (CIG: 63526840AE) and commissioned to Gis3W s.a.s.
---
 src/core/pal/layer.cpp |  4 ----
 src/core/pal/layer.h   | 14 --------------
 2 files changed, 18 deletions(-)

diff --git a/src/core/pal/layer.cpp b/src/core/pal/layer.cpp
index 61426ad166b..b32954dedd7 100644
--- a/src/core/pal/layer.cpp
+++ b/src/core/pal/layer.cpp
@@ -49,7 +49,6 @@ namespace pal
   Layer::Layer( const QString &lyrName, Arrangement arrangement, double defaultPriority, bool obstacle, bool active, bool toLabel, Pal *pal, bool displayAll )
       : mName( lyrName )
       , pal( pal )
-      , mObstacle( obstacle )
       , mObstacleType( PolygonInterior )
       , mActive( active )
       , mLabelLayer( toLabel )
@@ -157,9 +156,6 @@ namespace pal
 
     f->setAlwaysShow( alwaysShow );
 
-    // feature inherits layer setting for acting as an obstacle
-    f->setIsObstacle( mObstacle );
-
     bool addedFeature = false;
 
     double geom_size = -1, biggest_size = -1;
diff --git a/src/core/pal/layer.h b/src/core/pal/layer.h
index 297bf82bfe1..0a5620e4df6 100644
--- a/src/core/pal/layer.h
+++ b/src/core/pal/layer.h
@@ -139,19 +139,6 @@ namespace pal
        */
       bool labelLayer() const { return mLabelLayer; }
 
-      /** Sets whether features within the layer will act as obstacles for labels.
-       * @note this property is only effective if the layer is active
-       * @param obstacle set to true if features will act as obstacles
-       * @see setActive
-       * @see obstacle
-       */
-      void setObstacle( bool obstacle ) { mObstacle = obstacle; }
-
-      /** Returns whether features within the layer act as obstacles for labels.
-       * @see setObstacle
-       */
-      bool obstacle() const { return mObstacle; }
-
       /** Returns the obstacle type, which controls how features within the layer
        * act as obstacles for labels.
        * @see setObstacleType
@@ -292,7 +279,6 @@ namespace pal
 
       double mDefaultPriority;
 
-      bool mObstacle;
       ObstacleType mObstacleType;
       bool mActive;
       bool mLabelLayer;