Skip to content

Commit

Permalink
Merge pull request #180 from USGS-WiM/staging
Browse files Browse the repository at this point in the history 
incorporate new fws managed lands layers and upgrade arcgis js api to latest version 3.32
  • Loading branch information
@njestes
njestes authored Jun 30, 2020
2 parents 8b4d197 + a18e1ab commit c19b3aa
Show file tree
Hide file tree
Showing 5 changed files with 103 additions and 22 deletions.
6 changes: 3 additions & 3 deletions build/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@

<link rel="stylesheet" href="styles/vendor.css">
<!-- CSS for the mapping components -->
<link rel="stylesheet" href="https://js.arcgis.com/3.14/dijit/themes/claro/claro.css">
<link rel="stylesheet" href="https://js.arcgis.com/3.14/esri/css/esri.css">
<link rel="stylesheet" href="https://js.arcgis.com/3.32/dijit/themes/claro/claro.css">
<link rel="stylesheet" href="https://js.arcgis.com/3.32/esri/css/esri.css">

<link rel="stylesheet" href="styles/main.css">
<link rel="stylesheet" href="styles/base.css">
<link rel="shortcut icon" href="/favicon.ico">

<script src="scripts/vendor.js"></script>

<script src="https://js.arcgis.com/3.14/"></script>
<script src="https://js.arcgis.com/3.32/"></script>


<script src="scripts/combined.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions build/scripts/combined.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<!-- endbower -->
<!-- endbuild -->
<!-- CSS for the mapping components -->
<link rel="stylesheet" href="https://js.arcgis.com/3.14/dijit/themes/claro/claro.css">
<link rel="stylesheet" href="https://js.arcgis.com/3.14/esri/css/esri.css">
<link rel="stylesheet" href="https://js.arcgis.com/3.32/dijit/themes/claro/claro.css">
<link rel="stylesheet" href="https://js.arcgis.com/3.32/esri/css/esri.css">

<!-- build:css styles/main.css -->
<link rel="stylesheet" href="styles/main.css">
Expand All @@ -39,7 +39,7 @@
<!-- endbower -->
<!-- endbuild -->

<script src="https://js.arcgis.com/3.14/"></script>
<script src="https://js.arcgis.com/3.32/"></script>


<!-- build:js scripts/combined.js -->
Expand Down
25 changes: 24 additions & 1 deletion src/scripts/core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ require([
map = new Map('mapDiv', {
basemap: 'hybrid',
extent: new Extent(-14638882.654811008, 2641706.3772205533, -6821514.898031538, 6403631.161302788, new SpatialReference({ wkid:3857 })),
fitExtent: true
fitExtent: true,
showLabels: true
});

var home = new HomeButton({
Expand Down Expand Up @@ -1211,6 +1212,7 @@ require([
});

require([
'esri/Color',
'esri/InfoTemplate',
'esri/tasks/locator',
'esri/tasks/query',
Expand All @@ -1221,8 +1223,10 @@ require([
'esri/layers/ArcGISDynamicMapServiceLayer',
'esri/layers/ArcGISImageServiceLayer',
'esri/layers/FeatureLayer',
'esri/layers/LabelClass',
'esri/layers/WMSLayer',
'esri/layers/WMSLayerInfo',
'esri/symbols/TextSymbol',
'esri/tasks/GeometryService',
'dijit/form/CheckBox',
'dijit/form/RadioButton',
Expand All @@ -1233,6 +1237,7 @@ require([
'dojo/dom-style',
'dojo/on'
], function(
Color,
InfoTemplate,
Locator,
Query,
Expand All @@ -1243,8 +1248,10 @@ require([
ArcGISDynamicMapServiceLayer,
ArcGISImageServiceLayer,
FeatureLayer,
LabelClass,
WMSLayer,
WMSLayerInfo,
TextSymbol,
GeometryService,
CheckBox,
RadioButton,
Expand Down Expand Up @@ -1357,6 +1364,22 @@ require([
document.getElementsByTagName('head')[0].appendChild(style);
}

if (layer.id == 'fwsTracts') {
var fwsTractsColor = new Color("#FFF");
var fwsTractsLabel = new TextSymbol().setColor(fwsTractsColor);
fwsTractsLabel.font.setSize("10pt");
fwsTractsLabel.font.setFamily("arial");

var json = {
"labelExpressionInfo": {"value": "{ORGNAME}"}
};

var fwsTractsLabelClass = new LabelClass(json);
fwsTractsLabelClass.symbol = fwsTractsLabel;
fwsTractsLabelClass.minScale = 175000;
layer.setLabelingInfo([ fwsTractsLabelClass ]);
}

if (layer.id == 'aoi') {
on(layer, 'load', function(evt) {
on(layer, 'click', function (evt) {
Expand Down
84 changes: 71 additions & 13 deletions src/scripts/layers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,34 @@
* Created by bdraper on 4/27/2015.
*/
var allLayers;
var renderer;
var tractRenderer;
var centroidRenderer;

require([
'esri/Color',
'esri/InfoTemplate',
'esri/renderers/UniqueValueRenderer',
'esri/symbols/PictureMarkerSymbol',
'esri/layers/LabelClass',
'esri/renderers/SimpleRenderer',
'esri/symbols/SimpleFillSymbol',
'esri/symbols/SimpleLineSymbol',
'esri/symbols/SimpleMarkerSymbol',
'esri/symbols/TextSymbol',
'dojo/domReady!'
], function(
Color,
InfoTemplate,
UniqueValueRenderer,
PictureMarkerSymbol
LabelClass,
SimpleRenderer,
SimpleFillSymbol,
SimpleLineSymbol,
SimpleMarkerSymbol,
TextSymbol
) {
var centroidSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.STYLE_CIRCLE, 5, new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID, new Color([255,255,255]),0.5), new Color([0,0,0,1]));
centroidRenderer = new SimpleRenderer(centroidSymbol);

var defaultSymbol = new PictureMarkerSymbol("./images/grn-pushpin.png", 45, 45);

renderer = new UniqueValueRenderer(defaultSymbol);
var tractSymbol = new SimpleFillSymbol(SimpleFillSymbol.STYLE_SOLID, new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID, new Color([0,0,0]),0.5), new Color([115, 178, 115,0.75]));
tractRenderer = new SimpleRenderer(tractSymbol);

var template = new InfoTemplate("${NAME}",
"Type: ${TYPE}<br/>" +
Expand All @@ -26,7 +38,7 @@ require([
"Water Summary Report: <a target='_blank' href='${WATER_SUMMARY_REPORT}'>click here</a><br/>" +
"Wildlife Action Plan: <a target='_blank' href='${STATE_ACTION_PLAN}'>click here</a><br/>"
)

allLayers = [
{
'groupHeading': 'ESRI dynamic map services',
Expand Down Expand Up @@ -216,7 +228,7 @@ require([
'opacity': 1.00,
'visible': false,
'outFields': ["*"],
'infoTemplate': template
'infoTemplate': template,
},
'wimOptions': {
'type': 'layer',
Expand All @@ -228,9 +240,54 @@ require([
//'renderer': renderer
}
},
'FWS Managed Lands' : {
'FWS Managed Lands Centroids' : { //CENTROIDS
'url': 'https://services.arcgis.com/QVENGdaPbd4LUkLV/ArcGIS/rest/services/FWSCentroids/FeatureServer/0',
'options': {
'id': 'fwsCentroids',
'opacity': 0.75,
'maxScale': 18000000,
'visible': false
},
'wimOptions': {
'type': 'layer',
'layerType': 'agisFeature',
'includeInLayerList': false,
'zoomScale': 144448,
'hasOpacitySlider': true,
'moreinfo': 'http://www.fws.gov/gis/data/CadastralDB/index_cadastral.html',
'includeLegend' : true,
'esriLegendLabel': false,
'renderer': centroidRenderer
}
},
'FWS Managed Lands' : {
'url': 'https://services.arcgis.com/QVENGdaPbd4LUkLV/arcgis/rest/services/National_Wildlife_Refuge_System_Boundaries/FeatureServer/0',
//'url': 'https://services.arcgis.com/QVENGdaPbd4LUkLV/arcgis/rest/services/FWSApproved_Authoritative/FeatureServer/1',
//'url': 'https://services.arcgis.com/QVENGdaPbd4LUkLV/ArcGIS/rest/services/National_Wildlife_Refuge_System_Boundaries/FeatureServer/0',
'options': {
'id': 'fwsTracts',
'opacity': 0.75,
'minScale': 18000000,
'visible': false,
'outFields': ["*"],
'showLabels': true
},
'wimOptions': {
'type': 'layer',
'layerType': 'agisFeature',
'includeInLayerList': true,
'zoomScale': 144448,
'hasOpacitySlider': true,
'moreinfo': 'https://fws.maps.arcgis.com/home/item.html?id=745ed874c1394da3a9aae50267c9e049',
'otherLayersToggled': ['fwsCentroids'],
'includeLegend' : true,
'esriLegendLabel': false,
'renderer': tractRenderer
}
},/*
'FWS Managed Lands' : { //labels turn on at 1:2,311,162
'url': 'https://gis.fws.gov/ArcGIS/rest/services/FWS_Refuge_Boundaries/MapServer',
'visibleLayers': [0,1,3],
'visibleLayers': [1],
'options': {
'id': 'fwsRefuges',
'opacity': 0.75,
Expand All @@ -243,10 +300,11 @@ require([
'zoomScale': 144448,
'hasOpacitySlider': true,
'moreinfo': 'http://www.fws.gov/gis/data/CadastralDB/index_cadastral.html',
'otherLayersToggled': ['fwsCentroids', 'fwsTracts'],
'includeLegend' : true,
'esriLegendLabel': false
}
},
},*/
'Historic Wetland Data' : {
'url': 'https://fwsprimary.wim.usgs.gov/server/rest/services/Historic_Wetlands/MapServer',
'visibleLayers': [0,1],
Expand Down

0 comments on commit c19b3aa

Please sign in to comment.