Parse asset map JSON before passing it to iD

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 796a5f4d31d85f4ced3929b12cda6f091798cef3..b30564a1ae64b12ee3c7a98aff01b1c131da8c26 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -7,6 +7,8 @@
 //= require leaflet.share
 //= require leaflet.polyline
 //= require leaflet.query
 //= require leaflet.share
 //= require leaflet.polyline
 //= require leaflet.query

+//= require leaflet.contextmenu
+//= require index/contextmenu

 //= require index/search
 //= require index/browse
 //= require index/export
 //= require index/search
 //= require index/browse
 //= require index/export


@@ -77,7 +79,8 @@ $(document).ready(function () {
 
   var map = new L.OSM.Map("map", {
     zoomControl: false,
 
   var map = new L.OSM.Map("map", {
     zoomControl: false,

-    layerControl: false
+    layerControl: false,
+    contextmenu: true

   });
 
   map.attributionControl.setPrefix('');
   });
 
   map.attributionControl.setPrefix('');


@@ -147,6 +150,8 @@ $(document).ready(function () {
   L.control.scale()
     .addTo(map);
 
   L.control.scale()
     .addTo(map);
 

+  OSM.initializeContextMenu(map);
+

   if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {
     OSM.initializeNotes(map);
     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
   if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {
     OSM.initializeNotes(map);
     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {


@@ -157,6 +162,10 @@ $(document).ready(function () {
     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }
     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }

+
+    if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) {
+      map.addLayer(map.gpsLayer);
+    }

   }
 
   var placement = $('html').attr('dir') === 'rtl' ? 'right' : 'left';
   }
 
   var placement = $('html').attr('dir') === 'rtl' ? 'right' : 'left';