From 0987f9aa82fe776c8b3b7d7ff4f31f01810b7f79 Mon Sep 17 00:00:00 2001
From: David Molineus <david.molineus@netzmacht.de>
Date: Fri, 16 Jan 2015 15:01:48 +0100
Subject: [PATCH] Update the services.

---
 module/config/services.php | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/module/config/services.php b/module/config/services.php
index e84481f..c733e57 100644
--- a/module/config/services.php
+++ b/module/config/services.php
@@ -12,16 +12,18 @@
 use Netzmacht\Contao\Leaflet\Boot;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\MapService;
-use Netzmacht\Javascript\Builder;
-use Netzmacht\Javascript\Encoder;
-use Netzmacht\Javascript\Output;
+use Netzmacht\JavascriptBuilder\Builder;
+use Netzmacht\JavascriptBuilder\Encoder;
+use Netzmacht\JavascriptBuilder\Encoder\JavascriptEncoder;
+use Netzmacht\JavascriptBuilder\Encoder\ResultCacheEncoder;
+use Netzmacht\JavascriptBuilder\Output;
+use Netzmacht\JavascriptBuilder\Symfony\EventDispatchingEncoder;
 use Netzmacht\LeafletPHP\Leaflet;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 /** @var \Pimple $container */
 global $container;
 
-
 /*
  * Leaflet map service is a simply api entry to to get the leaflet map from the database.
  */
@@ -65,6 +67,21 @@ $container['leaflet.definition.builder.event-dispatcher'] = $container->share(fu
     return $boot->initializeEventDispatcher($dispatcher);
 });
 
+/*
+ * The javascript encoder factory being used for building the map javascript.
+ */
+$container['leaflet.definition.builder.encoder-factory'] = function ($container) {
+    $dispatcher = $container['leaflet.definition.builder.event-dispatcher'];
+
+    return function (Output $output) use ($dispatcher) {
+        return new ResultCacheEncoder(
+            new EventDispatchingEncoder(
+                new JavascriptEncoder($output, JSON_UNESCAPED_SLASHES),
+                $dispatcher
+            )
+        );
+    };
+};
 
 /*
  * The leaflet builder transforms the definition to javascript.
@@ -73,8 +90,10 @@ $container['leaflet.definition.builder'] = $container->share(function($container
     /** @var Boot $boot */
     $boot       = $container['leaflet.boot'];
     $dispatcher = $container['leaflet.definition.builder.event-dispatcher'];
+    $factory    = $container['leaflet.definition.builder.encoder-factory'];
 
-    $leaflet = new Leaflet($dispatcher, array(), JSON_UNESCAPED_SLASHES);
+    $builder = new Builder($factory);
+    $leaflet = new Leaflet($builder, $dispatcher, array(), JSON_UNESCAPED_SLASHES);
 
     return $boot->initializeLeafletBuilder($leaflet);
 });