Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

896 prefer static intersecting layers #1031

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

896 prefer static intersecting layers #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/adapters/lot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ const LotColumnsSQL = [
'condono',
'council',
'firecomp',
'firm07_fla',
'edesignum',
'pfirm15_fl',
'histdist',
'landmark',
'landuse',
Expand Down
3 changes: 0 additions & 3 deletions app/components/layer-record-views/tax-lot/intersecting-layers-views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ export default class IntersectingLayersViews extends Component {
'waterfront_access_plan',
'coastal_zone_boundary',
'lower_density_growth_management_areas',
'floodplain_firm2007',
'floodplain_pfirm2015',
'mandatory_inclusionary_housing',
'e_designations',
'upland_waterfront_areas',
'appendixj_designated_mdistricts',
];
Expand Down
6 changes: 6 additions & 0 deletions app/models/map-features/lot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,14 @@ export default class LotFragment extends MF.Fragment {

@attr('string') council;

@attr('string') edesignum;

@attr('string') firecomp;

@attr('string') firm07_fla;

@attr('string') pfirm15_fl;

@attr('string') histdist;

@attr('string') landmark;
Expand Down
83 changes: 43 additions & 40 deletions app/templates/components/layer-record-views/tax-lot/intersecting-layers-views.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,48 @@
</li>
{{/if}}

{{#if this.model.firm07_fla}}
<li>
<a
target="_blank"
href="http://www1.nyc.gov/site/planning/zoning/districts-tools/flood-text.page"
>
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
Flood Zone
</a>
<small class="dark-gray">
Effective Flood Insurance Rate Maps 2007
</small>
</li>
{{/if}}

{{#if this.model.pfirm15_fl}}
<li>
<a
target="_blank"
href="http://www1.nyc.gov/site/planning/zoning/districts-tools/flood-text.page"
>
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
Flood Zone
</a>
<small class="dark-gray">
Preliminary Flood Insurance Rate Maps 2015
</small>
</li>
{{/if}}

{{#if this.model.edesignum}}
<li>
<a
target="_blank"
href="http://www.nyc.gov/html/oer/html/e-designation/e-designation.shtml"
>
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
Environmental Designation
</a>
</li>
{{/if}}

<IntersectingLayers
@tables={{this.tables}}
@bbl={{this.model.bbl}} as |layers numberIntersecting|
Expand Down Expand Up @@ -94,34 +136,6 @@
</a>
</li>
{{/if}}
{{#if layers.floodplain_firm2007}}
<li>
<a
target="_blank"
href="http://www1.nyc.gov/site/planning/zoning/districts-tools/flood-text.page"
>
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
Flood Zone
</a>
<small class="dark-gray">
Effective Flood Insurance Rate Maps 2007
</small>
</li>
{{/if}}
{{#if layers.floodplain_pfirm2015}}
<li>
<a
target="_blank"
href="http://www1.nyc.gov/site/planning/zoning/districts-tools/flood-text.page"
>
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
Flood Zone
</a>
<small class="dark-gray">
Preliminary Flood Insurance Rate Maps 2015
</small>
</li>
{{/if}}
{{#if layers.mandatory_inclusionary_housing}}
<li>
<a
Expand All @@ -133,17 +147,6 @@
</a>
</li>
{{/if}}
{{#if layers.e_designations}}
<li>
<a
target="_blank"
href="http://www.nyc.gov/html/oer/html/e-designation/e-designation.shtml"
>
{{fa-icon "external-link-alt" transform="shrink-3 up-1"}}
Environmental Designation
</a>
</li>
{{/if}}
{{#if layers.appendixj_designated_mdistricts}}
<li>
<a
Expand All @@ -155,7 +158,7 @@
</a>
</li>
{{/if}}
{{#unless (or numberIntersecting this.model.histdist)}}
{{#unless (or numberIntersecting this.model.histdist this.model.firm07_fla this.model.pfirm15_fl this.model.edesignum)}}
None found
{{/unless}}
</IntersectingLayers>