Handle cases where location is not set

This commit is contained in:
Eric Tran 2020-03-02 20:48:45 +00:00
parent 888e7de16d
commit bfc45dc81d
3 changed files with 31 additions and 28 deletions

View File

@ -150,9 +150,8 @@
<div class="settingsText">Group by Data Type</div> <div class="settingsText">Group by Data Type</div>
</div> </div>
</div> </div>
<div class="settingsOptionContainer"> <div id="range_ring_column" class="settingsOptionContainer">
<div class="infoBlockTitleText">Range Rings</div> <div class="infoBlockTitleText">Range Rings</div>
</div>
<form id="range_ring_form"> <form id="range_ring_form">
<div class="rangeOptions"> <div class="rangeOptions">
<label><span>Ring Count: </span></label> <label><span>Ring Count: </span></label>
@ -170,6 +169,7 @@
<button id="range_rings_button" type="button">Set Range Rings</button> <button id="range_rings_button" type="button">Set Range Rings</button>
</div> </div>
</form> </form>
</div>
</div> </div>
<div id="map_container"> <div id="map_container">

View File

@ -263,6 +263,7 @@ function initialize() {
// Set initial element visibility // Set initial element visibility
$("#show_map_button").hide(); $("#show_map_button").hide();
$("#range_ring_column").hide();
setColumnVisibility(); setColumnVisibility();
// Initialize other controls // Initialize other controls
@ -297,29 +298,6 @@ function initialize() {
$("#altitude_filter_reset_button").click(onResetAltitudeFilter); $("#altitude_filter_reset_button").click(onResetAltitudeFilter);
setRangeRings();
$('#range_rings_button').click(onSetRangeRings);
$("#range_ring_form").validate({
errorPlacement: function(error, element) {
return true;
},
rules: {
ringCount: {
number: true,
min: 0
},
baseRing: {
number: true,
min: 0
},
ringInterval: {
number: true,
min: 0
}
}
});
$('#settingsCog').on('click', function() { $('#settingsCog').on('click', function() {
$('#settings_infoblock').toggle(); $('#settings_infoblock').toggle();
}); });
@ -746,6 +724,31 @@ function initialize_map() {
feature.setStyle(markerStyle); feature.setStyle(markerStyle);
StaticFeatures.push(feature); StaticFeatures.push(feature);
$('#range_ring_column').show();
setRangeRings();
$('#range_rings_button').click(onSetRangeRings);
$("#range_ring_form").validate({
errorPlacement: function(error, element) {
return true;
},
rules: {
ringCount: {
number: true,
min: 0
},
baseRing: {
number: true,
min: 0
},
ringInterval: {
number: true,
min: 0
}
}
});
if (SiteCircles) { if (SiteCircles) {
createSiteCircleFeatures(); createSiteCircleFeatures();
} }

View File

@ -267,12 +267,12 @@ div#loader { z-index: 99; position: absolute; left: 0; top: 0; bottom: 0; right:
.rangeOptions { .rangeOptions {
width: 170px; width: 170px;
padding-bottom: 5px; padding-top: 8px;
text-indent: 10px; text-indent: 10px;
} }
.set_range_rings_button { .set_range_rings_button {
padding-top: 5px; padding-top: 8px;
} }
select.error, textarea.error, input.error { select.error, textarea.error, input.error {