Hotfix: reverse geocoding error handling was broken

City-of-Helsinki · Apr 26, 2018 · ebd064c · ebd064c
1 parent 264fbd1
commit ebd064c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/map-view.coffee b/src/map-view.coffee
@@ -299,9 +299,13 @@ define (require) ->
                     .setContent popupContents
                         name: address
 
-            positionObject.reverseGeocode?().done =>
+            success = =>
                 popup.setContent popupContents
                     name: positionObject.humanAddress()
+            error = =>
+                popup.setContent popupContents
+                    name: i18n.t('map.unknown_address')
+            positionObject.reverseGeocode?().done(success).fail(error)
             popup
 
         createStatisticsPopup: (positionObject, statistic) ->

diff --git a/src/models.coffee b/src/models.coffee
@@ -577,7 +577,8 @@ define (require) ->
                     @listenTo posList, 'sync', =>
                         bestMatch = posList.first()
                         if bestMatch.get('distance') > 500
-                            bestMatch.set 'name', i18n.t 'map.unknown_address'
+                            deferred.reject()
+                            return
                         @set bestMatch.toJSON()
                         deferred.resolve()
                         @trigger 'reverse-geocode'