Skip to content

Commit

Permalink
Merge pull request #188 from bcgov/qa
Browse files Browse the repository at this point in the history 
remove COVID layers and update road closures
  • Loading branch information
@NicoledeGreef
NicoledeGreef authored Nov 17, 2020
2 parents 99aeb80 + c8a5e8a commit 845df7c
Show file tree
Hide file tree
Showing 35 changed files with 111 additions and 1,505 deletions.
2 changes: 1 addition & 1 deletion build/download-geojson.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ echo "Copying cached datasets"
cp -v cache/* temp/geojson

download GM_Cardlock
download GM_Covid19Relief
# download GM_Covid19Relief
download GM_DangerousGoodsRestrictions
# download GM_DangerousGoodsRoutes
download GM_DowntownVancouver
Expand Down
16 changes: 8 additions & 8 deletions build/extract-layers.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ filter temp/geojson/GM_TermPermitRoutes.geojson '.TermPermitType == "Term Permit
filter temp/geojson/GM_TemporaryRoadClosuresExtent.geojson '.Status == "Active"' temporary-road-closure-extent
filter temp/geojson/GM_TemporaryRoadClosures.geojson '.Status == "Active"' temporary-road-closure

filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Cardlock"' covid19-relief-cardlock
filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Food Truck"' covid19-relief-food-truck
filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Hotel"' covid19-relief-hotel
filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Inspection Station"' covid19-relief-inspection-station
filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Portable Toilet"' covid19-relief-portable-toilet
filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Rest Area"' covid19-relief-rest-area
filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Temporary Truck Parking"' covid19-relief-temporary-truck-parking
filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Tourist Centre"' covid19-relief-tourist-centre
# filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Cardlock"' covid19-relief-cardlock
# filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Food Truck"' covid19-relief-food-truck
# filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Hotel"' covid19-relief-hotel
# filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Inspection Station"' covid19-relief-inspection-station
# filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Portable Toilet"' covid19-relief-portable-toilet
# filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Rest Area"' covid19-relief-rest-area
# filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Temporary Truck Parking"' covid19-relief-temporary-truck-parking
# filter temp/geojson/GM_Covid19Relief.geojson '.Active and .AmenityType == "Tourist Centre"' covid19-relief-tourist-centre
23 changes: 4 additions & 19 deletions config/layer-display.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,6 @@
"type": "layers",
"display": [
{
"type": "group",
"title": "COVID 19 Relief",
"isVisible": true,
"items": [
{ "id": "covid19-relief-cardlock" },
{ "id": "covid19-relief-food-truck" },
{ "id": "covid19-relief-hotel" },
{ "id": "covid19-relief-inspection-station" },
{ "id": "covid19-relief-portable-toilet" },
{ "id": "covid19-relief-rest-area" },
{ "id": "covid19-relief-temporary-truck-parking" },
{ "id": "covid19-relief-tourist-centre" }
]
},
{
"type": "group",
"title": "Truck Routes",
"isVisible": true,
Expand Down Expand Up @@ -76,23 +61,23 @@
{ "id": "oversize-overweight-truck-routes-gvw-up-to-125000-kg", "class": "smk-inline-legend" }
]
},
{
{
"type": "folder",
"title": "Height Restrictions",
"isVisible": true,
"isExpanded": true,
"items": [
"items": [
{ "id": "overhead-structure-with-height-marker", "isVisible": true, "class": "smk-inline-legend" },
{ "id": "overhead-structure-without-height-marker", "isVisible": false, "class": "smk-inline-legend" },
{ "id": "overhead-directional-signs", "isVisible": false, "class": "smk-inline-legend" }
]
},
{
{
"type": "folder",
"title": "Special Areas & POIs",
"isVisible": true,
"isExpanded": true,
"items": [
"items": [

{ "id": "inspection-station", "isVisible": true, "class": "smk-inline-legend" },
{ "id": "cardlock", "isVisible": false, "class": "smk-inline-legend" },
Expand Down
47 changes: 1 addition & 46 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,51 +160,6 @@
return '<%= this.feature.properties[ "' + attrName + '" ] ? "Yes" : "" %>'
}

var covid19Layers = [
'cardlock',
'food-truck',
'hotel',
'inspection-station',
'portable-toilet',
'rest-area',
'temporary-truck-parking',
'tourist-centre',
].reduce( function ( acc, n ) {
return acc.concat(
'./layers/covid19-relief-' + n + '/config.json',
{ layers: [ { id: 'covid19-relief-' + n, titleAttribute: 'Name', attributes: [
/*{ name: "Active", title: "Active" },*/
{ title: "Name", name: "Name" },
{ title: "Amenity Type", name: "AmenityType" },
{ title: "Address", name: "Address" },
{ title: "Building Type", name: "BuildingType" },
{ title: "Amenity Location", name: "AmenityLocation" },
{ title: "Streetview", format: "asLink( this.feature.properties.StreetviewLink, 'Link' )" },
{ title: "Information", format: "asLink( this.feature.properties.InformationLink, 'Link' )" },
{ title: "Document", format: "asLink( this.feature.properties.DocumentLink, 'Link' )" },
{ title: "Open Hours", name: "OpenHours" },
{ title: "Parking Lot", value: formatYesNo( 'ParkingLot' ) },
{ title: "Parking Lot Hours", name: "ParkingLotHours" },
{ title: "Parking Spaces", name: "ParkingSpaces" },
{ title: "Curbside Parking", value: formatYesNo( 'CurbsideParking' ) },
{ title: "Curbside Parking Hours", name: "CurbsideParkingHours" },
{ title: "Food Nearby", value: formatYesNo( 'FoodNearby' ) },
{ title: "Directions To Food", format: "asHTML( this.feature.properties.DirectionsToFood )" },
{ title: "Washroom Nearby", value: formatYesNo( 'WashroomNearby' ) },
{ title: "Directions To Washroom", format: "asHTML( this.feature.properties.DirectionsToWashroom )" },
{ title: "Showers Nearby", value: formatYesNo( 'ShowersNearby' ) },
{ title: "Directions To Showers", format: "asHTML( this.feature.properties.DirectionsToShowers )" },
{ title: "Garbage Bin Nearby", value: formatYesNo( 'GarbageBinNearby' ) },
{ title: "Directions To Garbage Bin", format: "asHTML( this.feature.properties.DirectionsToGarbageBin )" },
{ title: "Other Amenity", name: "OtherAmenity" },
{ title: "Directions To Other Amenity", format: "asHTML( this.feature.properties.DirectionsToOtherAmenity )" },
{ title: "Terms Of Use", name: "TermsOfUse" },
{ title: "Comments", format: "asHTML( this.feature.properties.Comments )" },
{ title: "Contact Info", format: "asHTML( this.feature.properties.ContactInfo )", name: "ContactInfo" }
] } ] }
)
}, [] )

var defaultVehicle = TRP.vehicleTypes[ 0 ].configs[ 0 ]
SMK.INIT( {
'smk-container-sel': "#smk-map-frame",
Expand Down Expand Up @@ -240,7 +195,7 @@
'./layers/truck-routes-municipal-road-with-no-truck-travel-restriction/config.json',
'./layers/temporary-road-closure/config.json',
'./layers/temporary-road-closure-extent/config.json'
], covid19Layers, [
], [
'./config/map.json',
'./config/layer-display.json',
{
Expand Down
134 changes: 0 additions & 134 deletions layers/covid19-relief-cardlock/config.json
View file

This file was deleted.

Loading

0 comments on commit 845df7c

Please sign in to comment.