Skip to content

Commit

Permalink
Merge pull request #48 from hotosm/feature/map
Browse files Browse the repository at this point in the history
Feature/map
  • Loading branch information
danielfdsilva committed May 26, 2015
2 parents c072846 + 85ef50a commit 7db4237
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
1 change: 1 addition & 0 deletions app/CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
beta.openaerialmap.org
4 changes: 2 additions & 2 deletions app/assets/scripts/components/map.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var resultsStore = require('../stores/results_store');
var utils = require('../utils/utils');
var dsZoom = require('../utils/ds_zoom');

L.mapbox.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6IlhHVkZmaW8ifQ.hAMX5hSW-QnTeRCMAy9A8Q';
L.mapbox.accessToken = 'pk.eyJ1IjoiZGV2c2VlZCIsImEiOiJnUi1mbkVvIn0.018aLhX0Mb0tdtaT2QNe2Q';

var Map = React.createClass({
// Connect to the store "mapStore". Whenever the store calls "this.trigger()"
Expand Down Expand Up @@ -303,7 +303,7 @@ var Map = React.createClass({
var _this = this;
var view = [60.177, 25.148];

this.map = L.mapbox.map(this.getDOMNode(), 'mapbox.light', {
this.map = L.mapbox.map(this.getDOMNode(), 'devseed.m9i692do', {
zoomControl: false,
minZoom : 4,
maxZoom : 18,
Expand Down
11 changes: 11 additions & 0 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,17 @@
<div id="site-canvas"></div>
<script src="//api.tiles.mapbox.com/mapbox.js/plugins/turf/v2.0.0/turf.min.js" type="text/javascript"></script>
<script src="assets/scripts/main.js" type="text/javascript"></script>
<!-- google analytics -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-88478-52', 'auto');
ga('send', 'pageview');

</script>
</body>

</html>

0 comments on commit 7db4237

Please sign in to comment.