Skip to content

Commit

Permalink
Merge pull request #1178 from NYCPlanning/develop
Browse files Browse the repository at this point in the history 
Merging removal of sidewalk cafes layer for prod release
  • Loading branch information
@TylerMatteo
TylerMatteo authored Mar 12, 2024
2 parents 4eb3760 + 41c5b37 commit f7135f1
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 348 deletions.
6 changes: 0 additions & 6 deletions app/templates/components/layer-palette.hbs
View file
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 config/environment.js
View file
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
View file
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
169 changes: 1 addition & 168 deletions public/layer-groups.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1295,41 +1295,6 @@
}
}
},
{
"type": "layer-groups",
"id": "sidewalkcafes",
"attributes": {
"id": "sidewalkcafes",
"title": "Sidewalk Cafes",
"visible": false,
"title-tooltip": "Areas where different types of sidewalk cafes are permitted on public sidewalks",
"meta": {
"description": "Sidewalk Cafes release June 2018, BYTES of the BIG APPLE™",
"url": [
"https:\/\/www1.nyc.gov\/site\/planning\/data-maps\/open-data.page"
],
"updated-at": "July 18th, 2018"
}
},
"relationships": {
"layers": {
"data": [
{
"type": "layers",
"id": "sidewalkcafes-line-all"
},
{
"type": "layers",
"id": "sidewalkcafes-line-small"
},
{
"type": "layers",
"id": "sidewalkcafes-line-unenclosed"
}
]
}
}
},
{
"type": "layer-groups",
"id": "special-purpose-districts",
Expand All @@ -1341,7 +1306,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",
Expand Down Expand Up @@ -4930,138 +4895,6 @@
"tooltip-template": "NYC Bulkhead Line"
}
},
{
"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"
]
],
"metadata": {
"nycplanninglabs:layergroupid": "sidewalkcafes"
}
}
}
},
{
"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": "visible"
},
"metadata": {
"nycplanninglabs:layergroupid": "sidewalkcafes"
}
}
}
},
{
"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": "visible"
},
"metadata": {
"nycplanninglabs:layergroupid": "sidewalkcafes"
}
}
}
},
{
"type": "layers",
"id": "zoning-sp-line",
Expand Down
Loading

0 comments on commit f7135f1

Please sign in to comment.