Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

moved cali.json file to vendor and did some layout work

  • Loading branch information...
commit 27f3b0dac2e8476874389f9edad37f617ba9c847 1 parent cb35950
@aboutaaron authored
View
3  app/views/counties/index.html.erb
@@ -26,4 +26,5 @@
<% end %>
</table>
</div><!-- /.span8 -->
-</div><!-- /.row -->
+</div><!-- /.row -->
+<a href="https://github.com/aboutaaron/fire-scraper"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>
View
9 app/views/counties/show.html.erb
@@ -33,12 +33,11 @@
// GeoJSON
- var arr = []
+ var county = "<%= @county.name.gsub(//,'') + 'County' %>";
for(var i=0; i < boundaries.features.length; i++){
- arr.push(boundaries.features[i].properties.NAME + " " + boundaries.features[i].properties.LSAD_TRANS + " ")
- //console.log(boundaries.features[i].properties.NAME + " " + boundaries.features[i].properties.LSAD_TRANS + " ");
+ //
}
- console.log(arr)
+ console.log(county)
function style(feature) {
return {
@@ -51,7 +50,7 @@
};
}
- geojson = L.geoJson(boundaries.features, {style:style}).addTo(map);
+ geojson = L.geoJson(boundaries.features[1], {style:style}).addTo(map);
});
</script>
View
3  app/views/layouts/application.html.erb
@@ -12,7 +12,8 @@
<!-- Stamen Maps -->
<%= javascript_include_tag "http://maps.stamen.com/js/tile.stamen.js?v1.1.3" %>
<!-- GeoJSON -->
- <%= javascript_include_tag "https://dl.dropbox.com/u/127788/califire.json" %>
+ <!-- <%= javascript_include_tag "https://dl.dropbox.com/u/127788/califire.json" %> -->
+ <%= javascript_include_tag "cali.json" %>
<%= csrf_meta_tags %>
</head>
<body>
View
0  public/cali.json → vendor/assets/javascripts/cali.json
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.