Skip to content
This repository was archived by the owner on Sep 28, 2023. It is now read-only.
Open
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
20 changes: 13 additions & 7 deletions css/60_photos.css
Original file line number Diff line number Diff line change
Expand Up @@ -305,17 +305,23 @@ label.streetside-hires {
top: -25px;
}

.mly-wrapper .AttributionContainer .AttributionIconContainer .AttributionMapillaryLogo {
margin-top: 3px;
.mly-wrapper .mapillary-attribution-container {
display: flex;
align-items: center;
}

.mly-wrapper .AttributionContainer .AttributionImageContainer {
color: #fff;
font-size: 10px;
font-weight: 300;
overflow: hidden;
.mly-wrapper .mapillary-attribution-container .mapillary-attribution-icon-container {
display: flex;
align-items: center;
}

.mly-wrapper .mapillary-attribution-container .mapillary-attribution-username {
display: none;
}

.mly-wrapper .mapillary-attribution-container .mapillary-attribution-date {
margin-right: 6px;
}

/* OpenStreetCam viewer */
.osc-wrapper {
Expand Down
28 changes: 27 additions & 1 deletion data/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1318,11 +1318,27 @@ en:
title: "Map Features"
tooltip: "Map features from Mapillary"
construction:
barrier:
temporary: temporary barrier
flat:
crosswalk_plain: plain crosswalk
driveway: driveway
marking:
discrete:
crosswalk_zebra: zebra crosswalk
arrow:
left: lane marking - arrow (left)
right: lane marking - arrow (right)
split_left_or_straight: lane marking - arrow (split left or straight)
split_right_or_straight: lane marking - arrow (split right or straight)
straight: lane marking - arrow (straight)
crosswalk_zebra: lane marking - crosswalk
give_way_row: lane marking - give way (row)
give_way_single: lane marking - give way (single)
other_marking: lane marking - other
stop_line: lane marking - stop line
symbol:
bicycle: lane marking - symbol (bicycle)
text: lane marking - text
object:
banner: banner
bench: bench
Expand All @@ -1331,15 +1347,24 @@ en:
catch_basin: catch basin
cctv_camera: CCTV camera
fire_hydrant: fire hydrant
junction_box: junction box
mailbox: mailbox
manhole: manhole
parking_meter: parking meter
phone_booth: phone booth
sign:
advertisement: advertisement
information: information sign
other: other sign
store: shop sign
traffic_sign:
back: traffic sign - back
direction_front: traffic sign - front
front: traffic sign - front
street_light: street light
support:
pole: pole
traffic_sign_frame: traffic sign frame
utility_pole: utility pole
traffic_cone: traffic cone
traffic_light:
Expand All @@ -1350,6 +1375,7 @@ en:
other: traffic light
pedestrians: pedestrian traffic light
trash_can: trash can
water_valve: water valve
mapillary:
title: Mapillary
signs:
Expand Down
2 changes: 1 addition & 1 deletion dist/locales/en.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modules/renderer/photos.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export function rendererPhotos(context) {
};

photos.shouldFilterByUsername = function() {
return showsLayer('mapillary') || showsLayer('openstreetcam') || showsLayer('streetside');
return !showsLayer('mapillary') && showsLayer('openstreetcam') && !showsLayer('streetside');
};

photos.showsPhotoType = function(val) {
Expand Down
Loading