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

Jump to bottom

Use Mapillary vector tiles and switch to v4 #8372

Merged
merged 10 commits into from
Jun 30, 2021
Merged

Use Mapillary vector tiles and switch to v4 #8372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6cd1771
Use Mapillary vector tiles for images, sequences and map features
nickplesha Mar 1, 2021
7a0d8ad
Switch to Mapillary API v4
nickplesha Jun 15, 2021
87a823f
Fix traffic sign rendering and geometry conversion
nickplesha Jun 15, 2021
d8670ac
Remove debugging code
nickplesha Jun 15, 2021
42d1e05
Update locale file
nickplesha Jun 15, 2021
6a35533
Merge develop into mapillary-vector-tiles
nickplesha Jun 25, 2021
8e46b1b
Remove unused map feature title
nickplesha Jun 28, 2021
eba6fe0
Bring map map feature tooltips
nickplesha Jun 29, 2021
aa134cb
Add missing mapillary map feature classes
nickplesha Jun 30, 2021
7c8c3cd
Update translation file
nickplesha Jun 30, 2021
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modules/renderer/photos.js
View file
Open in desktop
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