Skip to content
This repository has been archived by the owner on Jun 27, 2024. It is now read-only.

Commit

Permalink
#117 - adds updated timeline photos and new data release url
Browse files Browse the repository at this point in the history
  • Loading branch information
lprivette committed Jul 11, 2023
1 parent cb6c119 commit 7a73301
Show file tree
Hide file tree
Showing 33 changed files with 37 additions and 36 deletions.
Binary file added build/images/timeline/1_2_2023.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/images/timeline/1_2_3_2023.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/images/timeline/1_3_2023.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/images/timeline/2_3_2023.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed build/images/timeline/cycle12.PNG
Binary file not shown.
Binary file removed build/images/timeline/cycle13.PNG
Binary file not shown.
Binary file removed build/images/timeline/webmap.jpg
Binary file not shown.
Binary file added build/images/webmap_2023.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 21 additions & 20 deletions build/index.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/scripts/combined.js

Large diffs are not rendered by default.

Binary file removed src/images/timeline/1_2_2021.png
Binary file not shown.
Binary file added src/images/timeline/1_2_2023.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/timeline/1_2_3_2021.png
Binary file not shown.
Binary file added src/images/timeline/1_2_3_2023.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/timeline/1_3_2021.png
Binary file not shown.
Binary file added src/images/timeline/1_3_2023.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/timeline/2_3_2021.png
Binary file not shown.
Binary file added src/images/timeline/2_3_2023.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/timeline/cycle-1-2-version2.png
Binary file not shown.
Binary file removed src/images/timeline/cycle-1-2-version3.png
Binary file not shown.
Binary file removed src/images/timeline/cycle-1-2.png
Binary file not shown.
Binary file removed src/images/timeline/cycle-1-3-version2.png
Binary file not shown.
Binary file removed src/images/timeline/cycle-1-3-version3.png
Binary file not shown.
Binary file removed src/images/timeline/cycle-1-3.png
Binary file not shown.
Binary file removed src/images/timeline/cycle-2-3-version2.png
Binary file not shown.
Binary file removed src/images/timeline/cycle-2-3-version3.png
Binary file not shown.
Binary file removed src/images/timeline/cycle-2-3.png
Binary file not shown.
Binary file removed src/images/timeline/cycle-full-version2.png
Diff not rendered.
Binary file removed src/images/timeline/cycle-full-version3.png
Diff not rendered.
Binary file removed src/images/timeline/cycle-full.png
Diff not rendered.
6 changes: 3 additions & 3 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ <h4 style="margin-bottom: 15px; font-weight: 600;">Features of the Mapper</h4>

<div class="faq-header" id="faq10header">10. Are the data available for download? <div id="angle10" style="display: -webkit-inline-box;"><i class="fa fa-angle-right"></i></div></div>
<div class="faq-body" id="faq10body">
The data used to make these maps are available for download here: <a target="_blank" href="https://www.sciencebase.gov/catalog/item/628e0f4ed34ef70cdba3f98d">https://www.sciencebase.gov/catalog/item/628e0f4ed34ef70cdba3f98d</a>
The data used to make these maps are available for download here: <a target="_blank" href="https://www.sciencebase.gov/catalog/item/6476425ed34e4e58932da21f">https://www.sciencebase.gov/catalog/item/6476425ed34e4e58932da21f</a>
</div>

<div class="faq-header" id="faq11header">11. What are groundwater networks and what do they represent? <div id="angle11" style="display: -webkit-inline-box;"><i class="fa fa-angle-right"></i></div></div>
Expand Down Expand Up @@ -909,7 +909,7 @@ <h4 class="modal-title">Download the Data</h4>
<div>
<h3>Download the Data</h3>
<p>
<a target="_blank" href="https://www.sciencebase.gov/catalog/item/628e0f4ed34ef70cdba3f98d"><button type="button" class="btn btn-secondary dataButton">Data Release&nbsp;&nbsp;<span class="fa fa-download"></span></button></a>
<a target="_blank" href="https://www.sciencebase.gov/catalog/item/6476425ed34e4e58932da21f"><button type="button" class="btn btn-secondary dataButton">Data Release&nbsp;&nbsp;<span class="fa fa-download"></span></button></a>
<br>
</p>
</div>
Expand Down Expand Up @@ -1425,7 +1425,7 @@ <h4 class="panel-title">
</div>
<div>
<label>Timeline (years)</label>
<img alt="USGS logo" height="100%" width="100%" src="images/timeline/2-3_2022.png" id="selectedTrendImage">
<img alt="USGS logo" height="100%" width="100%" src="images/timeline/2_3_2023.png" id="selectedTrendImage">
</div>
</div>

Expand Down
10 changes: 5 additions & 5 deletions src/scripts/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -1427,7 +1427,7 @@ require([
identifyParams2.height = map.height;
identifyParams2.geometry = evt.mapPoint;

var identifyTask2 = new esri.tasks.IdentifyTask("https://gis1.wim.usgs.gov/server/rest/services/NAWQA/networksdata/MapServer");
var identifyTask2 = new esri.tasks.IdentifyTask("https://gis1.wim.usgs.gov/server/rest/services/NAWQA/2023_networksdata/MapServer");

if (map.getLayer("principalAquifers").visible) {
var deferredResult2 = identifyTask2.execute(identifyParams);
Expand Down Expand Up @@ -2462,25 +2462,25 @@ require([
});

$("#cycle12input").click(function () {
document.getElementById('selectedTrendImage').src = "images/timeline/1-2_2022.png";
document.getElementById('selectedTrendImage').src = "images/timeline/1_2_2023.png";
$("#siteInfoClose").click();
$("#networkInfoClose").click();
});

$("#cycle13input").click(function () {
document.getElementById('selectedTrendImage').src = "images/timeline/1-3_2022.png";
document.getElementById('selectedTrendImage').src = "images/timeline/1_3_2023.png";
$("#siteInfoClose").click();
$("#networkInfoClose").click();
});

$("#cycle23input").click(function () {
document.getElementById('selectedTrendImage').src = "images/timeline/2-3_2022.png";
document.getElementById('selectedTrendImage').src = "images/timeline/2_3_2023.png";
$("#siteInfoClose").click();
$("#networkInfoClose").click();
});

$("#cycle123input").click(function () {
document.getElementById('selectedTrendImage').src = "images/timeline/1-2-3_2022.png";
document.getElementById('selectedTrendImage').src = "images/timeline/1_2_3_2023.png";
$("#siteInfoClose").click();
$("#networkInfoClose").click();
});
Expand Down
12 changes: 6 additions & 6 deletions src/scripts/layers_dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var allLayers;
var renderer;

var constituentDropURl = 'https://gis1.wim.usgs.gov/server/rest/services/NAWQA/networksdata/MapServer/6/query?where=OBJECTID+%3E+0&text=&objectIds=&time=&geometry=&geometryType=esriGeometryEnvelope&inSR=&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=*&returnGeometry=true&maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=ConstituentType,DisplayName&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&f=json';
var constituentDropURl = 'https://gis1.wim.usgs.gov/server/rest/services/NAWQA/2023_networksdata/MapServer/6/query?where=OBJECTID+%3E+0&text=&objectIds=&time=&geometry=&geometryType=esriGeometryEnvelope&inSR=&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=*&returnGeometry=true&maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=ConstituentType,DisplayName&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&f=json';
//PROD == NAWQA/decadal

require([
Expand Down Expand Up @@ -148,7 +148,7 @@ require([
"includeInLayerList": false,
"layers": {
"All Networks": {
"url": "https://gis1.wim.usgs.gov/server/rest/services/NAWQA/networksdata/MapServer/0", //PROD == NAWQA/decadal
"url": "https://gis1.wim.usgs.gov/server/rest/services/NAWQA/2023_networksdata/MapServer/0", //PROD == NAWQA/decadal
"options": {
"id": "allNetworks",
/* "visibleLayers": [0], */
Expand All @@ -166,7 +166,7 @@ require([
"renderer": renderer3
}
}, "Network Boundaries" : {
"url": "https://gis1.wim.usgs.gov/server/rest/services/NAWQA/2022_networkpolys/MapServer",
"url": "https://gis1.wim.usgs.gov/server/rest/services/NAWQA/2023_networkpolys/MapServer",
"visibleLayers": [1],
"options": {
"id": "networkBoundaries",
Expand All @@ -182,7 +182,7 @@ require([
}
},
"Magnitude of change": {
"url": "https://gis1.wim.usgs.gov/server/rest/services/NAWQA/networksdata/MapServer/0",
"url": "https://gis1.wim.usgs.gov/server/rest/services/NAWQA/2023_networksdata/MapServer/0",
"options": {
"id": "networkLocations",
/* "visibleLayers": [0], */
Expand Down Expand Up @@ -216,7 +216,7 @@ require([
"includeLegend" : true
}
}, "Trend sites" : {
"url": "https://gis1.wim.usgs.gov/server/rest/services/NAWQA/trend_sites/MapServer",
"url": "https://gis1.wim.usgs.gov/server/rest/services/NAWQA/2023_trend_sites/MapServer",
"options": {
"id": "trendSites",
"opacity": 1.0,
Expand Down Expand Up @@ -245,7 +245,7 @@ require([
"moreinfo": "https://water.usgs.gov/ogw/aquifer/principal/aquifrp025.xml",
}
}, "Glacial Aquifer" : {
"url": "https://gis1.wim.usgs.gov/server/rest/services/NAWQA/networksdata/MapServer", //PROD == NAWQA/decadal
"url": "https://gis1.wim.usgs.gov/server/rest/services/NAWQA/2023_networksdata/MapServer", //PROD == NAWQA/decadal
"visibleLayers": [2],
"options": {
"id": "glacialAquifer",
Expand Down

0 comments on commit 7a73301

Please sign in to comment.