CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-17 22:24:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Detection cache can store source data, not instantiated tag objects

Browse Source
This commit is contained in:
Bryan Housel
2017-07-14 01:20:26 -04:00
parent bde4d6510f
commit 590ab7d8b9
1 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/services/mapillary.js
+47 -26
View File
@@ -480,14 +480,16 @@ export default {
updateDetections: function() {
if (!mapillaryViewer) return;
var tagComponent = mapillaryViewer.getComponent('tag');
var detections = mapillaryCache.detections[mapillaryImage];
_.each(detections, function(v, k) {
if (_.isEmpty(v)) {
_.each(detections, function(data, k) {
if (_.isEmpty(data)) {
loadDetection(k);
} else {
tagComponent.add([v]);
var tag = makeTag(data);
if (tag) {
var tagComponent = mapillaryViewer.getComponent('tag');
tagComponent.add([tag]);
}
}
});
@@ -506,33 +508,52 @@ export default {
.get(function(err, data) {
if (!data || !data.properties) return;
var tag;
// Currently only two shapes <Polygon|Point>
if (data.properties.shape.type === 'Polygon') {
var polygonGeometry = new Mapillary
.TagComponent
.PolygonGeometry(data.properties.shape.coordinates[0]);
tag = new Mapillary.TagComponent.OutlineTag(
detectionKey, polygonGeometry, { text: data.properties.value }
);
} else if (data.properties.shape.type === 'Point') {
var pointGeometry = new Mapillary
.TagComponent
.PointGeometry(data.properties.shape.coordinates[0]);
tag = new Mapillary.TagComponent.SpotTag(
detectionKey, pointGeometry, { text: data.properties.value }
);
}
var ik = data.properties.image_key;
mapillaryCache.detections[ik][detectionKey] = data;
if (tag) {
var ik = data.properties.image_key;
mapillaryCache.detections[ik][detectionKey] = tag;
if (mapillaryImage === ik) {
if (mapillaryImage === ik) {
var tag = makeTag(data);
if (tag) {
var tagComponent = mapillaryViewer.getComponent('tag');
tagComponent.add([tag]);
}
}
});
}
function makeTag(data) {
var tag;
// Currently only two shapes <Polygon|Point>
if (data.properties.shape.type === 'Polygon') {
var polygonGeometry = new Mapillary
.TagComponent
.PolygonGeometry(data.properties.shape.coordinates[0]);
tag = new Mapillary.TagComponent.OutlineTag(
data.properties.key,
polygonGeometry,
{
text: data.properties.value
}
);
} else if (data.properties.shape.type === 'Point') {
var pointGeometry = new Mapillary
.TagComponent
.PointGeometry(data.properties.shape.coordinates[0]);
tag = new Mapillary.TagComponent.SpotTag(
data.properties.key,
pointGeometry,
{
text: data.properties.value
}
);
}
return tag;
}
},