From: Tom Hughes <tom@compton.nu>
Date: Sat, 1 Dec 2012 18:22:30 +0000 (+0000)
Subject: Merge branch 'master' into notes
X-Git-Tag: live~5072^2~66
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/78f608b114c05f1147936a57b930831e28000c1a

Merge branch 'master' into notes

Conflicts:
	app/assets/javascripts/browse.js
	app/assets/javascripts/map.js.erb
	app/assets/stylesheets/common.css.scss
	app/views/site/index.html.erb
---

78f608b114c05f1147936a57b930831e28000c1a
diff --cc app/assets/javascripts/browse.js
index 906bb0bae,c3d67e57e..fb6d2d304
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@@ -40,23 -42,8 +42,24 @@@ $(document).ready(function () 
        return remoteEditHandler(bbox);
      });
  
+     var centre = bbox.getCenter();
 -    updatelinks(centre.lng, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
 +    updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
 +  } else if (params.type == "note") {
 +    var centre = new OpenLayers.LonLat(params.lon, params.lat);
 +
 +    setMapCenter(centre, 16);
 +    addMarkerToMap(centre);
 +
 +    var bbox = unproj(map.getExtent());
 +
 +    $("#loading").hide();
 +    $("#browse_map .geolink").show();
 +
 +    $("a[data-editor=remote]").click(function () {
 +      return remoteEditHandler(bbox);
 +    });
 +
 +    updatelinks(centre.lon, centre.lat, 16, null, bbox.left, bbox.bottom, bbox.right, bbox.top)
    } else {
      $("#object_larger_map").hide();
      $("#object_edit").hide();
diff --cc app/assets/javascripts/index.js
index c0decd6a6,c908f1e34..c90d96c39
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@@ -1,9 -2,9 +2,10 @@@
  //= require index/browse
  //= require index/export
  //= require index/key
 +//= require index/notes
  
  $(document).ready(function () {
+   var permalinks = $("#permalink").html();
    var marker;
    var params = OSM.mapParams();
    var map = createMap("map");
diff --cc app/assets/javascripts/map.js.erb
index 4c1a849dc,291633f53..f069eee99
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@@ -1,111 -1,126 +1,128 @@@
- var epsg4326 = new OpenLayers.Projection("EPSG:4326");
+ // Leaflet extensions
+ L.LatLngBounds.include({
+   getSouthLat: function () {
+     return this._southWest.lat;
+   },
+ 
+   getWestLng: function () {
+     return this._southWest.lng;
+   },
+ 
+   getNorthLat: function () {
+     return this._northEast.lat;
+   },
+ 
+   getEastLng: function () {
+     return this._northEast.lng;
+   },
+ 
+   toBBOX: function () {
+     var decimal = 6;
+     var mult = Math.pow(10, decimal);
+     var xmin = Math.round(this.getWestLng() * mult) / mult;
+     var ymin = Math.round(this.getSouthLat() * mult) / mult;
+     var xmax = Math.round(this.getEastLng() * mult) / mult;
+     var ymax = Math.round(this.getNorthLat() * mult) / mult;
+     return xmin + "," + ymin + "," + xmax + "," + ymax;
+   },
+ 
+   getSize: function () {
+     return (this._northEast.lat - this._southWest.lat) *
+            (this._northEast.lng - this._southWest.lng);
+   }
+ });
+ 
+ L.Bounds.include({
+   getWidth: function () {
+    return this.max.x - this.min.x;
+   },
+ 
+   getHeight: function () {
+    return this.max.y - this.min.y;
+   }
+ });
+ 
+ L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
+ 
  var map;
- var markers;
- var vectors;
- var popup;
+ 
+ var layers = [
+   {
+     klass: L.OSM.Mapnik,
+     attribution: "",
+     keyid: "mapnik",
+     layerCode: "M",
+     name: I18n.t("javascripts.map.base.standard")
+   },
+   {
+     klass: L.OSM.CycleMap,
+     attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+     keyid: "cyclemap",
+     layerCode: "C",
+     name: I18n.t("javascripts.map.base.cycle_map")
+   },
+   {
+     klass: L.OSM.TransportMap,
+     attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+     keyid: "transportmap",
+     layerCode: "T",
+     name: I18n.t("javascripts.map.base.transport_map")
+   },
+   {
+     klass: L.OSM.MapQuestOpen,
+     attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
+     keyid: "mapquest",
+     layerCode: "Q",
+     name: I18n.t("javascripts.map.base.mapquest")
+   }
+ ];
  
  function createMap(divName, options) {
-    options = options || {};
- 
-    map = new OpenLayers.Map(divName, {
-       controls: options.controls || [
-          new OpenLayers.Control.ArgParser(),
-          new OpenLayers.Control.Attribution(),
-          new SimpleLayerSwitcher(),
-          new OpenLayers.Control.Navigation(),
-          new OpenLayers.Control.Zoom(),
-          new OpenLayers.Control.SimplePanZoom(),
-          new OpenLayers.Control.ScaleLine({geodesic: true})
-       ],
-       numZoomLevels: 20,
-       displayProjection: new OpenLayers.Projection("EPSG:4326"),
-       theme: "<%= asset_path 'theme/openstreetmap/style.css' %>"
-    });
- 
-    var mapnik = new OpenLayers.Layer.OSM.Mapnik(I18n.t("javascripts.map.base.standard"), {
-       attribution: "",
-       keyid: "mapnik",
-       displayOutsideMaxExtent: true,
-       wrapDateLine: true,
-       layerCode: "M"
-    });
-    map.addLayer(mapnik);
- 
-    var cyclemap = new OpenLayers.Layer.OSM.CycleMap(I18n.t("javascripts.map.base.cycle_map"), {
-       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-       keyid: "cyclemap",
-       displayOutsideMaxExtent: true,
-       wrapDateLine: true,
-       layerCode: "C"
-    });
-    map.addLayer(cyclemap);
- 
-    var transportmap = new OpenLayers.Layer.OSM.TransportMap(I18n.t("javascripts.map.base.transport_map"), {
-       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-       keyid: "transportmap",
-       displayOutsideMaxExtent: true,
-       wrapDateLine: true,
-       layerCode: "T"
-    });
-    map.addLayer(transportmap);
- 
-    var mapquest = new OpenLayers.Layer.OSM(I18n.t("javascripts.map.base.mapquest"), [
-       "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
-       "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
-       "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
-       "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png"
-    ], {
-       attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
-       keyid: "mapquest",
-       displayOutsideMaxExtent: true,
-       wrapDateLine: true,
-       numZoomLevels: 19,
-       layerCode: "Q"
-    });
-    map.addLayer(mapquest);
- 
-    markers = new OpenLayers.Layer.Markers("Markers", {
-       displayInLayerSwitcher: false,
-       numZoomLevels: 20,
-       projection: "EPSG:900913"
-    });
-    map.addLayer(markers);
- 
-    map.dataLayer = new OpenLayers.Layer(I18n.t('browse.start_rjs.data_layer_name'), {
-      visibility: false,
-      displayInLayerSwitcher: false
-    });
-    map.addLayer(map.dataLayer);
- 
-    $("#" + divName).on("resized", function () {
-      map.updateSize();
-    });
- 
-    $("#" + divName).trigger("initialised");
- 
-    return map;
- }
+   options = $.extend({zoomControl: true, panZoomControl: true, layerControl: true}, options);
  
- function getArrowIcon() {
-    var size = new OpenLayers.Size(25, 22);
-    var offset = new OpenLayers.Pixel(-22, -20);
-    var icon = new OpenLayers.Icon("<%= asset_path 'arrow.png' %>", size, offset);
+   map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));
  
-    return icon;
- }
+   if (map.attributionControl) {
+     map.attributionControl.setPrefix('');
+   }
+ 
+   if (options.panZoomControl) {
+     new L.Control.Pan().addTo(map);
+     new L.Control.Zoomslider({stepHeight: 7}).addTo(map);
+   }
+ 
+   var layersControl = L.control.layers();
+ 
+   if (options.layerControl) {
+     layersControl.addTo(map);
+     map.layersControl = layersControl;
+   }
+ 
+   for (var i = 0; i < layers.length; i++) {
+     layers[i].layer = new (layers[i].klass)(layers[i]);
+     layersControl.addBaseLayer(layers[i].layer, layers[i].name);
+   }
  
- function addMarkerToMap(position, icon, description) {
-    var marker = new OpenLayers.Marker(proj(position), icon);
+   layers[0].layer.addTo(map);
  
-    markers.addMarker(marker);
+   $("#" + divName).on("resized", function () {
+     map.invalidateSize();
+   });
  
-    if (description) {
-        marker.events.register("mouseover", marker, function() {
-            openMapPopup(marker, description);
-        });
-    }
++ $("#" + divName).trigger("initialised");
 +
-    return marker;
+   return map;
+ }
+ 
+ function getUserIcon(url) {
+   return L.icon({
+     iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
+     iconSize: [25, 41],
+     iconAnchor: [12, 41],
+     popupAnchor: [1, -34],
+     shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>,
+     shadowSize: [41, 41]
+   });
  }
  
  function addObjectToMap(object, zoom, callback) {
diff --cc app/assets/stylesheets/common.css.scss
index ec06997f8,654bbab97..413133e45
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@@ -460,17 -454,13 +454,19 @@@ body.site-export #tabnav a#exportancho
    padding: 5px;
  }
  
 +#permalink a.disabled {
 +  color: #ccc;
 +  cursor: default;
 +  text-decoration: none;
 +}
 +
- .site-index #map .SimpleLayerSwitcher,
- .site-index #map .olControlSimplePanZoom,
- .site-export #map .SimpleLayerSwitcher,
- .site-export #map .olControlSimplePanZoom {
+ .site-index .leaflet-top,
+ .site-export .leaflet-top {
    top: 40px !important;
+ 
+   .leaflet-control {
+     margin-top: 0px !important;
+   }
  }
  
  .site-index #map .olControlScaleLine,
diff --cc app/views/site/index.html.erb
index d4c33fcfd,88bf49073..06516a16f
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@@ -2,13 -2,6 +2,12 @@@
    <%= javascript_include_tag "index" %>
  <% end %>
  
 +<% unless STATUS == :api_offline or STATUS == :database_offline -%>
 +  <% content_for :editmenu do -%>
 +    <li><%= link_to t("browse.start_rjs.notes_layer_name"), notes_url(:format => :json), :id => "show_notes" %></li>
-     <li><%= link_to t("browse.start_rjs.data_layer_name"), { :controller => :browse, :action => :start }, :id => "show_data" %></li>
 +  <% end -%>
 +<% end -%>
 +
  <% content_for :left_menu do %>
    <li><h4><%= link_to t("site.key.map_key"), {:action => :key}, :id => "open_map_key", :title => t("site.key.map_key_tooltip") %></h4></li>
  <% end %>
diff --cc config/locales/en.yml
index ffd180d36,0c21b9027..806b9ddd3
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -221,11 -219,7 +221,8 @@@ en
        relation_title: "Relation: %{relation_name}"
        download_xml: "Download XML"
        view_history: "View history"
-     start:
-       view_data: "View data for current map view"
-       manually_select: "Manually select a different area"
      start_rjs:
 +      notes_layer_name: "Browse Notes"
        data_layer_name: "Browse Map Data"
        data_frame_title: "Data"
        zoom_or_select: "Zoom in or select an area of the map to view"