Centralize zoning district primaryzone lookup code; rename

NYCPlanning · Oct 26, 2021 · 3281a3f · 3281a3f
1 parent a8665c3
commit 3281a3f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/app/models/map-features/zoning-district.js b/app/models/map-features/zoning-district.js
@@ -83,6 +83,20 @@ const zoningAbbr = {
   BPC: 'bpc',
 };
 
+export const handleCommercialZoningExceptions = (primaryzone) => {
+  let url = '';
+
+  if ((primaryzone === 'c1') || (primaryzone === 'c2')) {
+    url = 'c1-c2';
+  } else if (primaryzone === 'c3') {
+    url = 'c3-c3a';
+  } else {
+    url = primaryzone;
+  }
+
+  return url;
+};
+
 const { attr } = DS;
 
 // this model fragment structures the "properties"
@@ -94,8 +108,10 @@ export default class ZoningDistrictFragment extends MF.Fragment {
   @computed('zonedist')
   get primaryzone() {
     const zonedist = this.get('zonedist');
+
     // convert R6A to r6
-    const primary = zonedist.match(/\w\d*/)[0].toLowerCase();
+    const primary = handleCommercialZoningExceptions(zonedist.match(/\w\d*/)[0].toLowerCase());
+
     return primary;
   }
 
@@ -117,20 +133,4 @@ export default class ZoningDistrictFragment extends MF.Fragment {
 
     return zoningDescriptions[zoneabbr];
   }
-
-  @computed('primaryzone')
-  get primaryzoneURL() {
-    const primaryzone = this.get('primaryzone');
-    let url = '';
-
-    if ((primaryzone === 'c1') || (primaryzone === 'c2')) {
-      url = 'c1-c2';
-    } else if (primaryzone === 'c3') {
-      url = 'c3-c3a';
-    } else {
-      url = primaryzone;
-    }
-
-    return url;
-  }
 }
diff --git a/app/templates/components/layer-record-views/zoning-district.hbs b/app/templates/components/layer-record-views/zoning-district.hbs
@@ -10,7 +10,7 @@
 {{#unless (eq this.model.zonedist "BPC")}}
   <p>
     <a
-      href="https://www1.nyc.gov/site/planning/zoning/districts-tools/{{this.model.primaryzoneURL}}.page"
+      href="https://www1.nyc.gov/site/planning/zoning/districts-tools/{{this.model.primaryzone}}.page"
       target="_blank"
     >
       {{fa-icon "external-link-alt"}}