Skip to content

Commit

Permalink
Switch to https for urls in demo configurations.
Browse files Browse the repository at this point in the history
works in both http and https
  • Loading branch information
tmcgee committed Apr 14, 2016
1 parent a98e30f commit 26733f9
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 11 deletions.
4 changes: 2 additions & 2 deletions config/queryStringSearch.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define([
'dojo/io-query'
], function (ioQuery) {
'use strict';

var uri = window.location.href;
var qs = uri.substring(uri.indexOf('?') + 1, uri.length);
var qsObj = ioQuery.queryToObject(qs);
Expand Down Expand Up @@ -67,7 +67,7 @@ define([
topicID: 'censusQuery',
queryOptions: {
queryParameters: {
url: 'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Demographics/ESRI_Census_USA/MapServer/4',
url: 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Demographics/ESRI_Census_USA/MapServer/4',
where: 'FIPS = \'' + fips + '\''
},
idProperty: 'ObjectID'
Expand Down
15 changes: 11 additions & 4 deletions config/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ define([
'esri/tasks/GeometryService',
'esri/layers/ImageParameters'
], function (esriConfig, GeometryService, ImageParameters) {
'use strict';

esriConfig.defaults.geometryService = new GeometryService('http://tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer');
esriConfig.defaults.geometryService = new GeometryService('https://tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer');

var imageParameters = new ImageParameters();
imageParameters.format = 'png32';
Expand Down Expand Up @@ -44,7 +43,7 @@ define([
operationalLayers: [
{
type: 'dynamic',
url: 'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/PublicSafety/PublicSafetyOperationalLayers/MapServer',
url: 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/PublicSafety/PublicSafetyOperationalLayers/MapServer',
title: 'Louisville Public Safety',
options: {
id: 'louisvillePubSafety',
Expand All @@ -58,7 +57,7 @@ define([
},
{
type: 'dynamic',
url: 'http://sampleserver6.arcgisonline.com/arcgis/rest/services/DamageAssessment/MapServer',
url: 'https://sampleserver6.arcgisonline.com/arcgis/rest/services/DamageAssessment/MapServer',
title: 'Damage Assessment',
options: {
id: 'DamageAssessment',
Expand Down Expand Up @@ -101,6 +100,14 @@ define([
position: 0,
options: 'config/searchWidget'
},
queryBuilder: {
include: true,
id: 'queryBuilder',
type: 'floating',
path: 'widgets/QueryBuilder',
title: 'Query Builder',
options: {}
},
attributesTable: {
include: true,
id: 'attributesContainer',
Expand Down
3 changes: 1 addition & 2 deletions config/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ define({
topicID: 'censusQuery',
queryOptions: {
queryParameters: {
url: 'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Demographics/ESRI_Census_USA/MapServer/4',
url: 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Demographics/ESRI_Census_USA/MapServer/4',
maxAllowableOffset: 100,
where: 'STATE_FIPS = \'06\' OR STATE_FIPS = \'08\''
}
Expand All @@ -87,7 +87,6 @@ define({
//
// filename: 'my_results'
filename: function () {
'use strict';
var date = new Date();
return 'export_results_' + date.toLocaleDateString();
}
Expand Down
4 changes: 2 additions & 2 deletions config/zoomToFeature-multiple.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ define({
i18n: {
selectFeature: 'California County'
},
url: 'http://sampleserver6.arcgisonline.com/arcgis/rest/services/Census/MapServer/2',
url: 'https://sampleserver6.arcgisonline.com/arcgis/rest/services/Census/MapServer/2',
field: 'NAME',
where: 'STATE_FIPS = \'06\''
}
Expand All @@ -71,7 +71,7 @@ define({
selectFeature: 'Kansas County'
},
style: 'margin-top:50px;',
url: 'http://sampleserver6.arcgisonline.com/arcgis/rest/services/Census/MapServer/2',
url: 'https://sampleserver6.arcgisonline.com/arcgis/rest/services/Census/MapServer/2',
field: 'NAME',
where: 'STATE_FIPS = \'20\''
}
Expand Down
2 changes: 1 addition & 1 deletion config/zoomToFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ define({
i18n: {
selectFeature: 'Select A County'
},
url: 'http://sampleserver6.arcgisonline.com/arcgis/rest/services/Census/MapServer/2',
url: 'https://sampleserver6.arcgisonline.com/arcgis/rest/services/Census/MapServer/2',
field: 'NAME',
where: 'STATE_FIPS = \'06\''
}
Expand Down

0 comments on commit 26733f9

Please sign in to comment.