Merge pull request #7762 from mapillary/mapillary-features

Mapillary map features everywhere
openstreetmap · Jul 7, 2020 · f1b6009 · f1b6009
2 parents cdfb230 + 944953d
commit f1b6009
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js
@@ -14,7 +14,6 @@ var viewercss = 'mapillary-js/mapillary.min.css';
 var viewerjs = 'mapillary-js/mapillary.min.js';
 var clientId = 'NzNRM2otQkR2SHJzaXJmNmdQWVQ0dzo1ZWYyMmYwNjdmNDdlNmVi';
 var mapFeatureConfig = {
-    organizationKey: 'FI3NAFfzQQgdF081TRdgTy',
     values: [
         'construction--flat--crosswalk-plain',
         'marking--discrete--crosswalk-zebra',
@@ -372,8 +371,8 @@ export default {
     loadMapFeatures: function(projection) {
         // if we are looking at signs, we'll actually need to fetch images too
         loadTiles('images', apibase + 'images?sort_by=key', projection);
-        loadTiles('points', apibase + 'map_features?layers=points&min_nbr_image_detections=2&sort_by=key&shapes_by_organization_keys=' + mapFeatureConfig.organizationKey + '&' + 'values=' + mapFeatureConfig.values + '&', projection);
-        loadTiles('image_detections', apibase + 'image_detections?layers=points&sort_by=key&shapes_by_organization_keys=' + mapFeatureConfig.organizationKey + '&' + 'values=' + mapFeatureConfig.values + '&', projection);
+        loadTiles('points', apibase + 'map_features?layers=points&min_nbr_image_detections=2&sort_by=key&values=' + mapFeatureConfig.values + '&', projection);
+        loadTiles('image_detections', apibase + 'image_detections?layers=points&sort_by=key&values=' + mapFeatureConfig.values + '&', projection);
     },
 
 

diff --git a/modules/ui/sections/photo_overlays.js b/modules/ui/sections/photo_overlays.js
@@ -4,7 +4,6 @@ import {
 
 import { t } from '../../core/localizer';
 import { uiTooltip } from '../tooltip';
-import { svgIcon } from '../../svg/icon';
 import { uiSection } from '../section';
 
 export function uiSectionPhotoOverlays(context) {
@@ -93,17 +92,6 @@ export function uiSectionPhotoOverlays(context) {
                 return t(id.replace(/-/g, '_') + '.title');
             });
 
-        labelEnter
-            .filter(function(d) { return d.id === 'mapillary-map-features'; })
-            .append('a')
-            .attr('class', 'request-data-link')
-            .attr('target', '_blank')
-            .attr('tabindex', -1)
-            .call(svgIcon('#iD-icon-out-link', 'inline'))
-            .attr('href', 'https://mapillary.github.io/mapillary_solutions/data-request')
-            .append('span')
-            .text(t('mapillary_map_features.request_data'));
-
 
         // Update
         li