Merge branch 'redmine-issue/14444' into 'develop'

REDMINE_ISSUE-14444

See merge request !447

src/services/map-service.js

@@ -561,7 +561,12 @@ const mapService = {
                   </div>
                   ${author}
                   `;
-    const featureId = feature.getProperties ? feature.getProperties().feature_id || feature.getId() : feature.id; //* feature.id was used with leaflet, with ol feature.getId replace it, but keeping it as fallback can prevent regression
+    const featureId =
+      feature.getId() ?
+        feature.getId() :
+        feature.getProperties ?
+          feature.getProperties().feature_id :
+          feature.id;
     return { html, feature_type, featureId };
   },