From 1660f610994e42e5f52ec39b2e7d90ba2a4b548d Mon Sep 17 00:00:00 2001
From: David Molineus <david.molineus@netzmacht.de>
Date: Fri, 16 Jan 2015 15:02:20 +0100
Subject: [PATCH] Fixes for supporting latest javascript builder.

---
 .../Leaflet/Mapper/Layer/MarkersLayerMapper.php    |  2 +-
 .../Leaflet/Mapper/Layer/VectorsLayerMapper.php    |  2 +-
 .../Leaflet/Subscriber/EncoderSubscriber.php       | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php
index 7b33545..481c38d 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php
@@ -15,7 +15,7 @@ use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\Mapper\GeoJsonMapper;
 use Netzmacht\Contao\Leaflet\Model\MarkerModel;
 use Netzmacht\Contao\Leaflet\Frontend\RequestUrl;
-use Netzmacht\Javascript\Type\Value\Expression;
+use Netzmacht\JavascriptBuilder\Type\Expression;
 use Netzmacht\LeafletPHP\Definition;
 use Netzmacht\LeafletPHP\Definition\GeoJson\FeatureCollection;
 use Netzmacht\LeafletPHP\Definition\Group\GeoJson;
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php
index b52f225..598c84b 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php
@@ -15,7 +15,7 @@ use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\Mapper\GeoJsonMapper;
 use Netzmacht\Contao\Leaflet\Model\VectorModel;
 use Netzmacht\Contao\Leaflet\Frontend\RequestUrl;
-use Netzmacht\Javascript\Type\Value\Expression;
+use Netzmacht\JavascriptBuilder\Type\Expression;
 use Netzmacht\LeafletPHP\Definition;
 use Netzmacht\LeafletPHP\Definition\GeoJson\ConvertsToGeoJsonFeature;
 use Netzmacht\LeafletPHP\Definition\GeoJson\FeatureCollection;
diff --git a/src/Netzmacht/Contao/Leaflet/Subscriber/EncoderSubscriber.php b/src/Netzmacht/Contao/Leaflet/Subscriber/EncoderSubscriber.php
index c86a2e3..b9f08b7 100644
--- a/src/Netzmacht/Contao/Leaflet/Subscriber/EncoderSubscriber.php
+++ b/src/Netzmacht/Contao/Leaflet/Subscriber/EncoderSubscriber.php
@@ -12,10 +12,10 @@
 namespace Netzmacht\Contao\Leaflet\Subscriber;
 
 use Netzmacht\Contao\Leaflet\Frontend\RequestUrl;
-use Netzmacht\Javascript\Encoder;
-use Netzmacht\Javascript\Event\EncodeValueEvent;
-use Netzmacht\Javascript\Event\GetReferenceEvent;
-use Netzmacht\Javascript\Exception\EncodeValueFailed;
+use Netzmacht\JavascriptBuilder\Encoder;
+use Netzmacht\JavascriptBuilder\Symfony\Event\EncodeValueEvent;
+use Netzmacht\JavascriptBuilder\Symfony\Event\EncodeReferenceEvent;
+use Netzmacht\JavascriptBuilder\Exception\EncodeValueFailed;
 use Netzmacht\LeafletPHP\Definition\Group\GeoJson;
 use Netzmacht\LeafletPHP\Definition\Type\Icon;
 use Netzmacht\LeafletPHP\Plugins\Omnivore\OmnivoreLayer;
@@ -38,18 +38,18 @@ class EncoderSubscriber implements EventSubscriberInterface
                 array('encodeIcons', 1000),
                 array('loadLayer', 100),
             ),
-            GetReferenceEvent::NAME => array('referenceIcon', 100),
+            EncodeReferenceEvent::NAME => array('referenceIcon', 100),
         );
     }
 
     /**
      * Create icon reference to the contao leaflet icon registry.
      *
-     * @param GetReferenceEvent $event The subscribed event.
+     * @param EncodeReferenceEvent $event The subscribed event.
      *
      * @return void
      */
-    public function referenceIcon(GetReferenceEvent $event)
+    public function referenceIcon(EncodeReferenceEvent $event)
     {
         $value = $event->getObject();