Note: The default ITS GitLab runner is a shared resource and is subject to slowdowns during heavy usage.
You can run your own GitLab runner that is dedicated just to your group if you need to avoid processing delays.

Commit 418506f6 authored by Peter Knoop's avatar Peter Knoop
Browse files

Merge branch 'jra-feature-updates' into 'master'

Jra feature updates

See merge request !4
parents 7048c1eb 9e11a754
......@@ -77,6 +77,10 @@ body {
font-weight: 700;
}
.esri-slider--vertical {
max-height: 85%;
}
.esri-slider--vertical .esri-slider__max {
margin-bottom: 1em !important;
}
......
......@@ -35,13 +35,13 @@
</div>
<div id="akViewDiv" class="esri-widget"></div>
<div id="hiViewDiv" class="esri-widget"></div>
<div id="infoDiv" class="esri-widget">
<!-- <div id="infoDiv" class="esri-widget">
<div id="infoDescription">
Show where the % that believe the global warming is between:
<span id="sliderHighValue">100</span>% and <span id="sliderLowValue">0</span>%.
</div>
<div id="sliderDiv" class"slider"></div>
</div>
</div> -->
</div>
</div>
</body>
......
......@@ -5,7 +5,7 @@ require([
'esri/Map',
'esri/views/MapView',
'esri/layers/FeatureLayer',
'esri/widgets/Slider',
// 'esri/widgets/Slider',
'esri/widgets/Legend',
'esri/widgets/Home',
'esri/renderers/smartMapping/creators/relationship',
......@@ -20,7 +20,7 @@ require([
Map,
MapView,
FeatureLayer,
Slider,
// Slider,
Legend,
Home,
relationshipRendererCreator,
......@@ -108,6 +108,12 @@ require([
// Add username and sign out link.
mainView.ui.add('title-view', 'top-right');
const outlineLayerCountries = new FeatureLayer({
url: 'https://services1.arcgis.com/4ezfu5dIwH83BUNL/arcgis/rest/services/World_Countries_Generalized_5070/FeatureServer/0',
legendEnabled: false,
popupEnabled: false
});
const outlineLayer = new FeatureLayer({
url: 'https://services1.arcgis.com/4ezfu5dIwH83BUNL/arcgis/rest/services/USA_States_Generalized_share_air/FeatureServer/0',
legendEnabled: false,
......@@ -185,7 +191,7 @@ require([
layer.popupTemplate = popupTemplate;
const map = new Map({
layers: [outlineLayer, layer]
layers: [outlineLayerCountries,outlineLayer, layer]
});
// Add map to mainView.
......@@ -531,8 +537,8 @@ require([
}
// add slider widget
mainView.ui.add("infoDiv", {
// Disabled for now. If re-enabled, uncomment the require and function declarations at the top.
/*mainView.ui.add("infoDiv", {
position: "top-right",
});
......@@ -608,7 +614,7 @@ require([
setMainFeatureLayerViewFilter(filterField + " >= " + sliderLowValue + " AND " + filterField + " <= " + sliderHighValue);
setAKFeatureLayerViewFilter(filterField + " >= " + sliderLowValue + " AND " + filterField + " <= " + sliderHighValue);
setHIFeatureLayerViewFilter(filterField + " >= " + sliderLowValue + " AND " + filterField + " <= " + sliderHighValue);
});
});*/
console.log('complete')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment