From 0438687c3244ecf2f3918341cf3695b9ce6a24aa Mon Sep 17 00:00:00 2001 From: Sebastian Kruse Date: Tue, 24 Jun 2014 21:32:24 +0200 Subject: [PATCH] revert loader.html --- loader.html | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/loader.html b/loader.html index a2ecd7d..11e1dbf 100644 --- a/loader.html +++ b/loader.html @@ -110,32 +110,20 @@ var storytellingDiv = document.getElementById("storytellingContainerDiv"); var storytelling = new WidgetWrapper(); var storytellingWidget = new StorytellingWidget(storytelling,storytellingDiv); - - var lineOverlay = new WidgetWrapper(); - var lineOverlayWidget = new LineOverlayWidget(lineOverlay); - lineOverlayWidget.attachMapWidget(mapWidget); - - /* var kml1 = GeoTemConfig.getKml('data/heine.kml'); datasets.push(new Dataset(GeoTemConfig.loadKml(kml1),'Heinrich Heine')); var kml2 = GeoTemConfig.getKml('data/kafka.kml'); datasets.push(new Dataset(GeoTemConfig.loadKml(kml2),'Franz Kafka')); var kml3 = GeoTemConfig.getKml('data/goethe.kml'); datasets.push(new Dataset(GeoTemConfig.loadKml(kml3),'Johann Wolfgang von Goethe')); - */ - var csv = GeoTemConfig.getCsv('data/MPI_test.csv', function(json){ - datasets.push(new Dataset(GeoTemConfig.loadJson(json),'KWG/MPG')); - - map.display(datasets); - time.display(datasets); - table.display(datasets); - //piechart.display(datasets); - storytelling.display(datasets); - lineOverlay.display(datasets); - lineOverlayWidget.matchColumns(0,"number",0,"parent"); - - dataloaderWidget.loadFromURL(); - }); + + map.display(datasets); + time.display(datasets); + table.display(datasets); + piechart.display(datasets); + storytelling.display(datasets); + + dataloaderWidget.loadFromURL();