Skip to content

Commit

Permalink
update sheetsee, add second map
Browse files Browse the repository at this point in the history
  • Loading branch information
Jessica Lord committed Jun 11, 2014
1 parent 808b604 commit c976666
Show file tree
Hide file tree
Showing 10 changed files with 7,399 additions and 7,363 deletions.
2 changes: 1 addition & 1 deletion demos/demo-chart.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name='viewport' content='width=device-width, initial-scale=1.0'/>
<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js'></script>
<link rel='stylesheet' type='text/css' href='http://fonts.googleapis.com/css?family=Libre+Baskerville:400,700,400italic'>
<script type='text/javascript' src='../js/tabletop1.3.3.js'></script>
<script type='text/javascript' src='../js/tabletop1.3.4.js'></script>
<script type='text/javascript' src='../js/sheetsee.js'></script>
<link rel='stylesheet' type='text/css' href='../assets/style.css'>
</head>
Expand Down
21 changes: 18 additions & 3 deletions demos/demo-map.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js'></script>
<link rel='stylesheet' type='text/css' href='http://fonts.googleapis.com/css?family=Libre+Baskerville:400,700,400italic'>
<script type='text/javascript' src='../js/tabletop1.3.3.js'></script>
<script type='text/javascript' src='../js/tabletop1.3.4.js'></script>
<script type='text/javascript' src='../js/sheetsee.js'></script>
<link rel='stylesheet' type='text/css' href='http://api.tiles.mapbox.com/mapbox.js/v1.0.0/mapbox.css' />
<link rel='stylesheet' type='text/css' href='../assets/style.css'>
</head>
<style>
#map {max-width: 800px; height: 500px;}
#map, #shapesmap {max-width: 800px; height: 500px;}
.leaflet-popup-content li {list-style:none;}
.leaflet-popup-content {width: 102px;}
.leaflet-popup-content img {width: 100px;}
Expand All @@ -24,6 +24,9 @@ <h1>All Pennies Map</h1>
<p><em><a href="https://docs.google.com/a/github.com/spreadsheet/ccc?key=0Ao5u1U6KYND7dGN5QngweVJUWE16bTRob0d2a3dCbnc&usp=drive_web#gid=0" target="_blank">spreadsheet</a></em><p>
<div id="map"></div>
<p><em><a onClick='window.location="view-source:" + window.location.href'>View Source</a> // <a href="../docs/sheetsee-maps.html">View Documentation</a></em></p>
<h2>Using linestrings, polygons and multipolygons</h2>
<div id="shapesmap"></div>
<p><em><a onClick='window.location="view-source:" + window.location.href'>View Source</a> // <a href="https://docs.google.com/spreadsheets/d/1jOz6yFY5nIDre5RYtVROYPgIbkgh9lIddsyXo0-79_0/edit?usp=drive_web" target="_blank">View Spreadsheet</a></em></p>

<footer>
<h4 id="getting-started">Getting Started</h4>
Expand Down Expand Up @@ -62,7 +65,9 @@ <h4><a href="http://jlord.github.io/sheetsee.js">Home Page</a></h4>
<script type="text/javascript">
document.addEventListener('DOMContentLoaded', function() {
var URL = "0Ao5u1U6KYND7dGN5QngweVJUWE16bTRob0d2a3dCbnc"
var URL2 = "1jOz6yFY5nIDre5RYtVROYPgIbkgh9lIddsyXo0-79_0"
Tabletop.init( { key: URL, callback: showInfo, simpleSheet: true } )
Tabletop.init( { key: URL2, callback: shapesMap, simpleSheet: true } )
})

function showInfo(data) {
Expand All @@ -73,8 +78,18 @@ <h4><a href="http://jlord.github.io/sheetsee.js">Home Page</a></h4>
var geoJSON = Sheetsee.createGeoJSON(data, optionsJSON)
var map = Sheetsee.loadMap("map")
Sheetsee.addTileLayer(map, 'examples.map-20v6611k')
var markerLayer = Sheetsee.addMarkerLayer(geoJSON, map, template)
Sheetsee.addMarkerLayer(geoJSON, map, template)
}

function shapesMap(data) {
var opts = ['description']
var geojson = Sheetsee.createGeoJSON(data, opts)
var plytemplate = "<h4>{{description}}</h4>"
var shapesmap = Sheetsee.loadMap("shapesmap")
Sheetsee.addTileLayer(shapesmap, 'examples.map-20v6611k')
Sheetsee.addMarkerLayer(geojson, shapesmap, plytemplate)
}

</script>
</body>
</html>
2 changes: 1 addition & 1 deletion demos/demo-table.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name='viewport' content='width=device-width, initial-scale=1.0'/>
<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js'></script>
<link rel='stylesheet' type='text/css' href='http://fonts.googleapis.com/css?family=Libre+Baskerville:400,700,400italic'>
<script type='text/javascript' src='../js/tabletop1.3.3.js'></script>
<script type='text/javascript' src='../js/tabletop1.3.4.js'></script>
<script type='text/javascript' src='../js/sheetsee.js'></script>
<link rel='stylesheet' type='text/css' href='../assets/style.css'>
</head>
Expand Down
2 changes: 1 addition & 1 deletion js/sheetsee.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10910,7 +10910,7 @@ module.exports.addMarkerLayer = function(geoJSON, map, template) {

layer.eachLayer(function(marker) {
var popupContent = ich[template.name](marker.feature.opts)
marker.bindPopup(Content.html(), {closeButton: false})
marker.bindPopup(popupContent.html(), {closeButton: false})
})
return layer
}
Expand Down
2 changes: 1 addition & 1 deletion site/demos/demo-chart.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name='viewport' content='width=device-width, initial-scale=1.0'/>
<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js'></script>
<link rel='stylesheet' type='text/css' href='http://fonts.googleapis.com/css?family=Libre+Baskerville:400,700,400italic'>
<script type='text/javascript' src='../js/tabletop1.3.3.js'></script>
<script type='text/javascript' src='../js/tabletop1.3.4.js'></script>
<script type='text/javascript' src='../js/sheetsee.js'></script>
<link rel='stylesheet' type='text/css' href='../assets/style.css'>
</head>
Expand Down
21 changes: 18 additions & 3 deletions site/demos/demo-map.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js'></script>
<link rel='stylesheet' type='text/css' href='http://fonts.googleapis.com/css?family=Libre+Baskerville:400,700,400italic'>
<script type='text/javascript' src='../js/tabletop1.3.3.js'></script>
<script type='text/javascript' src='../js/tabletop1.3.4.js'></script>
<script type='text/javascript' src='../js/sheetsee.js'></script>
<link rel='stylesheet' type='text/css' href='http://api.tiles.mapbox.com/mapbox.js/v1.0.0/mapbox.css' />
<link rel='stylesheet' type='text/css' href='../assets/style.css'>
</head>
<style>
#map {max-width: 800px; height: 500px;}
#map, #shapesmap {max-width: 800px; height: 500px;}
.leaflet-popup-content li {list-style:none;}
.leaflet-popup-content {width: 102px;}
.leaflet-popup-content img {width: 100px;}
Expand All @@ -24,6 +24,9 @@ <h1>All Pennies Map</h1>
<p><em><a href="https://docs.google.com/a/github.com/spreadsheet/ccc?key=0Ao5u1U6KYND7dGN5QngweVJUWE16bTRob0d2a3dCbnc&usp=drive_web#gid=0" target="_blank">spreadsheet</a></em><p>
<div id="map"></div>
<p><em><a onClick='window.location="view-source:" + window.location.href'>View Source</a> // <a href="../docs/sheetsee-maps.html">View Documentation</a></em></p>
<h2>Using linestrings, polygons and multipolygons</h2>
<div id="shapesmap"></div>
<p><em><a onClick='window.location="view-source:" + window.location.href'>View Source</a> // <a href="https://docs.google.com/spreadsheets/d/1jOz6yFY5nIDre5RYtVROYPgIbkgh9lIddsyXo0-79_0/edit?usp=drive_web" target="_blank">View Spreadsheet</a></em></p>

<footer>
<h4 id="getting-started">Getting Started</h4>
Expand Down Expand Up @@ -62,7 +65,9 @@ <h4><a href="http://jlord.github.io/sheetsee.js">Home Page</a></h4>
<script type="text/javascript">
document.addEventListener('DOMContentLoaded', function() {
var URL = "0Ao5u1U6KYND7dGN5QngweVJUWE16bTRob0d2a3dCbnc"
var URL2 = "1jOz6yFY5nIDre5RYtVROYPgIbkgh9lIddsyXo0-79_0"
Tabletop.init( { key: URL, callback: showInfo, simpleSheet: true } )
Tabletop.init( { key: URL2, callback: shapesMap, simpleSheet: true } )
})

function showInfo(data) {
Expand All @@ -73,8 +78,18 @@ <h4><a href="http://jlord.github.io/sheetsee.js">Home Page</a></h4>
var geoJSON = Sheetsee.createGeoJSON(data, optionsJSON)
var map = Sheetsee.loadMap("map")
Sheetsee.addTileLayer(map, 'examples.map-20v6611k')
var markerLayer = Sheetsee.addMarkerLayer(geoJSON, map, template)
Sheetsee.addMarkerLayer(geoJSON, map, template)
}

function shapesMap(data) {
var opts = ['description']
var geojson = Sheetsee.createGeoJSON(data, opts)
var plytemplate = "<h4>{{description}}</h4>"
var shapesmap = Sheetsee.loadMap("shapesmap")
Sheetsee.addTileLayer(shapesmap, 'examples.map-20v6611k')
Sheetsee.addMarkerLayer(geojson, shapesmap, plytemplate)
}

</script>
</body>
</html>
2 changes: 1 addition & 1 deletion site/demos/demo-table.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name='viewport' content='width=device-width, initial-scale=1.0'/>
<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js'></script>
<link rel='stylesheet' type='text/css' href='http://fonts.googleapis.com/css?family=Libre+Baskerville:400,700,400italic'>
<script type='text/javascript' src='../js/tabletop1.3.3.js'></script>
<script type='text/javascript' src='../js/tabletop1.3.4.js'></script>
<script type='text/javascript' src='../js/sheetsee.js'></script>
<link rel='stylesheet' type='text/css' href='../assets/style.css'>
</head>
Expand Down
1 change: 1 addition & 0 deletions site/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ <h2 id="in-the-wild">In the Wild</h2>
<ul>
<li><a href="http://jlord.github.io/hack-spots">Hack-Spots</a></li>
<li><a href="http://jlord.us/instagram/">Combine with IFTTT</a></li>
<li><a href="http://www.realpython.com/support">Real Python Support Desk</a></li>
</ul>
<p><strong>List your sheetsee project here: file an <a href="http://www.github.com/jlord/sheetsee.js">issue or pull request</a>.</strong></p>
<h1 id="resources-documentation">Resources &amp; Documentation</h1>
Expand Down
Loading

0 comments on commit c976666

Please sign in to comment.