Merge pull request #1217 from NYCPlanning/develop

Housing opportunity

Author: TangoYankee

app/components/layer-record-views/tax-lot/intersecting-layers-views.js

@@ -5,7 +5,6 @@ export default class IntersectingLayersViews extends Component {
 
   tables = [
     'inclusionary_housing',
-    'transitzones',
     'fresh_zones',
     'waterfront_access_plan',
     'coastal_zone_boundary',
@@ -15,6 +14,7 @@ export default class IntersectingLayersViews extends Component {
     'mandatory_inclusionary_housing',
     'e_designations',
     'upland_waterfront_areas',
+    'transitzones',
     'appendixj_designated_mdistricts',
   ];
 }

app/templates/components/layer-palette.hbs

@@ -142,9 +142,17 @@
       @layerGroup={{this.layerGroups.inclusionary-housing}}
       @activeTooltip={{zoom-dependent-label this.layerGroups.inclusionary-housing this.zoomWarningLabel this.mainMap.zoom}}/>
     <container.layer-group-toggle
-      data-test-toggle-transit-zones
-      @layerGroup={{this.layerGroups.transit-zones}}
-      @activeTooltip={{zoom-dependent-label this.layerGroups.transit-zones this.zoomWarningLabel this.mainMap.zoom}}/>
+      data-test-toggle-cho-greater-transit-zone
+      @layerGroup={{this.layerGroups.cho-greater-transit-zone}}
+      @activeTooltip={{zoom-dependent-label this.layerGroups.cho-greater-transit-zone this.zoomWarningLabel this.mainMap.zoom}}>
+      <LabsUi::LegendItems @items={{this.layerGroups.cho-greater-transit-zone.legend.items}} />
+    </container.layer-group-toggle>
+    <container.layer-group-toggle
+      data-test-toggle-cho-transit-zones
+      @layerGroup={{this.layerGroups.cho-transit-zones}}
+      @activeTooltip={{zoom-dependent-label this.layerGroups.cho-transit-zones this.zoomWarningLabel this.mainMap.zoom}}>
+      <LabsUi::LegendItems @items={{this.layerGroups.cho-transit-zones.legend.items}} />
+    </container.layer-group-toggle>
     <container.layer-group-toggle
       data-test-toggle-fresh
       @layerGroup={{this.layerGroups.fresh}}
@@ -214,6 +222,10 @@
       @activeTooltip={{zoom-dependent-label this.layerGroups.e-designations this.zoomWarningLabel this.mainMap.zoom}}>
       <LabsUi::LegendItem @item={{this.layerGroups.e-designations.legend}} />
     </container.layer-group-toggle>
+    <container.layer-group-toggle
+      data-test-toggle-transit-zones
+      @layerGroup={{this.layerGroups.transit-zones}}
+      @activeTooltip={{zoom-dependent-label this.layerGroups.transit-zones this.zoomWarningLabel this.mainMap.zoom}}/>
     <container.layer-group-toggle
       data-test-toggle-appendixj-designated-mdistricts
       @layerGroup={{this.layerGroups.appendixj-designated-mdistricts}}

app/templates/components/layer-record-views/tax-lot/intersecting-layers-views.hbs

@@ -28,17 +28,6 @@
       </a>
     </li>
   {{/if}}
-  {{#if layers.transitzones}}
-    <li>
-      <a
-        target="_blank"
-        href="http://www1.nyc.gov/site/planning/zoning/glossary.page#transit_zone" rel="noopener noreferrer"
-      >
-        <FaIcon @icon="external-link-alt" @transform="shrink-3 up-1" />
-        Transit Zone
-      </a>
-    </li>
-  {{/if}}
   {{#if layers.fresh_zones}}
     <li>
       <a
@@ -144,6 +133,17 @@
       </a>
     </li>
   {{/if}}
+  {{#if layers.transitzones}}
+    <li>
+      <a
+        target="_blank"
+        href="http://www1.nyc.gov/site/planning/zoning/glossary.page#transit_zone" rel="noopener noreferrer"
+      >
+        <FaIcon @icon="external-link-alt" @transform="shrink-3 up-1" />
+        Appendix I
+      </a>
+    </li>
+  {{/if}}
   {{#if layers.appendixj_designated_mdistricts}}
     <li>
       <a

config/environment.js

@@ -51,6 +51,8 @@ module.exports = function (environment) {
       { id: 'limited-height-districts', visible: false },
       { id: 'mandatory-inclusionary-housing', visible: false },
       { id: 'inclusionary-housing', visible: false },
+      { id: 'cho-greater-transit-zone', visible: false },
+      { id: 'cho-transit-zones', visible: false },
       { id: 'transit-zones', visible: false },
       { id: 'fresh', visible: false },
       { id: 'low-density-growth-mgmt-areas', visible: false },

mirage/static-fixtures/layer-groups.js

@@ -451,17 +451,17 @@ export default {
         id: 'transit-zones',
         visible: false,
         legend: {
-          label: 'Transit Zones',
+          label: 'Appendix I',
           tooltip:
-            'Transit-accessible areas where parking is optional for new affordable housing units and special rules apply to existing affordable units',
+            'Transit-accessible areas where special streetscape and special parking requirements apply.',
           infolink:
             'https://www1.nyc.gov/site/planning/zoning/glossary.page#transit_zone',
           icon: {
             type: 'rectangle',
             layers: [
               {
-                fill: 'rgba(230, 214, 46, 0.2)',
-                stroke: 'rgba(230, 214, 46, 0.6)',
+                fill: 'rgba(49, 151, 149, 0.2)',
+                stroke: 'rgba(49, 151, 149, 0.6)',
                 'stroke-dasharray': '1',
               },
             ],

package.json

@@ -41,7 +41,7 @@
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@mapbox/mapbox-gl-draw": "^1.0.0",
-    "@nycplanning/ember": "^3.1.0",
+    "@nycplanning/ember": "^3.2.0",
     "@nycplanning/ember-cli-foundation-6-sass": "^0.1.0",
     "@nycplanning/ember-cli-nouislider": "^1.3.0",
     "@nycplanning/ember-mapbox-gl-draw": "^2.1.0",