Merge branch 'openstreetmap:develop' into develop

Author: ChaitanyaKadu03

.vscode/i18n-ally-custom-framework.yml

@@ -6,6 +6,7 @@ languageIds:
   - typescriptreact
 
 usageMatchRegex:
+  - "[^\\w\\d]t\\.addOrUpdate\\(['\"`]({key})['\"`]" # matches t.addOrUpdate("{key}"
   - "[^\\w\\d]t\\.append\\(['\"`]({key})['\"`]" # matches t.append("{key}"
   - "[^\\w\\d]t\\.html\\(['\"`]({key})['\"`]" # matches t.html("{key}"
   - "[^\\w\\d]t\\(['\"`]({key})['\"`]" # matches t.html("{key}"

CHANGELOG.md

@@ -38,17 +38,26 @@ _Breaking developer changes, which may affect downstream projects or sites that
 # unreleased (v2.33.0-dev)
 
 #### :sparkles: Usability & Accessibility
+* Allow searching for coordinates in localized number format in search box ([#10805])
 #### :scissors: Operations
 #### :camera: Street-Level
+* Add prev/next button to viewer for local georeferenced photos ([#10852], thanks [@0xatulpatil])
 #### :white_check_mark: Validation
 #### :bug: Bugfixes
-* fix some direction cones not appearing on railway tracks ([#10843], thanks [@k-yle])
+* Fix some direction cones not appearing on railway tracks ([#10843], thanks [@k-yle])
+* Better handling of rate limited API calls and other API errors ([#10299])
 #### :earth_asia: Localization
 #### :hourglass: Performance
 #### :mortar_board: Walkthrough / Help
 #### :hammer: Development
 
+[#10805]: https://github.com/openstreetmap/iD/pull/10805
+[#10299]: https://github.com/openstreetmap/iD/issues/10299
 [#10843]: https://github.com/openstreetmap/iD/pull/10843
+[#10852]: https://github.com/openstreetmap/iD/issues/10852
+[@0xatulpatil]: https://github.com/0xatulpatil
+
+
 
 # 2.32.0
 ##### 2025-03-05
@@ -75,7 +84,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Revalidate ways that are added to or removed from relations ([#10786])
 * Preserve `crossing:markings` tag when fixing missing connection of crossing path and road ([#9586], thanks [@jtracey])
 * Add a dedicated description to fix waterway-road intersections by adding a _culvert_ ([#10778], thanks [@matkoniecz])
-* Separate tag-upgrade warnings from NSI suggestions ([#10800], thanks [@k-yle])
+* Separate tag-upgrade warnings from NSI suggestions ([#10801], thanks [@k-yle])
 #### :bug: Bugfixes
 * Prevent degenerate ways caused by deleting a corner of a triangle ([#10003], thanks [@k-yle])
 * Fix briefly disappearing data layer during background layer tile layer switching transition ([#10748])
@@ -119,7 +128,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [#10776]: https://github.com/openstreetmap/iD/issues/10776
 [#10778]: https://github.com/openstreetmap/iD/issues/10778
 [#10798]: https://github.com/openstreetmap/iD/pull/10798
-[#10800]: https://github.com/openstreetmap/iD/pull/10800
+[#10801]: https://github.com/openstreetmap/iD/pull/10801
 [#10807]: https://github.com/openstreetmap/iD/issues/10807
 [@hlfan]: https://github.com/hlfan
 [@Deeptanshu-sankhwar]: https://github.com/Deeptanshu-sankhwar

css/60_photos.css

@@ -681,3 +681,18 @@ label.streetside-hires {
     cursor: pointer;
 }
 
+.photo-controls-local {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 4px;
+}
+.photo-controls-local button {
+    padding:0 6px;
+    pointer-events: initial;
+}
+
+.photo-controls-local button:disabled {
+    background: rgba(255,255,255,.25);
+}
+

data/core.yaml

@@ -596,6 +596,7 @@ en:
       offline: The OpenStreetMap API is offline. Your edits are safe locally. Please come back later.
       readonly: The OpenStreetMap API is currently read-only. You can continue editing, but must wait to save your changes.
       rateLimit: The OpenStreetMap API is limiting anonymous connections. You can fix this by logging in.
+      rateLimited: The OpenStreetMap API is limiting your connection, please wait.
       local_storage_full: You have made too many edits to back up. Consider saving your changes now.
     retry: Retry
   commit:

modules/core/context.js

@@ -118,12 +118,6 @@ export function coreContext() {
   function afterLoad(cid, callback) {
     return (err, result) => {
       if (err) {
-        // 400 Bad Request, 401 Unauthorized, 403 Forbidden..
-        if (err.status === 400 || err.status === 401 || err.status === 403) {
-          if (_connection) {
-            _connection.logout();
-          }
-        }
         if (typeof callback === 'function') {
           callback(err);
         }

modules/osm/entity.js

@@ -60,6 +60,8 @@ osmEntity.prototype = {
     /** @type {Tags} */
     tags: {},
 
+    /** @type {String} */
+    id: undefined,
 
     initialize: function(sources) {
         for (var i = 0; i < sources.length; ++i) {

modules/services/osm.js

@@ -524,10 +524,6 @@ function updateRtree(item, replace) {
 function wrapcb(thisArg, callback, cid) {
     return function(err, result) {
         if (err) {
-            // 401 Unauthorized, 403 Forbidden
-            if (err.status === 401 || err.status === 403) {
-                thisArg.logout();
-            }
             return callback.call(thisArg, err);
 
         } else if (thisArg.getConnectionId() !== cid) {
@@ -640,39 +636,23 @@ export default {
                 return;
             }
 
-            var isAuthenticated = that.authenticated();
-
-            // 401 Unauthorized, 403 Forbidden
-            // Logout and retry the request.
-            if (isAuthenticated && err && err.status &&
-                    (err.status === 401 || err.status === 403)) {
-                that.logout();
-                that.loadFromAPI(path, callback, options);
-            // else, no retry.
-            } else {
-                // 509 Bandwidth Limit Exceeded, 429 Too Many Requests
-                // Set the rateLimitError flag and trigger a warning.
-                if (!isAuthenticated && !_rateLimitError && err && err.status &&
-                        (err.status === 509 || err.status === 429)) {
-                    _rateLimitError = err;
-                    dispatch.call('change');
-                    that.reloadApiStatus();
-                } else if ((err && _cachedApiStatus === 'online') ||
-                    (!err && _cachedApiStatus !== 'online')) {
-                    // If the response's error state doesn't match the status,
-                    // it's likely we lost or gained the connection so reload the status
-                    that.reloadApiStatus();
-                }
+            if ((err && _cachedApiStatus === 'online') ||
+                (!err && _cachedApiStatus !== 'online')) {
+                // If the response's error state doesn't match the status,
+                // it's likely we lost or gained the connection so reload the status
+                that.reloadApiStatus();
+            }
 
-                if (callback) {
-                    if (err) {
-                        return callback(err);
+            if (callback) {
+                if (err) {
+                    // eslint-disable-next-line no-console
+                    console.error('API error:', err);
+                    return callback(err);
+                } else {
+                    if (path.indexOf('.json') !== -1) {
+                        return parseJSON(payload, callback, options);
                     } else {
-                        if (path.indexOf('.json') !== -1) {
-                            return parseJSON(payload, callback, options);
-                        } else {
-                            return parseXML(payload, callback, options);
-                        }
+                        return parseXML(payload, callback, options);
                     }
                 }
             }
@@ -1098,6 +1078,12 @@ export default {
         var hadRequests = hasInflightRequests(_tileCache);
         abortUnwantedRequests(_tileCache, tiles);
         if (hadRequests && !hasInflightRequests(_tileCache)) {
+            if (_rateLimitError) {
+                // was rate limited, but has settled
+                _rateLimitError = undefined;
+                dispatch.call('change');
+                this.reloadApiStatus();
+            }
             dispatch.call('loaded');    // stop the spinner
         }
 
@@ -1123,23 +1109,43 @@ export default {
 
         _tileCache.inflight[tile.id] = this.loadFromAPI(
             path + tile.extent.toParam(),
-            tileCallback,
+            tileCallback.bind(this),
             options
         );
 
         function tileCallback(err, parsed) {
-            delete _tileCache.inflight[tile.id];
             if (!err) {
+                delete _tileCache.inflight[tile.id];
                 delete _tileCache.toLoad[tile.id];
                 _tileCache.loaded[tile.id] = true;
                 var bbox = tile.extent.bbox();
                 bbox.id = tile.id;
                 _tileCache.rtree.insert(bbox);
+            } else {
+                // map tile loading error: e.g. network connection error,
+                // 509 Bandwidth Limit Exceeded, 429 Too Many Requests
+                if (!_rateLimitError && err.status === 509 || err.status === 429) {
+                    // show "API rate limiting" warning
+                    _rateLimitError = err;
+                    dispatch.call('change');
+                    this.reloadApiStatus();
+                }
+                setTimeout(() => {
+                    // retry loading the tiles
+                    delete _tileCache.inflight[tile.id];
+                    this.loadTile(tile, callback);
+                }, 8000);
             }
             if (callback) {
                 callback(err, Object.assign({ data: parsed }, tile));
             }
             if (!hasInflightRequests(_tileCache)) {
+                if (_rateLimitError) {
+                    // was rate limited, but has settled
+                    _rateLimitError = undefined;
+                    dispatch.call('change');
+                    this.reloadApiStatus();
+                }
                 dispatch.call('loaded');     // stop the spinner
             }
         }

modules/svg/local_photos.js

@@ -17,6 +17,7 @@ export function svgLocalPhotos(projection, context, dispatch) {
     let _photos = [];
     let _idAutoinc = 0;
     let _photoFrame;
+    let _activePhotoIdx;
 
     function init() {
         if (_initialized) return;  // run once
@@ -66,14 +67,43 @@ export function svgLocalPhotos(projection, context, dispatch) {
             .append('div')
             .attr('class', 'photo-attribution photo-attribution-dual fillD');
 
+        const controlsEnter = viewerEnter
+            .append('div')
+            .attr('class', 'photo-controls-wrap')
+            .append('div')
+            .attr('class', 'photo-controls-local');
+
+        controlsEnter
+            .append('button')
+            .classed('back', true)
+            .on('click.back', () => stepPhotos(-1))
+            .text('◀');
+
+        controlsEnter
+            .append('button')
+            .classed('forward', true)
+            .on('click.forward', () => stepPhotos(1))
+            .text('▶');
+
         return planePhotoFrame.init(context, viewerEnter)
             .then(planePhotoFrame => {
                 _photoFrame = planePhotoFrame;
             });
     }
 
+    function stepPhotos(stepBy){
+        if (!_photos || _photos.length === 0) return;
+        if (_activePhotoIdx === undefined) _activePhotoIdx = 0;
+
+        const newIndex = _activePhotoIdx + stepBy;
+        _activePhotoIdx = Math.max(0, Math.min(_photos.length - 1, newIndex));
+
+        click(null, _photos[_activePhotoIdx], false);
+    }
+
     // opens the image at bottom left
     function click(d3_event, image, zoomTo) {
+        _activePhotoIdx = _photos.indexOf(image);
         ensureViewerLoaded(context).then(() => {
             const viewer = context.container().select('.photoviewer')
                 .datum(image)
@@ -82,6 +112,13 @@ export function svgLocalPhotos(projection, context, dispatch) {
             const viewerWrap = viewer.select('.local-photos-wrapper')
                 .classed('hide', false);
 
+            const controlsWrap = viewer.select('.photo-controls-wrap');
+
+            controlsWrap.select('.back')
+                .attr('disabled', _activePhotoIdx <= 0 ? true: null);
+            controlsWrap.select('.forward')
+                .attr('disabled', _activePhotoIdx >= _photos.length - 1  ? true: null);
+
             const attribution = viewerWrap.selectAll('.photo-attribution').text('');
 
             if (image.date) {

modules/ui/account.js

@@ -12,7 +12,15 @@ export function uiAccount(context) {
     if (!osm.authenticated()) {  // logged out
       render(selection, null);
     } else {
-      osm.userDetails((err, user) => render(selection, user));
+      osm.userDetails((err, user) => {
+        if (err && err.status === 401) {
+          // 401 Unauthorized
+          // cannot load own user data: there must be something wrong (e.g. API token was revoked)
+          // -> log out to allow user to reauthenticate
+          osm.logout();
+        }
+        render(selection, user);
+      });
     }
   }
 

modules/ui/feature_list.js

@@ -120,7 +120,7 @@ export function uiFeatureList(context) {
             var result = [];
             var graph = context.graph();
             var visibleCenter = context.map().extent().center();
-            var q = search.property('value').toLowerCase();
+            var q = search.property('value').toLowerCase().trim();
 
             if (!q) return result;
 
@@ -132,16 +132,18 @@ export function uiFeatureList(context) {
 
                 const isLatLonValid = latLon[0] >= -90 && latLon[0] <= 90 && latLon[1] >= -180 && latLon[1] <= 180;
                 let   isLonLatValid = lonLat[0] >= -90 && lonLat[0] <= 90 && lonLat[1] >= -180 && lonLat[1] <= 180;
-                isLonLatValid &&= !q.match(/[NSEW]/i);
-                isLonLatValid &&= lonLat[0] !== lonLat[1];
+                isLonLatValid &&= !q.match(/[NSEW]/i);     // don't flip coords with explicit cardinal directions
+                isLonLatValid &&= !locationMatch[2];       // don't flip zoom/x/y coords
+                isLonLatValid &&= lonLat[0] !== lonLat[1]; // don't flip when lat=lon
 
                 if (isLatLonValid) {
                     result.push({
                         id: latLon[0] + '/' + latLon[1],
                         geometry: 'point',
                         type: t('inspector.location'),
                         name: dmsCoordinatePair([latLon[1], latLon[0]]),
-                        location: latLon
+                        location: latLon,
+                        zoom: locationMatch[2]
                     });
                 }
                 if (isLonLatValid) {
@@ -369,7 +371,7 @@ export function uiFeatureList(context) {
             d3_event.preventDefault();
 
             if (d.location) {
-                context.map().centerZoomEase([d.location[1], d.location[0]], 19);
+                context.map().centerZoomEase([d.location[1], d.location[0]], d.zoom || 19);
 
             } else if (d.entity) {
                 utilHighlightEntities([d.id], false, context);

modules/ui/sections/background_display_options.js

@@ -74,7 +74,7 @@ export function uiSectionBackgroundDisplayOptions(context) {
             .attr('type', 'range')
             .attr('min', _minVal)
             .attr('max', _maxVal)
-            .attr('step', '0.05')
+            .attr('step', '0.01')
             .on('input', function(d3_event, d) {
                 var val = d3_select(this).property('value');
                 if (!val && d3_event && d3_event.target) {

modules/ui/splash.js

@@ -17,7 +17,7 @@ export function uiSplash(context) {
     let updateMessage = '';
     const sawPrivacyVersion = prefs('sawPrivacyVersion');
     let showSplash = !prefs('sawSplash');
-    if (sawPrivacyVersion !== context.privacyVersion) {
+    if (sawPrivacyVersion && sawPrivacyVersion !== context.privacyVersion) {
       updateMessage = t('splash.privacy_update');
       showSplash = true;
     }