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

StreetSide Integration #5050

Merged
merged 7 commits into from
Jun 13, 2018
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
72 changes: 72 additions & 0 deletions css/60_photos.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,32 @@
color: #fff;
}

/* streetside photo attribution */
.photo-wrapper .photo-attribution-streetside {
width: 100%;
font-size: 10px;
position: absolute;
bottom: 0;
right: 0;
padding: 4px 2px;
z-index: 10;
}

.photo-attribution-streetside a,
.photo-attribution-streetside a:visited,
.photo-attribution-streetside span {
padding: 4px 2px;
color: #fff;
}
.photo-attribution-streetside .image_link{
color: #fff;
float: left;
line-height: 6px;
}
.photo-attribution-streetside .image_link:hover{
color: #06b8ff;
}

/* markers and sequences */
.viewfield-group {
pointer-events: visible;
Expand Down Expand Up @@ -113,6 +139,30 @@
}


/* Streetside Image Layer */
.layer-streetside-images {
pointer-events: none;
}
.layer-streetside-images .viewfield-group * {
fill: #00d8f5;
}
.layer-streetside-images .viewfield-group * {
fill: #00d8f5;
}
.layer-streetside-images .viewfield-group.selected * {
fill: #fffc64 !important;
fill-opacity: 1;

}
.layer-streetside-images .viewfield-group.hovered * {
fill: #fffc64 !important;
fill-opacity: .9;
}

.layer-streetside-images .sequence {
stroke: #00d8f5;
}

/* Mapillary Image Layer */
.layer-mapillary-images {
pointer-events: none;
Expand Down Expand Up @@ -163,6 +213,28 @@
}


/* Streetside viewer */
#ms .domRenderer .TagSymbol {
font-size: 10px;
background-color: rgba(0,0,0,0.4);
padding: 0 4px;
border-radius: 4px;
top: -25px;
}
#ms .domRenderer .Attribution {
/* we will roll our own to avoid async update issues like #4526 */
display: none;
}

.ms-wrapper .photo-attribution a:active,
.ms-wrapper .photo-attribution a:hover {
color: #35af6d;
}

.ms-wrapper .mapillary-js-dom {
z-index: 9;
}

/* Mapillary viewer */
#mly .domRenderer .TagSymbol {
font-size: 10px;
Expand Down
3 changes: 3 additions & 0 deletions data/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,9 @@ en:
drag_drop: "Drag and drop a .gpx, .geojson or .kml file on the page, or click the button to the right to browse"
zoom: "Zoom to layer"
browse: "Browse for a file"
streetside:
tooltip: "Streetside photos from Microsoft"
title: "Photo Overlay (Streetside)"
mapillary_images:
tooltip: "Street-level photos from Mapillary"
title: "Photo Overlay (Mapillary)"
Expand Down
4 changes: 4 additions & 0 deletions dist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,10 @@
"zoom": "Zoom to layer",
"browse": "Browse for a file"
},
"streetside": {
"tooltip": "Streetside photos from Microsoft",
"title": "Photo Overlay (Streetside)"
},
"mapillary_images": {
"tooltip": "Street-level photos from Mapillary",
"title": "Photo Overlay (Mapillary)"
Expand Down
2 changes: 2 additions & 0 deletions dist/pannellum-streetside/pannellum.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading