Added sections, and tweaked the import slide (and column support)

mongo-osm-bigdatacon13.xml

@@ -12,6 +12,7 @@
 
 <slide>slides/map/title.xml</slide>
 
+<slide>slides/mongodb/store-city-agenda.xml</slide>
 <!--
 In this talk I will be explaining the strong points of OpenStreetMap and why
 using GoogleMaps for your websites is generally a bad idea. Contrary to popular
@@ -25,6 +26,7 @@ added to and used in whatever way imaginary.
 <!--
 What is X?
 -->
+<slide>slides/map/store-data-section.xml</slide>
 <slide>slides/map/osm-what.xml</slide>
 
 <slide>slides/map/osm-data.xml</slide>
@@ -35,15 +37,22 @@ What is X?
 <slide>slides/map/osm-tags4.xml</slide>
 
 <slide>slides/map/osm-xapi.xml</slide>
+
+
+<slide>slides/mongodb/osm-import-mongo-section.xml</slide>
 <slide>slides/mongodb/osm-to-mongo-data.xml</slide>
 <slide>slides/mongodb/osm-to-mongo-data2.xml</slide>
 <slide>slides/mongodb/osm-to-mongo-data3.xml</slide>
 <slide>slides/mongodb/osm-to-mongo-data4.xml</slide>
+
+<slide>slides/mongodb/osm-import-4times-section.xml</slide>
 <slide>slides/mongodb/osm-schema1.xml</slide>
 <slide>slides/mongodb/osm-schema2.xml</slide>
 <slide>slides/mongodb/osm-schema4.xml</slide>
 <slide>slides/mongodb/osm-schema3.xml</slide>
 <slide>slides/mongodb/osm-schema-summary.xml</slide>
+
+<slide>slides/mongodb/osm-import-script-section.xml</slide>
 <slide>slides/map/finding-food-import-mongo2.xml</slide>
 <slide>slides/map/import-script2.xml</slide>
 

slides/map/finding-food-import-mongo2.xml

@@ -1,26 +1,57 @@
 <slide>
 <title>Importing data</title>
 
+<table class="columns">
+<tr>
+<td>
+<example><![CDATA[
+<way id="77002328" version="1"
+  changeset="5749014" uid="37137"
+  user="Derick Rethans"
+  timestamp="2010-09-11T11:25:48Z">
+  <nd ref="906743010"/>
+  <nd ref="906743004"/>
+  <nd ref="906742995"/>
+  <nd ref="906742998"/>
+  <nd ref="906743010"/>
+  <tag k="addr:housenumber" v="16" />
+  <tag k="addr:postcode" v="W1J 5HP" />
+  <tag k="addr:street" v="Curzon Street" />
+  <tag k="amenity" v="restaurant" />
+  <tag k="building" v="yes" />
+  <tag k="cuisine" v="lebanese" />
+  <tag k="name" v="Noura" />
+</way>]]>
+</example>
+</td>
+
+<td>
+<blurb class="large">→</blurb>
+</td>
+
+<td>
 <example>{
-	"_id" : "w77002328",
-	"type" : NumberLong(2),
-	"tags" : [
-		"addr:housenumber=16",
-		"addr:postcode=W1J 5HP",
-		"addr:street=Curzon Street",
-		"amenity=restaurant",
-		"building=yes",
-		"contact:phone=+44 20 74951050",
-		"cuisine=lebanese",
-		"name=Noura"
-	],
-	"loc" : [
-		[ -0.1479191, 51.5067744 ],
-		[ -0.1480757, 51.5067491 ],
-		[ -0.1481252, 51.5068679 ],
-		[ -0.1479687, 51.5068932 ],
-		[ -0.1479191, 51.5067744 ]
-	]
+  "_id" : "w77002328",
+  "type" : NumberLong(2),
+  "tags" : [
+    "addr:housenumber=16",
+    "addr:postcode=W1J 5HP",
+    "addr:street=Curzon Street",
+    "amenity=restaurant",
+    "building=yes",
+    "cuisine=lebanese",
+    "name=Noura"
+  ],
+  "loc" : [
+    [ -0.1479191, 51.5067744 ],
+    [ -0.1480757, 51.5067491 ],
+    [ -0.1481252, 51.5068679 ],
+    [ -0.1479687, 51.5068932 ],
+    [ -0.1479191, 51.5067744 ]
+  ]
 }
 </example>
+</td>
+</tr>
+</table>
 </slide>

slides/map/osm-xapi.xml

@@ -1,7 +1,7 @@
 <slide>
 <title>Fetching OSM data</title>
 
-<div effect="fade-out">
+<div effect="fade-out stop">
 <blurb>The whole planet (bad idea as it's 26GB):</blurb>
 <example>http://planet.openstreetmap.org/planet/planet-latest.osm.bz2</example>
 <break/>

slides/mongodb/osm-import-4times-section.xml

@@ -0,0 +1,3 @@
+<slide type="section">
+<blurb>Four different approaches</blurb>
+</slide>

slides/mongodb/osm-import-mongo-section.xml

@@ -0,0 +1,3 @@
+<slide type="section">
+<blurb>Converting the data for import</blurb>
+</slide>

slides/mongodb/osm-import-script-section.xml

@@ -0,0 +1,3 @@
+<slide type="section">
+<blurb>The Import</blurb>
+</slide>

slides/mongodb/store-city-agenda.xml

@@ -0,0 +1,10 @@
+<slide>
+<title>Agenda</title>
+
+<list>
+	<bullet>The Data</bullet>
+	<bullet>Formatting the Data</bullet>
+	<bullet>Four different approches</bullet>
+	<bullet>Importing into MongoDB</bullet>
+</list>
+</slide>

templates/default/table.ezt

@@ -1,6 +1,7 @@
 {use $node, $pres}
+{var $class = get_attribute( $node, 'class' )}
 <div>
-<table>
+<table{if $class} class="{$class}"{/if}>
 {foreach $node->childNodes as $child}
 	{if is_set( $child->tagName )}
 		{include $child->tagName . '.ezt' send $child as $node, $pres}