Skip to content

Commit

Permalink
address modal and extent-zoom issues
Browse files Browse the repository at this point in the history
  • Loading branch information
gassc committed Sep 18, 2018
1 parent f4032c0 commit d9e545c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion project/static/js/bundle.js.map

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions project/templates/pages/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ <h2>Data and Software</h2>
</ul>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<p>You can check out the source code for this project on <a href="https://github.com/civicmapper/flush-the-toilet">GitHub</a></p>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
Expand Down
12 changes: 7 additions & 5 deletions src/js/app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,8 @@ var messageControl = {
$('#msg-tracing').fadeIn(100);
},
onTraceComplete: function() {
///turn on/off msgs
///turn on/off modals and msgs
$('.modal').modal('hide')
$('#msg-tracing').fadeOut(200);
$('.resultsButtons').fadeIn();

Expand Down Expand Up @@ -797,10 +798,11 @@ function appInit() {
trwwTraceResult.addTo(map);
// adjust the map position and zoom to definitely fit the results
map.fitBounds(
trwwTraceResult.getBounds(), {
paddingTopLeft: L.point(300, 75),
paddingBottomRight: L.point(300, 75)
}
trwwTraceResult.getBounds()
// {
// paddingTopLeft: L.point(300, 75),
// paddingBottomRight: L.point(300, 75)
// }
);
//map.setZoom(map.getZoom() - 2);

Expand Down

0 comments on commit d9e545c

Please sign in to comment.