Use custom zoom control everywhere

app/assets/javascripts/application.js

@@ -5,6 +5,7 @@
 //= require augment
 //= require leaflet
 //= require leaflet.osm
+//= require leaflet.zoom
 //= require leaflet.extend
 //= require leaflet.locationfilter
 //= require i18n/translations

app/assets/javascripts/browse.js

@@ -5,7 +5,7 @@ $(document).ready(function () {
     zoomControl: false
   }).addLayer(new L.OSM.Mapnik());
 
-  L.control.zoom({position: 'topright'})
+  L.OSM.zoom()
     .addTo(map);
 
   $("#small_map").on("resized", function () {

app/assets/javascripts/changeset.js

@@ -6,7 +6,7 @@ $(document).ready(function () {
     zoomControl: false
   }).addLayer(new L.OSM.Mapnik());
 
-  L.control.zoom({position: 'topright'})
+  L.OSM.zoom()
     .addTo(map);
 
   $("#changeset_list_map").on("resized", function () {

app/assets/javascripts/diary_entry.js

@@ -27,7 +27,7 @@ $(document).ready(function () {
       zoomControl: false
     }).addLayer(new L.OSM.Mapnik());
 
-    L.control.zoom({position: 'topright'})
+    L.OSM.zoom()
       .addTo(map);
 
     $("#map").on("resized", function () {

app/assets/javascripts/index.js

@@ -1,6 +1,5 @@
 //= require_self
 //= require leaflet.sidebar
-//= require leaflet.customzoom
 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key
@@ -56,7 +55,7 @@ $(document).ready(function () {
     map.invalidateSize();
   });
 
-  L.control.customZoom({position: 'topright'})
+  L.OSM.zoom({position: 'topright'})
     .addTo(map);
 
   L.control.locate({position: 'topright'})

app/assets/javascripts/leaflet.zoom.js

@@ -1,10 +1,6 @@
-/*
- * L.Control.CustomZoom is used for the default zoom buttons on the map.
- */
-
-L.Control.CustomZoom = L.Control.extend({
+L.OSM.Zoom = L.Control.extend({
 	options: {
-		position: 'topleft'
+		position: 'topright'
 	},
 
 	onAdd: function (map) {
@@ -14,9 +10,9 @@ L.Control.CustomZoom = L.Control.extend({
 		this._map = map;
 
 		this._zoomInButton  = this._createButton(
-		        '', 'Zoom in',  zoomName + 'in',  container, this._zoomIn,  this);
+		        '', I18n.t('javascripts.map.zoom.in'),  zoomName + 'in',  container, this._zoomIn,  this);
 		this._zoomOutButton = this._createButton(
-		        '', 'Zoom out', zoomName + 'out', container, this._zoomOut, this);
+		        '', I18n.t('javascripts.map.zoom.out'), zoomName + 'out', container, this._zoomOut, this);
 
 		map.on('zoomend zoomlevelschange', this._updateDisabled, this);
 
@@ -71,6 +67,6 @@ L.Control.CustomZoom = L.Control.extend({
 	}
 });
 
-L.control.customZoom = function (options) {
-	return new L.Control.CustomZoom(options);
+L.OSM.zoom = function (options) {
+	return new L.OSM.Zoom(options);
 };

app/assets/javascripts/user.js

@@ -4,7 +4,7 @@ $(document).ready(function () {
     zoomControl: false
   }).addLayer(new L.OSM.Mapnik());
 
-  L.control.zoom({position: 'topright'})
+  L.OSM.zoom()
     .addTo(map);
 
   $("#map").on("resized", function () {

config/locales/en.yml

@@ -2046,6 +2046,9 @@ en:
       title: "Map Key"
       tooltip: "Key for the map"
     map:
+      zoom:
+        in: Zoom In
+        out: Zoom Out
       base:
         standard: Standard
         cycle_map: Cycle Map