Skip to content
This repository has been archived by the owner on Aug 21, 2023. It is now read-only.

Commit

Permalink
Fixed Issues #77 #78 #79
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathan Krawza committed Jun 21, 2019
1 parent ba66b97 commit 0f48a44
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 36 deletions.
10 changes: 5 additions & 5 deletions build/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@
<span id="geosearchButtonText" class="hidden-xs hidden-sm hidden-md"> CBRS Validation Tool </span>
</button>

<button id="cbrsNav" type="button" class="btn btn-primary navbar-btn pull-right" onclick="ga('send','event','navbar','click','Find CBRS Unit Modal Opened');">
<span class="glyphicon glyphicon-search"></span>
<span id="geosearchButtonText" class="hidden-xs hidden-sm hidden-md"> Find CBRS Unit</span>
</button>

<button id="geosearchNav" type="button" class="btn btn-primary navbar-btn pull-right" onclick="ga('send','event','navbar','click','Find Location Modal Opened');">
<span class="glyphicon glyphicon-search"></span>
<span id="geosearchButtonText" class="hidden-xs hidden-sm hidden-md"> Find Location</span>
</button>

<button id="cbrsNav" type="button" class="btn btn-primary navbar-btn pull-right" onclick="ga('send','event','navbar','click','Find CBRS Unit Modal Opened');">
<span class="glyphicon glyphicon-search"></span>
<span id="geosearchButtonText" class="hidden-xs hidden-sm hidden-md"> Find CBRS Unit</span>
</button>


<button id="aboutNav" class="btn btn-default navbar-btn pull-right" onclick="ga('send','event','navbar','click','About');">
Expand Down
4 changes: 2 additions & 2 deletions build/scripts/combined.js
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@
<span id="geosearchButtonText" class="hidden-xs hidden-sm hidden-md"> CBRS Validation Tool </span>
</button>

<button id="cbrsNav" type="button" class="btn btn-primary navbar-btn pull-right" onclick="ga('send','event','navbar','click','Find CBRS Unit Modal Opened');">
<span class="glyphicon glyphicon-search"></span>
<span id="geosearchButtonText" class="hidden-xs hidden-sm hidden-md"> Find CBRS Unit</span>
</button>

<button id="geosearchNav" type="button" class="btn btn-primary navbar-btn pull-right" onclick="ga('send','event','navbar','click','Find Location Modal Opened');">
<span class="glyphicon glyphicon-search"></span>
<span id="geosearchButtonText" class="hidden-xs hidden-sm hidden-md"> Find Location</span>
</button>

<button id="cbrsNav" type="button" class="btn btn-primary navbar-btn pull-right" onclick="ga('send','event','navbar','click','Find CBRS Unit Modal Opened');">
<span class="glyphicon glyphicon-search"></span>
<span id="geosearchButtonText" class="hidden-xs hidden-sm hidden-md"> Find CBRS Unit</span>
</button>


<button id="aboutNav" class="btn btn-default navbar-btn pull-right" onclick="ga('send','event','navbar','click','About');">
Expand Down
88 changes: 64 additions & 24 deletions src/scripts/core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ require([
on,
array
) {
var hybridTrans = new ArcGISTiledMapServiceLayer('https://services.arcgisonline.com/arcgis/rest/services/Reference/World_Transportation/MapServer')

//bring this line back after experiment////////////////////////////
//allLayers = mapLayers;
Expand Down Expand Up @@ -170,10 +171,10 @@ require([
});*/
// unablet to add infoWindow: popup
map = new Map('mapDiv', {
basemap: 'satellite',
basemap: 'hybrid',
extent: new Extent(-14638882.654811008, 2641706.3772205533, -6821514.898031538, 6403631.161302788, new SpatialReference({ wkid: 3857 })),
});

var home = new HomeButton({
map: map,
extent: new Extent(-14638882.654811008, 2641706.3772205533, -6821514.898031538, 6403631.161302788, new SpatialReference({ wkid: 3857 }))
Expand Down Expand Up @@ -279,6 +280,7 @@ require([
$('#longitude').html(initMapCenter.x.toFixed(3));
//map.setBasemap("topo");
//map.setBasemap("hybrid");
map.addLayer(hybridTrans, 1);
});

//displays map scale on scale change (i.e. zoom level)
Expand Down Expand Up @@ -308,38 +310,78 @@ require([
var nationalMapBasemap = new ArcGISTiledMapServiceLayer('https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer');
var usgsImageryTopo = new ArcGISTiledMapServiceLayer('https://basemap.nationalmap.gov/arcgis/rest/services/USGSImageryTopo/MapServer');


//on clicks to swap basemap. map.removeLayer is required for nat'l map b/c it is not technically a basemap, but a tiled layer.
on(dom.byId('btnStreets'), 'click', function () {
var array = []
map.layerIds.forEach(function(item, index){
if (item != "cbrs" && item != "footprints") {
var layer = map.getLayer(map.layerIds[index])
array.push(layer);
}
})
for (var i=0; i < array.length; i++) {
map.removeLayer(array[i]);
}
map.setBasemap('streets');
map.removeLayer(nationalMapBasemap);
map.removeLayer(usgsTopo);
map.removeLayer(usgsImageryTopo);
});
on(dom.byId('btnHybrid'), 'click', function () {
map.setBasemap('hybrid');
map.removeLayer(nationalMapBasemap);
map.removeLayer(usgsTopo);
map.removeLayer(usgsImageryTopo);
});

on(dom.byId('btnGray'), 'click', function () {
var array = []
map.layerIds.forEach(function(item, index){
if (item != "cbrs" && item != "footprints") {
var layer = map.getLayer(map.layerIds[index])
array.push(layer);
}
})
for (var i=0; i < array.length; i++) {
map.removeLayer(array[i]);
}
map.setBasemap('gray');
map.removeLayer(nationalMapBasemap);
map.removeLayer(usgsTopo);
map.removeLayer(usgsImageryTopo);
});

on(dom.byId('btnUsgsImgTopo'), 'click', function () {
var array = []
map.layerIds.forEach(function(item, index){
if (item != "cbrs" && item != "footprints") {
var layer = map.getLayer(map.layerIds[index])
array.push(layer);
}
})
for (var i=0; i < array.length; i++) {
map.removeLayer(array[i]);
}
map.setBasemap('satellite');
map.addLayer(usgsImageryTopo, 1);
map.removeLayer(nationalMapBasemap);
map.removeLayer(usgsTopo);
map.addLayer(usgsImageryTopo, 0);
});

on(dom.byId('btnUsgsTopo'), 'click', function () {
map.addLayer(usgsTopo, 1);
map.removeLayer(nationalMapBasemap);
map.removeLayer(usgsImageryTopo);
})
var array = []
map.layerIds.forEach(function(item, index){
if (item != "cbrs" && item != "footprints") {
var layer = map.getLayer(map.layerIds[index])
array.push(layer);
}
})
for (var i=0; i < array.length; i++) {
map.removeLayer(array[i]);
}
map.addLayer(usgsTopo, 0);
});
on(dom.byId('btnHybrid'), 'click', function () {
var array = []
map.layerIds.forEach(function(item, index){
if (item != "cbrs" && item != "footprints") {
var layer = map.getLayer(map.layerIds[index])
array.push(layer);
}
})
for (var i=0; i < array.length; i++) {
map.removeLayer(array[i]);
}
map.setBasemap('hybrid');
map.addLayer(hybridTrans, 1)
});

identifyParams = new IdentifyParameters();
identifyParams.tolerance = 0;
Expand Down Expand Up @@ -894,11 +936,9 @@ require([
//saveCoord()
}


map.on('load', function () {
map.infoWindow.set('highlight', false);
map.infoWindow.set('titleInBody', false);
map.addLayer(usgsImageryTopo, 1); //Makes the Naip (USGSImageryTopo) the basemap
$('#disclaimerModal').modal('show');
});

Expand Down Expand Up @@ -1640,7 +1680,7 @@ require([
map.setExtent(graphExtent);

if (!(map._basemap == 'hybrid')) {
document.getElementById('btnSatellite').click();
document.getElementById('btnHybrid').click();
}
}

Expand Down

0 comments on commit 0f48a44

Please sign in to comment.