slides 02

Author: maptastik

slides/02_GitHub-Data/images/gh-pages-1.PNG

@@ -55,20 +55,7 @@
     	background-position: center 1px;
     	background-size:50%;
   	} 
-  	.git-snapshots {
-  		background-color: #2980b9;
-  		background-image: url(./images/snapshots.png);
-    	background-repeat: no-repeat;
-    	background-position: center 1px;
-    	background-size:100%;
-  	}
-  	.git-areas {
-
-  		background-image: url(./images/areas.png);
-    	background-repeat: no-repeat;
-    	background-position: center 1px;
-    	background-size:100%;
-  	}
+  	
   	.octocat {
   		background-color: #fff;
   		background-image: url(./images/octocat-original.png);
@@ -95,6 +82,12 @@
     	background-position: center 1px;
     	background-size:75%;
   	}
+    .gh-pages-1 {
+  		background-image: url(./images/gh-pages-1.PNG);
+    	background-repeat: no-repeat;
+    	background-position: center 1px;
+    	background-size:100%;
+  	}  
     .osm-1 {
   		background-image: url(./images/osm-1.png);
     	background-repeat: no-repeat;
@@ -143,23 +136,24 @@
 	<div>Part 2: Data &amp; GitHub</div>
     <div><h2>2 interrelated aims:</h2>
 		<ol>
-			<li>Create a place to store &amp; access data</li>
+			<li>Find a place to store &amp; access data</li>
 			<li>Get, create, &amp; edit data for the web</li>
 		</ol>
 	</div>
 	<div>Why?</div>
-	<div>We need to know where our data is</div>
+	<div>We need to know where our data is so we can get to it when we need it</div>
 	<div>We need to be able to optimize our data for the web!</div>
 	<div><h2>Goals:</h2>
 		<ul>
 		    <li>Get to know geoJSON</li>
 			<li>Understand the basics of GitHub</li>
-			<li>Be able to contribute to and make changes to files on GitHub</li>
-			<li>Get &amp; prepare data for the web</li>
+			<li>Be able to access and make changes to files on GitHub</li>
+			<li>Identify tools and sources to get &amp; prepare data for the web</li>
 		</ul>
 	</div>
 
 <!--Intro to geoJSON-->
+   <div>What data formats are we working with usually in GIS?</div>
     <div data-bodyclass="gdb purple-text imageTextLight">geodatabase</div>
 	<div data-bodyclass="shapefile purple-text imageTextLight">shapefile</div>
 	<div>OK for GIS</div>
@@ -172,7 +166,7 @@
 <!--This section contains several slides from Lyzi Diamond: http://lyzidiamond.com/learn-geojson/-->
 	<div>What is <em>GeoJSON</em>?</div>
     <div><em>GeoJSON:</em> geographic data format. (Contains spatial information.)</div>
-    <div><em>GeoJSON:</em> extension of JSON, with a specific structure.</div>
+    <div><em>GeoJSON:</em> extension of JSON, with a specific structure.<br><small>(JSON==<em>J</em>ava<em>S</em>cript <em>O</em>bject <em>N</em>otation)</small></div>
     <div>This is what it looks like:</div>
     <div data-bodyclass="geojson-1"></div>
     <div><em>GeoJSON:</em> has room for nested attribute information.</div>
@@ -186,17 +180,19 @@
     <div>And it's pretty easy to edit <em>GeoJSON</em>in your browser with a tool called <a href="http://geojson.io/" target="_blank">geojson.io</a></div>
     <div>(We'll come back to that.)</div>
 
+	<div>We know about a data format (geoJSON)...</div>
+	<div>Where are we going to <em>store</em> it so it's also <em>accessible</em> for webmaps?</div>
+	<div>We'll use <a href="https://github.com/" target="_blank">GitHub</a>!</div>
+	<div>But first...</div>
 	<div>What is git?</div>
 
 	<div><em>git:</em> distributed version control system.</div>
     <div>No central source</div>
     <div><em>git:</em> allows for collaboration without totally screwing everything up.</div>
     <div><em>git:</em> super powerful.</div>
-	<div data-bodyclass="git-snapshots"></div>
-	<div data-bodyclass="git-areas"></div>
     <div data-bodyclass="octocat purple-text imageTextLight">What is <em>GitHub?</em></div>
     <div><em>GitHub:</em> a home for lots and lots of code repositories.</div>
-    <div><em>GitHub:</em> interacted with using <em>git</em>.</div>
+    <div><em>GitHub:</em> helps you interact with <em>git</em>and <em>beyond</em>!</div>
     <div><em>GitHub:</em> provides easy-to-use tools and tutorials for using and learning git to collaborate on and contribute to projects.</div>
     <div class="center-text">git version control<br /><em>+</em><br />storage<br /><em>+</em><br />social</div>
     <div>Why GitHub?</div>
@@ -207,17 +203,18 @@
 			<li>Permalinks</li>
 			<li>Collaboration</li>
 		</ul>
-	</div>    
+	</div>
+    <div>And since we <em>looove</em> maps...</div>    
     <div><em>GitHub:</em> best friends with <em>GeoJSON</em>!</div>
 	<div>Support for geo (especially geoJSON)</div>
 	<div><h2>Support for geo</h2>
 		<ul>
 			<li>Store &amp; access data
-				<ul>
-					<li><a href="http://vimeo.com/106228441">"Small Town GIS Leveraging Github"</a> - Aaron Racicot at FOSS4G2014</li>
+				<ul>	
+			<li>Versioning without SDE!</li>
+			<li><a href="http://vimeo.com/106228441">"Small Town GIS Leveraging Github"</a> - Aaron Racicot at FOSS4G2014</li>
 				</ul>
 			</li>
-			<li>Versioning without SDE!</li>
 			<li>geoJSON rendered as a map</li>
 		</ul>
 	</div>
@@ -231,7 +228,7 @@
 	</div>
 	<div>Let's get started with GitHub!</div>
 	<div data-bodyclass="github-signup imageTextLight">Create GitHub account</div>
-	<div>You're ready to get going</div>
+	<div>You're ready to get going!</div>
 	<div>Interact with Github by 3 means:
 	    <ul>
 	        <li>browser</li>
@@ -264,6 +261,11 @@
 	<div data-bodyclass="fork"></div>
 	<div>Clone repo</div>
 	<div data-bodyclass="clone"></div>
+	<div>Note the <em>branch</em></div>
+	<div data-bodyclass="gh-pages-1"></div>
+	<div>New repos start with a <em>Master</em> branch</div>
+	<div>But we want to be able to use GitHub to show our maps and data within a webpage</div>
+	<div>So we're working with the gh-pages</div>
 	<div>Let's look at some data<br /><br /><a href="https://github.com/maptastik/os-webmap-workshop/blob/gh-pages/data/prepared/toledo_poi.geojson" target="_blank">Toledo POIs</a></div>
 	<div>We can edit the POIs...</div>
 	<div>...or make new geoJSON!</div>