Layers work

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

diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index bff1ab239bd2a39c3e027cb0c1be1b67104ec6c0..3715cbf9970a57a185dafe3c8f0ee1c68f832722 100644 (file)
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -11,10 +11,14 @@ $(document).ready(function () {
   }
 
   function startExport(sidebarHtml) {
   }
 
   function startExport(sidebarHtml) {

-    var marker, rectangle;
+    var marker;

 
 

-    var drawHandler = new L.Rectangle.Draw(map, {title: I18n.t('export.start_rjs.drag_a_box')});
-    map.on('draw:rectangle-created', endDrag);
+    var locationFilter = new L.LocationFilter({
+      enableButton: false,
+      adjustButton: false
+    }).addTo(map);
+
+    locationFilter.on("change", filterChanged);

 
     map.on("moveend", mapMoved);
     map.on("baselayerchange", htmlUrlChanged);
 
     map.on("moveend", mapMoved);
     map.on("baselayerchange", htmlUrlChanged);


@@ -24,7 +28,7 @@ $(document).ready(function () {
 
     $("#maxlat,#minlon,#maxlon,#minlat").change(boundsChanged);
 
 
     $("#maxlat,#minlon,#maxlon,#minlat").change(boundsChanged);
 

-    $("#drag_box").click(startDrag);
+    $("#drag_box").click(enableFilter);

 
     $("#add_marker").click(startMarker);
 
 
     $("#add_marker").click(startMarker);
 


@@ -34,7 +38,7 @@ $(document).ready(function () {
 
     openSidebar();
 
 
     openSidebar();
 

-    if (map.hasLayer(layers[0].layer)) {
+    if (getMapBaseLayerId() == "mapnik") {

       $("#format_mapnik").prop("checked", true);
     }
 
       $("#format_mapnik").prop("checked", true);
     }
 


@@ -46,14 +50,12 @@ $(document).ready(function () {
     $("#sidebar").one("closed", function () {
       $("body").removeClass("site-export").addClass("site-index");
 
     $("#sidebar").one("closed", function () {
       $("body").removeClass("site-export").addClass("site-index");
 

-      clearBox();
+      map.removeLayer(locationFilter);

       clearMarker();
 
       map.off("moveend", mapMoved);
       map.off("baselayerchange", htmlUrlChanged);
       clearMarker();
 
       map.off("moveend", mapMoved);
       map.off("baselayerchange", htmlUrlChanged);

-      map.off('draw:rectangle-created', endDrag);
-
-      drawHandler.disable();
+      locationFilter.off("change", filterChanged);

     });
 
     function getBounds() {
     });
 
     function getBounds() {


@@ -65,7 +67,7 @@ $(document).ready(function () {
       var bounds = map.getBounds(),
         centerLat = bounds.getCenter().lat,
         halfWorldMeters = 6378137 * Math.PI * Math.cos(centerLat * Math.PI / 180),
       var bounds = map.getBounds(),
         centerLat = bounds.getCenter().lat,
         halfWorldMeters = 6378137 * Math.PI * Math.cos(centerLat * Math.PI / 180),

-        meters = halfWorldMeters * (bounds.getNorthEast().lng - bounds.getSouthWest().lng) / 180,
+        meters = halfWorldMeters * (bounds.getEast() - bounds.getWest()) / 180,

         pixelsPerMeter = map.getSize().x / meters,
         metersPerPixel = 1 / (92 * 39.3701);
       return Math.round(1 / (pixelsPerMeter * metersPerPixel));
         pixelsPerMeter = map.getSize().x / meters,
         metersPerPixel = 1 / (92 * 39.3701);
       return Math.round(1 / (pixelsPerMeter * metersPerPixel));


@@ -80,36 +82,25 @@ $(document).ready(function () {
     function boundsChanged() {
       var bounds = getBounds();
 
     function boundsChanged() {
       var bounds = getBounds();
 

-      map.off("moveend", mapMoved);

       map.fitBounds(bounds);
       map.fitBounds(bounds);

+      locationFilter.setBounds(bounds);

 
 

-      clearBox();
-      drawBox(bounds);
-
+      enableFilter();

       validateControls();
       mapnikSizeChanged();
     }
 
       validateControls();
       mapnikSizeChanged();
     }
 

-    function startDrag() {
-      $("#drag_box").html(I18n.t('export.start_rjs.drag_a_box'));
-
-      clearBox();
-      drawHandler.enable();
-    }
-
-    function endDrag(e) {
-      var bounds = e.rect.getBounds();
-
-      map.off("moveend", mapMoved);
-      setBounds(bounds);
-      drawBox(bounds);
-      validateControls();
+    function enableFilter() {
+      if (!locationFilter.getBounds().isValid()) {
+        locationFilter.setBounds(map.getBounds().pad(-0.2));
+      }

 
 

-      $("#drag_box").html(I18n.t('export.start_rjs.manually_select'));
+      $("#drag_box").hide();
+      locationFilter.enable();

     }
 
     }
 

-    function transformComplete(event) {
-      setBounds(event.feature.geometry.bounds);
+    function filterChanged() {
+      setBounds(locationFilter.getBounds());

       validateControls();
     }
 
       validateControls();
     }
 


@@ -152,34 +143,24 @@ $(document).ready(function () {
     }
 
     function mapMoved() {
     }
 
     function mapMoved() {

-      setBounds(map.getBounds());
-      validateControls();
+      if (!locationFilter.isEnabled()) {
+        setBounds(map.getBounds());
+        validateControls();
+      }

     }
 
     function setBounds(bounds) {
       var toPrecision = zoomPrecision(map.getZoom());
 
     }
 
     function setBounds(bounds) {
       var toPrecision = zoomPrecision(map.getZoom());
 

-      $("#minlon").val(toPrecision(bounds.getWestLng()));
-      $("#minlat").val(toPrecision(bounds.getSouthLat()));
-      $("#maxlon").val(toPrecision(bounds.getEastLng()));
-      $("#maxlat").val(toPrecision(bounds.getNorthLat()));
+      $("#minlon").val(toPrecision(bounds.getWest()));
+      $("#minlat").val(toPrecision(bounds.getSouth()));
+      $("#maxlon").val(toPrecision(bounds.getEast()));
+      $("#maxlat").val(toPrecision(bounds.getNorth()));

 
       mapnikSizeChanged();
       htmlUrlChanged();
     }
 
 
       mapnikSizeChanged();
       htmlUrlChanged();
     }
 

-    function clearBox() {
-      if (rectangle) {
-        map.removeLayer(rectangle);
-      }
-      rectangle = null;
-    }
-
-    function drawBox(bounds) {
-      rectangle = L.rectangle(bounds);
-      rectangle.addTo(map);
-    }
-

     function validateControls() {
       var bounds = getBounds();
 
     function validateControls() {
       var bounds = getBounds();
 


@@ -205,9 +186,9 @@ $(document).ready(function () {
 
     function htmlUrlChanged() {
       var bounds = getBounds();
 
     function htmlUrlChanged() {
       var bounds = getBounds();

-      var layerName = getMapBaseLayer().keyid;
+      var layerName = getMapBaseLayerId();

 
 

-      var url = "http://" + OSM.SERVER_URL + "/export/embed.html?bbox=" + bounds.toBBOX() + "&layer=" + layerName;
+      var url = "http://" + OSM.SERVER_URL + "/export/embed.html?bbox=" + bounds.toBBoxString() + "&layer=" + layerName;

       var markerUrl = "";
 
       if ($("#marker_lat").val() && $("#marker_lon").val()) {
       var markerUrl = "";
 
       if ($("#marker_lat").val() && $("#marker_lon").val()) {


@@ -273,16 +254,16 @@ $(document).ready(function () {
     }
 
     function maxMapnikScale() {
     }
 
     function maxMapnikScale() {

-      var bounds = getMercatorBounds();
+      var size = getMercatorBounds().getSize();

 
 

-      return Math.floor(Math.sqrt(bounds.getWidth() * bounds.getHeight() / 0.3136));
+      return Math.floor(Math.sqrt(size.x * size.y / 0.3136));

     }
 
     function mapnikImageSize(scale) {
     }
 
     function mapnikImageSize(scale) {

-      var bounds = getMercatorBounds();
+      var size = getMercatorBounds().getSize();

 
 

-      return {w: Math.round(bounds.getWidth() / scale / 0.00028),
-              h: Math.round(bounds.getHeight() / scale / 0.00028)};
+      return {w: Math.round(size.x / scale / 0.00028),
+              h: Math.round(size.y / scale / 0.00028)};

     }
 
     function roundScale(scale) {
     }
 
     function roundScale(scale) {