Skip to content

Commit 815bd5e

Browse files
committed
For intersecting layers component, infers intersection from static property on lot model rather than on-the-fly spatial intersection
1 parent a8665c3 commit 815bd5e

File tree

4 files changed

+52
-43
lines changed

4 files changed

+52
-43
lines changed

app/adapters/lot.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ const LotColumnsSQL = [
1212
'condono',
1313
'council',
1414
'firecomp',
15+
'firm07_fla',
16+
'edesignum',
17+
'pfirm15_fl',
1518
'histdist',
1619
'landmark',
1720
'landuse',

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ export default class IntersectingLayersViews extends Component {
1010
'waterfront_access_plan',
1111
'coastal_zone_boundary',
1212
'lower_density_growth_management_areas',
13-
'floodplain_firm2007',
14-
'floodplain_pfirm2015',
1513
'mandatory_inclusionary_housing',
16-
'e_designations',
1714
'upland_waterfront_areas',
1815
'appendixj_designated_mdistricts',
1916
];

app/models/map-features/lot.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,14 @@ export default class LotFragment extends MF.Fragment {
337337

338338
@attr('string') council;
339339

340+
@attr('string') edesignum;
341+
340342
@attr('string') firecomp;
341343

344+
@attr('string') firm07_fla;
345+
346+
@attr('string') pfirm15_fl;
347+
342348
@attr('string') histdist;
343349

344350
@attr('string') landmark;

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

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,48 @@
1313
</li>
1414
{{/if}}
1515

16+
{{#if this.model.firm07_fla}}
17+
<li>
18+
<a
19+
target="_blank"
20+
href="http://www1.nyc.gov/site/planning/zoning/districts-tools/flood-text.page"
21+
>
22+
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
23+
Flood Zone
24+
</a>
25+
<small class="dark-gray">
26+
Effective Flood Insurance Rate Maps 2007
27+
</small>
28+
</li>
29+
{{/if}}
30+
31+
{{#if this.model.pfirm15_fl}}
32+
<li>
33+
<a
34+
target="_blank"
35+
href="http://www1.nyc.gov/site/planning/zoning/districts-tools/flood-text.page"
36+
>
37+
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
38+
Flood Zone
39+
</a>
40+
<small class="dark-gray">
41+
Preliminary Flood Insurance Rate Maps 2015
42+
</small>
43+
</li>
44+
{{/if}}
45+
46+
{{#if this.model.edesignum}}
47+
<li>
48+
<a
49+
target="_blank"
50+
href="http://www.nyc.gov/html/oer/html/e-designation/e-designation.shtml"
51+
>
52+
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
53+
Environmental Designation
54+
</a>
55+
</li>
56+
{{/if}}
57+
1658
<IntersectingLayers
1759
@tables={{this.tables}}
1860
@bbl={{this.model.bbl}} as |layers numberIntersecting|
@@ -94,34 +136,6 @@
94136
</a>
95137
</li>
96138
{{/if}}
97-
{{#if layers.floodplain_firm2007}}
98-
<li>
99-
<a
100-
target="_blank"
101-
href="http://www1.nyc.gov/site/planning/zoning/districts-tools/flood-text.page"
102-
>
103-
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
104-
Flood Zone
105-
</a>
106-
<small class="dark-gray">
107-
Effective Flood Insurance Rate Maps 2007
108-
</small>
109-
</li>
110-
{{/if}}
111-
{{#if layers.floodplain_pfirm2015}}
112-
<li>
113-
<a
114-
target="_blank"
115-
href="http://www1.nyc.gov/site/planning/zoning/districts-tools/flood-text.page"
116-
>
117-
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
118-
Flood Zone
119-
</a>
120-
<small class="dark-gray">
121-
Preliminary Flood Insurance Rate Maps 2015
122-
</small>
123-
</li>
124-
{{/if}}
125139
{{#if layers.mandatory_inclusionary_housing}}
126140
<li>
127141
<a
@@ -133,17 +147,6 @@
133147
</a>
134148
</li>
135149
{{/if}}
136-
{{#if layers.e_designations}}
137-
<li>
138-
<a
139-
target="_blank"
140-
href="http://www.nyc.gov/html/oer/html/e-designation/e-designation.shtml"
141-
>
142-
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
143-
Environmental Designation
144-
</a>
145-
</li>
146-
{{/if}}
147150
{{#if layers.appendixj_designated_mdistricts}}
148151
<li>
149152
<a
@@ -155,7 +158,7 @@
155158
</a>
156159
</li>
157160
{{/if}}
158-
{{#unless (or numberIntersecting this.model.histdist)}}
161+
{{#unless (or numberIntersecting this.model.histdist this.model.firm07_fla this.model.pfirm15_fl this.model.edesignum)}}
159162
None found
160163
{{/unless}}
161164
</IntersectingLayers>

0 commit comments

Comments
 (0)