Sandbox...

.editorconfig

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

.eslintrc.js

@@ -1,13 +1,15 @@
+'use strict';
+
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
-    ecmaVersion: 2017,
+    ecmaVersion: 2018,
     sourceType: 'module',
     ecmaFeatures: {
-      legacyDecorators: true,
+      legacyDecorators: true
     }
   },
-  parser: 'babel-eslint',
   plugins: [
     'ember'
   ],
@@ -53,12 +55,18 @@ module.exports = {
         'lib/*/index.js'
       ],
       parserOptions: {
-        sourceType: 'script',
-        ecmaVersion: 2015
+        sourceType: 'script'
       },
       env: {
         browser: false,
         node: true
+      },
+      plugins: ['node'],
+      extends: ['plugin:node/recommended'],
+      rules: {
+        // this can be removed once the following is fixed
+        // https://github.com/mysticatea/eslint-plugin-node/issues/77
+        'node/no-unpublished-require': 'off'
       }
     }
   ]

.github/workflows/main.yml

@@ -10,18 +10,14 @@ on:
 jobs:
   test:
     name: Tests
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
+    timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 10.x
+          node-version: 12.x
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - name: build
-        env:
-          DISABLE_SOURCE_MAPS: true
-          BROCCOLI_ENV: production
-        run: yarn ember build -prod
       - name: test
         run: yarn test

.gitignore

@@ -27,3 +27,4 @@ development.env
 /package.json.ember-try
 
 .eslintcache
+.yalc

.nvmrc

@@ -0,0 +1 @@
+14.19.3

.template-lintrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended'
+  extends: 'octane'
 };

app/adapters/lot.js

@@ -50,6 +50,7 @@ const LotColumnsSQL = [
 
 export const cartoQueryTemplate = function(id) {
   return `SELECT ${LotColumnsSQL.join(',')},
+    /* id:${id} */
     st_x(st_centroid(the_geom)) as lon, st_y(st_centroid(the_geom)) as lat,
     the_geom, bbl AS id FROM dcp_mappluto WHERE bbl=${id}`;
 };

app/app.js

@@ -1,10 +1,9 @@
 import Application from '@ember/application';
-import Ember from 'ember';
+import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import * as Sentry from '@sentry/browser';
 import * as Integrations from '@sentry/integrations';
 import defineModifier from 'ember-concurrency-retryable/define-modifier';
-import Resolver from './resolver';
 import config from './config/environment';
 
 if (config.environment === 'production' || config.environment === 'staging') {
@@ -20,11 +19,11 @@ if (config.environment === 'production' || config.environment === 'staging') {
 // see: https://github.com/maxfierke/ember-concurrency-retryable/issues/5
 defineModifier();
 
-const App = Application.extend({
-  modulePrefix: config.modulePrefix,
-  podModulePrefix: config.podModulePrefix,
-  Resolver,
-});
+export default class App extends Application {
+  modulePrefix = config.modulePrefix;
+  podModulePrefix = config.podModulePrefix;
+  Resolver = Resolver;
+}
 
 // temporary fix due to importing registerWaiter
 // see: https://github.com/emberjs/ember.js/issues/15670
@@ -41,5 +40,3 @@ if (typeof Ember.Test === 'undefined') {
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 loadInitializers(App, config.modulePrefix);
-
-export default App;

app/components/labs-map.js

@@ -0,0 +1,120 @@
+import mapboxGlMap from 'ember-mapbox-gl/components/mapbox-gl';
+import { assign } from '@ember/polyfills';
+import { get } from '@ember/object';
+import { computed, action } from '@ember/object';
+import layout from '../templates/components/labs-map';
+
+const highlightedCircleFeatureLayer = {
+  id: 'highlighted-feature-circle',
+  source: 'hovered-feature',
+  type: 'circle',
+  paint: {
+    'circle-color': 'rgba(255, 255, 255, 0.65)',
+    'circle-opacity': 1,
+    'circle-radius': {
+      stops: [
+        [16, 3],
+        [17, 6],
+      ],
+    },
+    'circle-stroke-opacity': 0.8,
+    'circle-stroke-color': '#ffff00',
+    'circle-stroke-width': 2.5,
+    'circle-pitch-scale': 'map',
+  },
+};
+
+
+const highlightedLineFeatureLayer = {
+  id: 'highlighted-feature-line',
+  source: 'hovered-feature',
+  type: 'line',
+  paint: {
+    'line-color': '#ffff00',
+    'line-opacity': 0.3,
+    'line-width': {
+      stops: [
+        [8, 4],
+        [11, 7],
+      ],
+    },
+  },
+};
+
+/**
+  Extends `mapbox-gl` component to yield `labs-layers` contextual component. Allows passage of layer-groups.
+
+  ```js
+  // routes/application.js
+  import Route from '@ember/routing/route';
+
+  export default class ApplicationRoute extends Route {
+    async model() {
+      return this.store.query('layer-group');
+    }
+  }
+
+  ```
+  ```handlebars
+  {{!-- routes/application.hbs --}}
+  {{labs-map layerGroups=model}}
+  ```
+
+  @class LabsMapComponent
+  @public
+*/
+export default class LabsMap extends mapboxGlMap {
+  init(...args) {
+    super.init(...args);
+
+    // if layerGroups are passed to the map, use the style from that
+    if (this.get('layerGroups')) {
+      const {
+        meta: {
+          mapboxStyle
+        }
+      } = this.get('layerGroups') || {};
+
+      if (mapboxStyle) assign(get(this, 'initOptions') || {}, { style: mapboxStyle });
+    }
+  }
+
+  layout = layout;
+
+  @computed('hoveredFeature')
+  get hoveredFeatureSource() {
+    const feature = this.get('hoveredFeature');
+
+    return {
+      type: 'geojson',
+      data: feature,
+    };
+  }
+
+  hoveredFeature = null;
+  highlightedCircleFeatureLayer = highlightedCircleFeatureLayer;
+  highlightedLineFeatureLayer = highlightedLineFeatureLayer;
+
+  /**
+    Collection of layer-group models (see: [DS.RecordArray](https://emberjs.com/api/ember-data/release/classes/DS.RecordArray)).
+    Allows optional `meta` object with a `mapboxStyle` property which is passed to the mapbox-gl instance.
+    @argument layerGroups
+    @type DS.RecordArray
+  */
+  layerGroups = null;
+
+  @action
+  handleError(e) {
+    throw e;
+  }
+
+  @action
+  _onLoad(map) {
+    // add source for highlighted-feature
+    map
+      .addSource('hovered-feature', this.get('hoveredFeatureSource'));
+
+    map.addLayer(this.highlightedLineFeatureLayer);
+    map.addLayer(this.highlightedCircleFeatureLayer);
+  }
+}

app/components/mapbox/basic-map.js

@@ -11,12 +11,6 @@ import { registerWaiter, unregisterWaiter } from '@ember/test';
  */
 @tagName('')
 export default class MapboxBasicMapComponent extends Component {
-  init(...args) {
-    super.init(...args);
-
-    registerWaiter(this._mapIsLoaded);
-  }
-
   // used internally for testing. tells the test suite
   // to wait until the map has loaded before proceeding
   @action
@@ -42,6 +36,10 @@ export default class MapboxBasicMapComponent extends Component {
     this.mapLoaded(this.mapInstance);
   }
 
+  didInsertElement() {
+    registerWaiter(this._mapIsLoaded);
+  }
+
   willDestroyElement() {
     unregisterWaiter(this._mapIsLoaded);
   }

app/helpers/run.js

@@ -0,0 +1,7 @@
+import { helper } from '@ember/component/helper';
+
+export function run([object, func, ...args]) {
+  object[func](...args);
+}
+
+export default helper(run);

app/router.js

@@ -2,10 +2,10 @@ import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 import trackPage from './mixins/track-page';
 
-const Router = EmberRouter.extend(trackPage, {
-  location: config.locationType,
-  rootURL: config.rootURL,
-});
+export default class Router extends EmberRouter.extend(trackPage) {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
 
 Router.map(function () {// eslint-disable-line
   // supplementary navigation routes
@@ -39,5 +39,3 @@ Router.map(function () {// eslint-disable-line
   this.route('legacy-redirects', { path: '/zma/:id' });
   this.route('legacy-redirects', { path: '/lot/:boro/:block/:lot' });
 });
-
-export default Router;

app/templates/bookmarks.hbs

@@ -6,8 +6,9 @@
   {{/link-to}}
 </div>
 <div class="content-area cell large-5 large-cell-block-y xxlarge-4 bookmarks">
-  {{#if (await bookmarksSettled)}}
-    {{#each-in (group-by "recordType.content" model) as |key values|}}
+  {{#if (await this.bookmarksSettled)}}
+    {{#each-in (group-by "recordType.content" this.model) as |key values|}}
+
     {{!--
       Should be one of:
         commercial-overlay
@@ -25,6 +26,13 @@
     {{/each-in}}
   {{/if}}
 
+  {{#if (is-rejected this.bookmarksSettled)}}
+    Something went wrong:
+
+    <br/>
+    {{get (promise-rejected-reason this.bookmarksSettled) 'message'}}.
+  {{/if}}
+
   {{#unless model.length}}
     <div class="no-bookmarks">
       <div class="align-self-middle large-text-center">