From b65bcbff9f4cd362f946058c0bf5767f49fdd1f2 Mon Sep 17 00:00:00 2001
From: David Molineus <david.molineus@netzmacht.de>
Date: Thu, 22 Jan 2015 11:59:19 +0100
Subject: [PATCH] Simplify getting of class name.

---
 .../Leaflet/Mapper/Control/LoadingControlMapper.php      | 9 +--------
 .../Contao/Leaflet/Mapper/Layer/GroupLayerMapper.php     | 9 +--------
 .../Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php   | 9 +--------
 .../Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php  | 9 +--------
 .../Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php   | 9 +--------
 5 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/LoadingControlMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Control/LoadingControlMapper.php
index 2eff321..aa4f6fb 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Control/LoadingControlMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Control/LoadingControlMapper.php
@@ -26,13 +26,6 @@ use Netzmacht\LeafletPHP\Plugins\Loading\SpinJsLoadingControl;
  */
 class LoadingControlMapper extends AbstractControlMapper
 {
-    /**
-     * Class of the definition being created.
-     *
-     * @var string
-     */
-    protected static $definitionClass = 'Netzmacht\LeafletPHP\Plugins\Loading\LoadingControl';
-
     /**
      * Layer type.
      *
@@ -49,7 +42,7 @@ class LoadingControlMapper extends AbstractControlMapper
             return 'Netzmacht\LeafletPHP\Plugins\Loading\SpinJsLoadingControl';
         }
 
-        return parent::getClassName($model, $mapper, $bounds);
+        return 'Netzmacht\LeafletPHP\Plugins\Loading\LoadingControl';
     }
 
     /**
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/GroupLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/GroupLayerMapper.php
index f88927d..ad6690f 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/GroupLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/GroupLayerMapper.php
@@ -25,13 +25,6 @@ use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds;
  */
 class GroupLayerMapper extends AbstractLayerMapper
 {
-    /**
-     * Class of the definition being created.
-     *
-     * @var string
-     */
-    protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Group\LayerGroup';
-
     /**
      * Layer type.
      *
@@ -48,7 +41,7 @@ class GroupLayerMapper extends AbstractLayerMapper
             return 'Netzmacht\LeafletPHP\Definition\Group\FeatureGroup';
         }
 
-        return parent::getClassName($model, $mapper, $bounds);
+        return 'Netzmacht\LeafletPHP\Definition\Group\LayerGroup';
     }
 
     /**
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php
index cf7baa4..f9b03de 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php
@@ -30,13 +30,6 @@ use Netzmacht\LeafletPHP\Definition\UI\Marker;
  */
 class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
 {
-    /**
-     * Class of the definition being created.
-     *
-     * @var string
-     */
-    protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Group\GeoJson';
-
     /**
      * Layer type.
      *
@@ -53,7 +46,7 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
             return 'Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson';
         }
 
-        return parent::getClassName($model, $mapper, $bounds);
+        return 'Netzmacht\LeafletPHP\Definition\Group\GeoJson';
     }
 
     /**
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php
index 3e46b8e..9ef38f5 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/ProviderLayerMapper.php
@@ -23,13 +23,6 @@ use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds;
  */
 class ProviderLayerMapper extends AbstractLayerMapper
 {
-    /**
-     * Class of the definition being created.
-     *
-     * @var string
-     */
-    protected static $definitionClass = 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\Provider';
-
     /**
      * Layer type.
      *
@@ -65,7 +58,7 @@ class ProviderLayerMapper extends AbstractLayerMapper
             return $this->providers[$model->tile_provider]['class'];
         }
 
-        return parent::getClassName($model, $mapper, $bounds);
+        return 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\Provider';
     }
 
     /**
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php
index 92c5ef3..cd5ef0f 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php
@@ -34,13 +34,6 @@ use Netzmacht\LeafletPHP\Definition\Vector;
  */
 class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
 {
-    /**
-     * Class of the definition being created.
-     *
-     * @var string
-     */
-    protected static $definitionClass = 'Netzmacht\LeafletPHP\Definition\Group\GeoJson';
-
     /**
      * Layer type.
      *
@@ -57,7 +50,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
             return 'Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson';
         }
 
-        return parent::getClassName($model, $mapper, $bounds);
+        return 'Netzmacht\LeafletPHP\Definition\Group\GeoJson';
     }
 
     /**