Merge remote-tracking branch 'osmlab/map-ui'

diff --cc app/assets/javascripts/application.js
Simple merge

diff --cc app/assets/javascripts/index.js
index 15acc64124f69d19d3343fda9b4349d05552c844,4724351ce614ab6bc03545880863d7afb62ba862..bae80cac5069480ff60a9fe3ab4cf3e857a77ac8
--- 1/app/assets/javascripts/index.js
--- 2/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@@ -195,7 -185,7 +185,7 @@@ function setPositionLink(map) 
        }
  
        if (data.type && data.id) {
-         addObjectToMap(data, map, { zoom: false, style: { opacity: 0.2, fill: false } });
 -        map.addObject(data, { zoom: true, style: { opacity: 0.2, fill: false } });
++        map.addObject(data, { zoom: false, style: { opacity: 0.2, fill: false } });
        }
  
        map.markerLayer.clearLayers();