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

Add mapilio data #9664

Merged
merged 11 commits into from
Aug 1, 2023
Merged

Add mapilio data #9664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7c90e2d
first commit
May 24, 2023
d92afe3
add point and line
May 24, 2023
4761536
Merge branch 'develop' into add_mapilio_data
May 26, 2023
9876e92
add hover and click event
May 26, 2023
1a8ba8e
fixed test error
May 26, 2023
04581bd
Merge branch 'develop' into add_mapilio_data
Jul 12, 2023
8de4ae2
Merge branch 'develop' into add_mapilio_data
Jul 13, 2023
4616cd3
fixed pano screen and changed map layers name
Jul 13, 2023
a84ba59
Added change image forward and backward feature
Jul 17, 2023
d35aff7
Merge branch 'develop' into add_mapilio_data
Jul 21, 2023
c70abfa
added zoom, photo hash-parameter and some fixes
Jul 21, 2023
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
37 changes: 37 additions & 0 deletions css/60_photos.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,43 @@
stroke: #20c4ff;
}

/* Mapilio Image Layer */
.layer-mapilio {
pointer-events: none;
}
.layer-mapilio .viewfield-group * {
fill: #0056f1;
stroke: #ffffff;
stroke-opacity: .6;
fill-opacity: .6;
}
.layer-mapilio .sequence {
stroke: #0056f1;
}
.photo-controls-mapilio {
display: flex;
align-items: center;
justify-content: center;
gap: 4px;
pointer-events: initial;
}

.photo-controls-mapilio button{
padding:0 6px;
}

.ideditor .mapilio-wrapper {
position: relative;
background-color: #000;
background-image: url(img/loader-black.gif);
background-position: center;
background-repeat: no-repeat;
}
#ideditor-viewer-mapilio{
width: 100%;
height: 100%;
transform-origin: 0 0;
}

/* Streetside Viewer (pannellum) */
.ms-wrapper .photo-attribution .image-link {
Expand Down
3 changes: 3 additions & 0 deletions data/core.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1432,6 +1432,9 @@ en:
kartaview:
title: KartaView
view_on_kartaview: "View this image on KartaView"
mapilio:
title: Mapilio
tooltip: "Street-level photos from Mapilio"
note:
note: Note
title: Edit note
Expand Down
3 changes: 2 additions & 1 deletion modules/renderer/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@ export function rendererBackground(context) {
mapillary: 'Mapillary Images',
'mapillary-map-features': 'Mapillary Map Features',
'mapillary-signs': 'Mapillary Signs',
kartaview: 'KartaView Images'
kartaview: 'KartaView Images',
mapilio: 'Mapilio Images'
};

for (let layerID in photoOverlayLayers) {
Expand Down
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 @@ -7,7 +7,7 @@ import { utilQsString, utilStringQs } from '../util';

export function rendererPhotos(context) {
var dispatch = d3_dispatch('change');
var _layerIDs = ['streetside', 'mapillary', 'mapillary-map-features', 'mapillary-signs', 'kartaview'];
var _layerIDs = ['streetside', 'mapillary', 'mapillary-map-features', 'mapillary-signs', 'kartaview', 'mapilio'];
var _allPhotoTypes = ['flat', 'panoramic'];
var _shownPhotoTypes = _allPhotoTypes.slice(); // shallow copy
var _dateFilters = ['fromDate', 'toDate'];
Expand Down
7 changes: 5 additions & 2 deletions modules/services/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import serviceTaginfo from './taginfo';
import serviceVectorTile from './vector_tile';
import serviceWikidata from './wikidata';
import serviceWikipedia from './wikipedia';
import serviceMapilio from './mapilio';


export let services = {
Expand All @@ -30,7 +31,8 @@ export let services = {
taginfo: serviceTaginfo,
vectorTile: serviceVectorTile,
wikidata: serviceWikidata,
wikipedia: serviceWikipedia
wikipedia: serviceWikipedia,
mapilio: serviceMapilio
};

export {
Expand All @@ -48,5 +50,6 @@ export {
serviceTaginfo,
serviceVectorTile,
serviceWikidata,
serviceWikipedia
serviceWikipedia,
serviceMapilio
};
Loading