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.

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

Syncing data-qa with master #1184

Merged
merged 14 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/components/layer-record-views/tax-lot.js
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ export default class TaxLotRecordComponent extends LayerRecordComponent {
}

get digitalTaxMapLink() {
return `http://gis.nyc.gov/taxmap/map.htm?searchType=BblSearch&featureTypeName=EVERY_BBL&featureName=${this.model.bbl}`;
return `https://propertyinformationportal.nyc.gov/parcels/${this.model.condono ? 'condo' : 'parcel'}/${this.model.bbl}`;
}

get zoningMapLink() {
Expand Down
34 changes: 2 additions & 32 deletions app/styles/layouts/_l-default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,6 @@ body {
}
}

.info-banner {
background-color: #2C7A7B;
color: white;
text-align: center;
position: relative;
z-index: 2;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
font-family: $body-font-family;
flex-direction: column;
padding: 1rem;

@include breakpoint(large) {
flex-direction: row;
}

p {
margin-bottom: 0;
}

a {
color: white;
display: block;
font-family: $body-font-family;
text-decoration: underline;
}
}

.site-header {
position: relative;
z-index: 2;
Expand Down Expand Up @@ -75,7 +45,7 @@ body {

@include breakpoint(large) {
position: fixed;
top: 8.25rem;
top: 4.75rem;
left: 0;
width: 15rem;
box-shadow: 0 2px 0 rgba(0,0,0,0.1), 2px 0 0 rgba(0,0,0,0.1);
Expand Down Expand Up @@ -231,7 +201,7 @@ body.index {
display: block;
position: fixed;
z-index: 3;
top: 8.75rem;
top: 5.25rem;
right: 41.66667%;
background-color: $white;
margin-right: -4px;
Expand Down
6 changes: 0 additions & 6 deletions app/templates/components/layer-palette.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,6 @@
@activeTooltip={{zoom-dependent-label this.layerGroups.fresh this.zoomWarningLabel this.mainMap.zoom}}>
<LabsUi::LegendItems @items={{this.layerGroups.fresh.legend.items}} />
</container.layer-group-toggle>
<container.layer-group-toggle
data-test-toggle-sidewalk-cafes
@layerGroup={{this.layerGroups.sidewalk-cafes}}
@activeTooltip={{zoom-dependent-label this.layerGroups.sidewalk-cafes this.zoomWarningLabel this.mainMap.zoom}}>
<LabsUi::LegendItems @items={{this.layerGroups.sidewalk-cafes.legend.items}} />
</container.layer-group-toggle>
<container.layer-group-toggle
data-test-toggle-limited-height-districts
@layerGroup={{this.layerGroups.limited-height-districts}}
Expand Down
1 change: 0 additions & 1 deletion app/templates/components/main-header.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<div class="info-banner"><p>In an effort to better serve the needs of users like you, we'd like to hear from you about how we can improve services like this site.&nbsp;</p><a href="https://cdn.forms-content.sg-form.com/bedbc62d-92b2-11ee-8914-aef1bb5f47ec" target="_blank">Click here to sign up.</a></div>
<Deprecated::SiteHeader
@responsiveNav={{true}}
@betaNotice={{false}}
Expand Down
1 change: 0 additions & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ module.exports = function (environment) {
{ id: 'inclusionary-housing', visible: false },
{ id: 'transit-zones', visible: false },
{ id: 'fresh', visible: false },
{ id: 'sidewalk-cafes', visible: false },
{ id: 'low-density-growth-mgmt-areas', visible: false },
{ id: 'coastal-zone-boundary', visible: false },
{ id: 'waterfront-access-plan', visible: false },
Expand Down
167 changes: 0 additions & 167 deletions mirage/static-fixtures/layer-groups.js
Original file line number Diff line number Diff line change
Expand Up @@ -574,82 +574,6 @@ export default {
},
},
},
{
type: 'layer-groups',
id: 'sidewalk-cafes',
attributes: {
id: 'sidewalk-cafes',
visible: false,
legend: {
label: 'Sidewalk Cafes',
tooltip:
'Areas where different types of sidewalk cafes are permitted on public sidewalks',
infolink:
'https://www1.nyc.gov/site/planning/zoning/districts-tools/sidewalk-cafes.page',
items: [
{
label: 'All Cafes Permitted',
icon: {
type: 'line',
layers: [
{
stroke: '#28AD15',
},
],
},
},
{
label: 'Small Cafes Permitted',
icon: {
type: 'line',
layers: [
{
stroke: '#CC3DCA',
},
],
},
},
{
label: 'Unenclosed and Small Cafes Permitted',
icon: {
type: 'line',
layers: [
{
stroke: '#216BC6',
},
],
},
},
],
},
},
relationships: {
layers: {
data: [
{
type: 'layers',
id: 'sidewalkcafes-line-all',
},
{
type: 'layers',
id: 'sidewalkcafes-line-small',
},
{
type: 'layers',
id: 'sidewalkcafes-line-unenclosed',
},
],
},
sources: {
data: [
{
type: 'sources',
id: 'supporting-zoning',
},
],
},
},
},
{
type: 'layer-groups',
id: 'low-density-growth-mgmt-areas',
Expand Down Expand Up @@ -2264,10 +2188,6 @@ export default {
id: 'fresh',
sql: 'SELECT the_geom_webmercator, name FROM fresh_zones',
},
{
id: 'sidewalk-cafes',
sql: 'SELECT the_geom_webmercator, cafetype FROM sidewalk_cafes',
},
{
id: 'low-density-growth-mgmt-areas',
sql: 'SELECT the_geom_webmercator FROM lower_density_growth_management_areas',
Expand Down Expand Up @@ -2870,93 +2790,6 @@ export default {
'tooltip-template': 'FRESH - {{{name}}}',
},
},
{
type: 'layers',
id: 'sidewalkcafes-line-all',
attributes: {
style: {
id: 'sidewalkcafes-line-all',
type: 'line',
source: 'supporting-zoning',
'source-layer': 'sidewalk-cafes',
paint: {
'line-width': {
stops: [
[11, 0.5],
[13, 1],
[15, 5],
],
},
'line-color': '#28AD15',
},
filter: ['all', ['==', 'cafetype', 'All Cafes']],
layout: {
visibility: 'none',
},
metadata: {
'nycplanninglabs:layergroupid': 'sidewalk-cafes',
},
},
},
},
{
type: 'layers',
id: 'sidewalkcafes-line-small',
attributes: {
style: {
id: 'sidewalkcafes-line-small',
type: 'line',
source: 'supporting-zoning',
'source-layer': 'sidewalk-cafes',
paint: {
'line-width': {
stops: [
[11, 0.5],
[13, 1],
[15, 5],
],
},
'line-color': '#CC3DCA',
},
filter: ['all', ['==', 'cafetype', 'Small Only']],
layout: {
visibility: 'none',
},
metadata: {
'nycplanninglabs:layergroupid': 'sidewalk-cafes',
},
},
},
},
{
type: 'layers',
id: 'sidewalkcafes-line-unenclosed',
attributes: {
style: {
id: 'sidewalkcafes-line-unenclosed',
type: 'line',
source: 'supporting-zoning',
'source-layer': 'sidewalk-cafes',
paint: {
'line-width': {
stops: [
[11, 0.5],
[13, 1],
[15, 5],
],
},
'line-color': '#216BC6',
},
filter: ['all', ['==', 'cafetype', 'Unenclosed Only']],
layout: {
visibility: 'none',
},
metadata: {
'nycplanninglabs:layergroupid': 'sidewalk-cafes',
},
},
},
},
{
type: 'layers',
id: 'low-density-growth-mgmt-areas-line',
Expand Down
Loading
Loading