fix: switch out SGID-based UTA data for UTA's portal

.vscode/settings.json

@@ -4,9 +4,12 @@
     "firebaserc",
     "GOED",
     "hostingchannels",
+    "lightrail",
+    "lyrs",
     "prebuild",
     "QUALTRICS",
     "seiyria",
-    "setversion"
+    "setversion",
+    "stationnam"
   ]
 }

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [2.5.15-2](https://github.com/agrc/locate/compare/v2.5.15-1...v2.5.15-2) (2024-08-26)
+
+
+### Bug Fixes
+
+* workaround incorrect display field for trax stations layer ([3c80f46](https://github.com/agrc/locate/commit/3c80f4608445349414611dff28eebe99237a4539))
+
+## [2.5.15-1](https://github.com/agrc/locate/compare/v2.5.15-0...v2.5.15-1) (2024-08-20)
+
+
+### Styles
+
+* align checkbox icons ([430c5fb](https://github.com/agrc/locate/commit/430c5fb963ec115d5c34e66f328e30739fcace8c))
+
+## [2.5.15-0](https://github.com/agrc/locate/compare/v2.5.14...v2.5.15-0) (2024-08-19)
+
+
+### Bug Fixes
+
+* switch out SGID-based UTA data for UTA's portal ([813be19](https://github.com/agrc/locate/commit/813be19e00ab2df351f30a5cb6ba6105cabf2a28))
+
 ## [2.5.14](https://github.com/agrc/locate/compare/v2.5.13...v2.5.14) (2024-07-15)
 
 

lib/app/App.js

@@ -90,17 +90,17 @@ define([
             };
 
             // lightrail rail (hidden)
-            var hiddenCheckbox = query('.layer input[value="16"]')[0];
+            var hiddenCheckbox = query('.layer input[value="lightrail rail (hidden)"]')[0];
             // Commuter Rail
-            var lrCheckbox = query('.layer input[value="15"]')[0];
+            var lrCheckbox = query('.layer input[value="Commuter Rail"]')[0];
             on(lrCheckbox, 'change', lang.partial(syncCheckbox, hiddenCheckbox));
 
             // commuter rail (hidden)
-            hiddenCheckbox = query('.layer input[value="22"]')[0];
+            hiddenCheckbox = query('.layer input[value="commuter rail (hidden)"]')[0];
             on(lrCheckbox, 'change', lang.partial(syncCheckbox, hiddenCheckbox));
 
             // commuter rail stations (hidden)
-            hiddenCheckbox = query('.layer input[value="21"]')[0];
+            hiddenCheckbox = query('.layer input[value="commuter rail stations (hidden)"]')[0];
             on(lrCheckbox, 'change', lang.partial(syncCheckbox, hiddenCheckbox));
 
             // same thing for airports layers

lib/app/Layer.js

@@ -68,8 +68,14 @@ define([
         //      For dynamic layers could be multiple ids
         //      separated by a comma e.g. 2, 3, 4
         //      For feature layers this is always a single value
+        //      This property is mutually exclusive with url
         layerId: null,
 
+        // url: String
+        //      The url to the feature service
+        //      This property is mutually exclusive with layerId
+        url: null,
+
         // onByDefault: Boolean (optional)
         onByDefault: false,
 
@@ -92,6 +98,17 @@ define([
         //      cachedServiceUrl to the cached map service
         cachedServiceUrl: null,
 
+        checkBoxValue: null,
+
+
+        postMixInProperties: function () {
+            // enforce mutual exclusivity for layerId and url
+            if (this.layerId && this.url) {
+                throw new Error('layerId and url are mutually exclusive');
+            }
+
+            this.checkboxValue = this.layerId || this.name;
+        },
 
         postCreate: function () {
             // summary:
@@ -144,7 +161,7 @@ define([
         onRouterToggleLayers(lyrs) {
             console.log('app/Layer:onRouterToggleLayers', arguments);
 
-            var vis = lyrs.indexOf(this.layerId) !== -1;
+            var vis = lyrs.indexOf(this.checkboxValue) !== -1;
             this.checkbox.checked = vis;
             this.toggleLayer(vis);
         },
@@ -184,14 +201,14 @@ define([
                             this.markerHeight || config.markerSymbolHeight
                         );
                         markerSymbol.setOffset(0, config.markerSymbolHeight / 2);
-                        this.layer = new FeatureLayer(config.urls.mapService + '/' + this.layerId, {
+                        this.layer = new FeatureLayer(this.getUrl(), {
                             outFields: ['*']
                         });
                         this.layer.setRenderer(new SimpleRenderer(markerSymbol));
                         this.layer.on('load', function () {
                             that.layer.on('mouse-over', function (evt) {
                                 var g = evt.graphic;
-                                popup.setContent(g.attributes[that.layer.displayField]);
+                                popup.setContent(g.attributes[that.displayField || that.layer.displayField]);
                                 popup.setTitle('');
                                 popup.show(g.geometry);
                             });
@@ -205,7 +222,7 @@ define([
                     break;
                 case 'polygon':
                     if (!this.layer) {
-                        this.layer = new FeatureLayer(config.urls.mapService + '/' + this.layerId, {
+                        this.layer = new FeatureLayer(this.getUrl(), {
                             outFields: ['*'],
                             opacity: this.defaultOpacity || 0.5
                         });
@@ -252,7 +269,7 @@ define([
                         );
                         lineSymbol.setColor(new Color(this.color));
                         lineSymbol.setWidth(6);
-                        this.layer = new FeatureLayer(config.urls.mapService + '/' + this.layerId, {
+                        this.layer = new FeatureLayer(this.getUrl(), {
                             outFields: ['*']
                         });
                         this.layer.setRenderer(new SimpleRenderer(lineSymbol));
@@ -280,6 +297,9 @@ define([
                     break;
             }
             topic.publish(config.topics.router.updateLayer);
+        },
+        getUrl: function () {
+            return this.url || config.urls.mapService + '/' + this.layerId;
         }
     });
 });

lib/app/config.js

@@ -34,7 +34,8 @@ define([
         apiKey = 'AGRC-FE1B257E901672';
         quadWord = 'wedding-tactic-enrico-yes';
     } else {
-        // localhost
+        // local development
+        domain = 'https://mapserv.dev.utah.gov/';
     }
     var baseUrl = domain + 'arcgis/rest/services/BBEcon/';
 
@@ -233,37 +234,40 @@ define([
                 defaultOpacity: 1,
                 color: '#E09525'
             }, {
+                // if you change name make sure to change the code in
+                // app/App:postCreate as well
                 name: 'Commuter Rail',
                 type: 'feature',
-                layerId: '15',
+                url: 'https://maps.rideuta.com/server/rest/services/Hosted/TRAX_Light_Rail_Stations/FeatureServer/0',
+                displayField: 'stationnam',
                 marker: 'lightrail.svg'
             }, {
                 // this is hidden and linked to Commuter rail above
-                // if you change the layerId make sure to change the code in
+                // if you change name make sure to change the code in
                 // app/App:postCreate as well
                 name: 'lightrail rail (hidden)',
                 type: 'line',
-                layerId: '16',
+                url: 'https://maps.rideuta.com/server/rest/services/Hosted/UTA_TRAX_Light_Rail_Routes/FeatureServer/0',
                 defaultOpacity: 1,
                 hidden: true,
                 color: '#AD6F29'
             }, {
                 // this is hidden and linked to Commuter rail above
-                // if you change the layerId make sure to change the code in
+                // if you change name make sure to change the code in
                 // app/App:postCreate as well
                 name: 'commuter rail (hidden)',
                 type: 'line',
-                layerId: '22',
+                url: 'https://maps.rideuta.com/server/rest/services/Hosted/UTA_FrontRunner_Commuter_Rail_Centerline/FeatureServer/0',
                 defaultOpacity: 1,
                 hidden: true,
                 color: '#AD6F29'
             }, {
                 // this is hidden and linked to Commuter rail above
-                // if you change the layerId make sure to change the code in
+                // if you change name make sure to change the code in
                 // app/App:postCreate as well
                 name: 'commuter rail stations (hidden)',
                 type: 'feature',
-                layerId: '21',
+                url: 'https://maps.rideuta.com/server/rest/services/Hosted/FrontRunnerStations/FeatureServer/0',
                 marker: 'lightrail.svg',
                 hidden: true
             }, {

lib/app/resources/Layer.styl

@@ -7,6 +7,9 @@
         padding-left 4px
         padding-top 2px
         font-size 9px
+    display flex
+    flex-direction row
+    align-items center
 .layer
     // FIBER LEGEND
     div[data-toggle='tooltip']
@@ -16,7 +19,6 @@
     &:last-child
         padding-bottom 5px
     img
-        position absolute
         margin-left 8px
         margin-top 2px
     &.checkbox label,
@@ -47,3 +49,6 @@
             border-bottom-right-radius 2px
     &.in
         opacity 1 !important
+
+div[data-toggle='tooltip'] .glyphicon
+    margin-left 4px

lib/app/templates/Layer.html

@@ -1,6 +1,6 @@
 <li class='checkbox'>
     <input type="checkbox" id='${id}_chbx'
-        data-dojo-attach-point='checkbox' value='${layerId}'>
+        data-dojo-attach-point='checkbox' value='${checkboxValue}'>
     <label for='${id}_chbx' data-dojo-attach-point='label'>
         ${name}
         <div data-dojo-attach-point='tooltip' data-toggle="tooltip" class='hidden'>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "locate",
-  "version": "2.5.14",
+  "version": "2.5.15-2",
   "homepage": "https://github.com/agrc/locate",
   "repository": {
     "type": "git",

scripts/locate_pallet.py

@@ -61,10 +61,6 @@ def build(self, target):
         self.add_crate(('ZoomLocations', self.sgid, self.location))
 
         self.add_crates(['AirportLocations',
-                         'CommuterRailRoutes_UTA',
-                         'CommuterRailStations_UTA',
-                         'LightRailStations_UTA',
-                         'LightRail_UTA',
                          'Railroads',
                          'Roads'],
                         {'source_workspace': self.sgid,