Fix export

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index c9316ebae2df558d6a2d5b30ce23a96e929989cb..9a975c11c1d4884c7f3adf2e00e7961e7c2bdd99 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,12 +1,12 @@
 //= require_self
 //= require_self

+//= require leaflet.customzoom
+//= require leaflet.locate

 //= require leaflet.layers
 //= require leaflet.layers

-//= require leaflet.share
+//= require leaflet.key

 //= require leaflet.note
 //= require leaflet.note

-//= require leaflet.locate
-//= require leaflet.customzoom
+//= require leaflet.share

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

-//= require index/key

 //= require index/notes
 
 $(document).ready(function () {
 //= require index/notes
 
 $(document).ready(function () {


@@ -48,6 +48,9 @@ $(document).ready(function () {
 
   layers[0].addTo(map);
 
 
   layers[0].addTo(map);
 

+  map.noteLayer = new L.LayerGroup({code: 'N'});
+  map.dataLayer = new L.OSM.DataLayer(null);
+

   $("#map").on("resized", function () {
     map.invalidateSize();
   });
   $("#map").on("resized", function () {
     map.invalidateSize();
   });


@@ -55,6 +58,9 @@ $(document).ready(function () {
   L.control.customZoom({position: 'topright'})
     .addTo(map);
 
   L.control.customZoom({position: 'topright'})
     .addTo(map);
 

+  L.control.locate({position: 'topright'})
+    .addTo(map);
+

   var uiPane = $('#map-ui')[0];
 
   L.OSM.layers({
   var uiPane = $('#map-ui')[0];
 
   L.OSM.layers({


@@ -63,14 +69,23 @@ $(document).ready(function () {
     uiPane: uiPane
   }).addTo(map);
 
     uiPane: uiPane
   }).addTo(map);
 

-  L.control.share({
+  L.OSM.key({
+    position: 'topright',
+    uiPane: uiPane
+  }).addTo(map);
+
+  L.OSM.note({
+    position: 'topright',
+    uiPane: uiPane
+  }).addTo(map);
+
+  L.OSM.share({

     getUrl: getShortUrl,
     uiPane: uiPane
   }).addTo(map);
 
     getUrl: getShortUrl,
     uiPane: uiPane
   }).addTo(map);
 

-  L.control.note({ position: 'topright' }).addTo(map);
-  L.control.locate({ position: 'topright' }).addTo(map);
-  L.control.scale().addTo(map);
+  L.control.scale()
+    .addTo(map);

 
   map.on('moveend layeradd layerremove', updateLocation);
 
 
   map.on('moveend layeradd layerremove', updateLocation);
 


@@ -146,6 +161,7 @@ $(document).ready(function () {
     $("#query").focus();
   }
 
     $("#query").focus();
   }
 

+  initializeExport(map);

   initializeBrowse(map);
   initializeNotes(map);
 });
   initializeBrowse(map);
   initializeNotes(map);
 });