From 17abd409cf8deab64ee2a4359530e5a0667c73f8 Mon Sep 17 00:00:00 2001
From: Timothy Miller <miller.tim108@gmail.com>
Date: Thu, 26 Dec 2024 10:44:44 -0500
Subject: [PATCH] City of Yes for Housing Opportunity

- Move transit layer to appendix I
- Add greater Transit Zone
- Add parking geographies

closes #1215
---
 .../tax-lot/intersecting-layers-views.js      |   2 +-
 app/templates/components/layer-palette.hbs    |  18 ++-
 .../tax-lot/intersecting-layers-views.hbs     |  22 +--
 config/environment.js                         |   2 +
 mirage/static-fixtures/layer-groups.js        |   8 +-
 package.json                                  |   2 +-
 public/layer-groups.json                      | 132 ++++++++++++++----
 tests/acceptance/layer-behavior-tests-test.js |  12 +-
 yarn.lock                                     |   8 +-
 9 files changed, 157 insertions(+), 49 deletions(-)

diff --git a/app/components/layer-record-views/tax-lot/intersecting-layers-views.js b/app/components/layer-record-views/tax-lot/intersecting-layers-views.js
index 7806d95d..bd533c64 100644
--- a/app/components/layer-record-views/tax-lot/intersecting-layers-views.js
+++ b/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',
   ];
 }
diff --git a/app/templates/components/layer-palette.hbs b/app/templates/components/layer-palette.hbs
index 628d9151..b1304ee4 100644
--- a/app/templates/components/layer-palette.hbs
+++ b/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}}
diff --git a/app/templates/components/layer-record-views/tax-lot/intersecting-layers-views.hbs b/app/templates/components/layer-record-views/tax-lot/intersecting-layers-views.hbs
index cf6d6317..c91a0157 100644
--- a/app/templates/components/layer-record-views/tax-lot/intersecting-layers-views.hbs
+++ b/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
diff --git a/config/environment.js b/config/environment.js
index fad9daf4..407be833 100644
--- a/config/environment.js
+++ b/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 },
diff --git a/mirage/static-fixtures/layer-groups.js b/mirage/static-fixtures/layer-groups.js
index 4474d0dd..986c050c 100644
--- a/mirage/static-fixtures/layer-groups.js
+++ b/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',
               },
             ],
diff --git a/package.json b/package.json
index c130a91b..c567cbc4 100644
--- a/package.json
+++ b/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",
diff --git a/public/layer-groups.json b/public/layer-groups.json
index e3ad9140..122fa2f0 100644
--- a/public/layer-groups.json
+++ b/public/layer-groups.json
@@ -719,6 +719,90 @@
         }
       }
     },
+    {
+      "type": "layer-groups",
+      "id": "cho-greate-transit-zone",
+      "attributes": {
+        "id": "cho-greater-transit-zone",
+        "title": "Greater Transit Zone",
+        "visible": false,
+        "title-tooltip": "The rules for Qualifying Residential Sites are modified by a lot’s relationship to the Greater Transit Zone. Being located within the Greater Transit Zone may allow for more or different development opportunities.",
+        "meta": {
+          "description": "Greater Transit Zone, December 2024 City of Yes for Housing Opportunity",
+          "url": [
+            "https://zr.planning.nyc.gov"
+          ],
+          "updated-at": "December 2024"
+        },
+        "legend-icon": "polygon",
+        "legend-color": "rgba(254, 113, 37, 0.3)"
+      },
+      "relationships": {
+        "layers": {
+          "data": [
+            {
+              "type": "layers",
+              "id": "cho-greater-transit-zone-line"
+            },
+            {
+              "type": "layers",
+              "id": "cho-greater-transit-zone-fill"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "type": "layer-groups",
+      "id": "cho-transit-zones",
+      "attributes": {
+        "id": "cho-transit-zones",
+        "title": "Transit Zones Parking Geographies",
+        "visible": false,
+        "title-tooltip": "Geography defined in ZR#12-10 Definitions under Manhattan Core and ZR#16-02 Definitions and parking requirements defined in ZR#13-041 Applicability of parking regulations within the Manhattan Core and ZR#16-051 Applicability of parking regulations within the Long Island City area",
+        "meta": {
+          "description": "Transit Zones Parking, December 2024 City of Yes for Housing Opportunity",
+          "url": [
+            "https://zr.planning.nyc.gov"
+          ],
+          "updated-at": "December 2024"
+        }
+      },
+      "relationships": {
+        "layers": {
+          "data": [
+            {
+              "type": "layers",
+              "id": "cho-transit-zones-line"
+            },
+            {
+              "type": "layers",
+              "id": "cho-transit-zones-fill-core"
+            },
+            {
+              "type": "layers",
+              "id": "cho-transit-zones-fill-inner"
+            },
+            {
+              "type": "layers",
+              "id": "cho-transit-zones-fill-outer"
+            },
+            {
+              "type": "layers",
+              "id": "cho-transit-zones-fill-special-base"
+            },
+            {
+              "type": "layers",
+              "id": "cho-transit-zones-fill-special-hatch"
+            },
+            {
+              "type": "layers",
+              "id": "cho-transit-zones-fill-beyond"
+            }
+          ]
+        }
+      }
+    },
     {
       "type": "layer-groups",
       "id": "historic-districts",
@@ -1306,7 +1390,7 @@
           "description": "NYC GIS Zoning Features February 2018, BYTES of the BIG APPLE™",
           "url": [
             "https:\/\/www1.nyc.gov\/site\/planning\/data-maps\/open-data.page"
-          ],  
+          ],
           "updated-at": "5 March 2018"
         },
         "legend-icon": "polygon-fill-dash",
@@ -1553,7 +1637,7 @@
       "id": "transit-zones",
       "attributes": {
         "id": "transit-zones",
-        "title": "Transit Zones",
+        "title": "Appendix I",
         "visible": false,
         "title-tooltip": "Transit-accessible areas where parking is optional for new affordable housing units and special rules apply to existing affordable units",
         "meta": {
@@ -1939,7 +2023,7 @@
             "fill-color": "rgba(240, 15, 130, 0.4)"
           },
           "layout": {
-            
+
           },
           "filter": [
             "==",
@@ -1966,7 +2050,7 @@
             "fill-color": "rgba(174, 86, 31, 0.2)"
           },
           "layout": {
-            
+
           },
           "filter": [
             "==",
@@ -2029,7 +2113,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "appendixj-designated-mdistricts"
@@ -2296,7 +2380,7 @@
             "fill-color": "rgba(175, 175, 175, 1)"
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "building-footprints"
@@ -2353,7 +2437,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "business-improvement-districts"
@@ -2594,7 +2678,7 @@
         }
       },
       "relationships": {
-        
+
       }
     },
     {
@@ -2867,7 +2951,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "coastal-zone-boundary"
@@ -3186,7 +3270,7 @@
         "tooltip-template": "2007 {{fld_zone}} Zone"
       },
       "relationships": {
-        
+
       }
     },
     {
@@ -3223,7 +3307,7 @@
         "tooltip-template": "2015 {{fld_zone}} Zone"
       },
       "relationships": {
-        
+
       }
     },
     {
@@ -3283,7 +3367,7 @@
             ]
           ],
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "fresh"
@@ -3315,7 +3399,7 @@
             ]
           ],
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "fresh"
@@ -3347,7 +3431,7 @@
             ]
           ],
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "fresh"
@@ -3406,7 +3490,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "historic-districts"
@@ -3465,7 +3549,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "inclusionary-housing"
@@ -3524,7 +3608,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "industrial-business-zones"
@@ -3660,7 +3744,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "landmarks"
@@ -3719,7 +3803,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "limited-height-districts"
@@ -3778,7 +3862,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "low-density-growth-mgmt-areas"
@@ -3837,7 +3921,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "mandatory-inclusionary-housing"
@@ -4997,7 +5081,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "special-purpose-subdistricts"
@@ -5910,7 +5994,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "transit-zones"
@@ -5969,7 +6053,7 @@
             "fill-opacity": 0.2
           },
           "layout": {
-            
+
           },
           "metadata": {
             "nycplanninglabs:layergroupid": "waterfront-access-plan"
diff --git a/tests/acceptance/layer-behavior-tests-test.js b/tests/acceptance/layer-behavior-tests-test.js
index 5204d783..a00beca9 100644
--- a/tests/acceptance/layer-behavior-tests-test.js
+++ b/tests/acceptance/layer-behavior-tests-test.js
@@ -400,7 +400,17 @@ module('Acceptance | layer behavior tests', function (hooks) {
     await assertTooltips(this, assert, 'inclusionary-housing', true);
   });
 
-  test('Second class: Transit Zones', async function (assert) {
+  test('Second class: Greater Transit Zone', async function (assert) {
+    await assertLayerGroupAdded(this, assert, 'cho-greater-transit-zone');
+
+    await assertTooltips(this, assert, 'cho-greater-transit-zone', true);
+  });
+
+  test('Second class: Transit Zones Parking Geographies', async function (assert) {
+    await assertLayerGroupAdded(this, assert, 'cho-transit-zones');
+  });
+
+  test('Second class: Appendix I', async function (assert) {
     await assertLayerGroupAdded(this, assert, 'transit-zones');
 
     await assertTooltips(this, assert, 'transit-zones', true);
diff --git a/yarn.lock b/yarn.lock
index 80a4438f..2086e56c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2216,10 +2216,10 @@
   dependencies:
     ember-cli-babel "^7.1.2"
 
-"@nycplanning/ember@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@nycplanning/ember/-/ember-3.1.0.tgz#34523670fb9bb5216efcd428c9222a0b21d0d0a8"
-  integrity sha512-DBZV9RVJEgttRMeauf0owwI6hqvCK3VS58ftQvAa9EZppqHicu2fDHM+yVpl3kIY17GV/AnE0Z8HmdNfOTf2QA==
+"@nycplanning/ember@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@nycplanning/ember/-/ember-3.2.0.tgz#4ee20ac4321214c49120596078754d0e12100c35"
+  integrity sha512-s/0tGpuu3oWWw12OyfWzH1Z+KzCtosdJ2gYCEtA/Tcg4anPAa+4qKPD6dpsAcTBRUVVoZTbfkSeNExiauF1QAQ==
   dependencies:
     "@turf/union" "^6.0.0"
     ember-auto-import "^2.6.3"