Fix feedback loop between L.hash and popstate

[rails.git] / app / assets / javascripts / leaflet.extend.js.erb

diff --git a/app/assets/javascripts/leaflet.extend.js.erb b/app/assets/javascripts/leaflet.extend.js.erb
index 3b505302f300d23258de983307695f3c1ec5f9aa..cec25081b8b463b617c9f11638fa3e7e6ad74150 100644 (file)
--- a/app/assets/javascripts/leaflet.extend.js.erb
+++ b/app/assets/javascripts/leaflet.extend.js.erb
@@ -10,22 +10,175 @@ L.extend(L.LatLngBounds.prototype, {
 });
 
 L.extend(L.Map.prototype, {
 });
 
 L.extend(L.Map.prototype, {

-    getLayersCode: function() {
-        var layerConfig = '';
-        for (var i in this._layers) { // TODO: map.eachLayer
-            var layer = this._layers[i];
-            if (layer.options && layer.options.code) {
-                layerConfig += layer.options.code;
-            }
-        }
-        return layerConfig;
-    },
-    getMapBaseLayerId: function() {
-        for (var i in this._layers) { // TODO: map.eachLayer
-            var layer = this._layers[i];
-            if (layer.options && layer.options.keyid) return layer.options.keyid;
-        }
+  getLayersCode: function () {
+    var layerConfig = '';
+    for (var i in this._layers) { // TODO: map.eachLayer
+      var layer = this._layers[i];
+      if (layer.options && layer.options.code) {
+        layerConfig += layer.options.code;
+      }
+    }
+    return layerConfig;
+  },
+
+  getMapBaseLayerId: function () {
+    for (var i in this._layers) { // TODO: map.eachLayer
+      var layer = this._layers[i];
+      if (layer.options && layer.options.keyid) return layer.options.keyid;
+    }
+  },
+
+  getUrl: function(marker) {
+    var precision = zoomPrecision(this.getZoom()),
+        params = {};
+
+    if (marker && this.hasLayer(marker)) {
+      var latLng = marker.getLatLng().wrap();
+      params.mlat = latLng.lat.toFixed(precision);
+      params.mlon = latLng.lng.toFixed(precision);
+    }
+
+    if (this._object) {
+      params[this._object.type] = this._object.id;
+    }
+
+    var url = 'http://' + OSM.SERVER_URL + '/',
+      query = querystring.stringify(params),
+      hash = OSM.formatHash(this);
+
+    if (query) url += '?' + query;
+    if (hash) url += hash;
+
+    return url;
+  },
+
+  getShortUrl: function(marker) {
+    var zoom = this.getZoom(),
+      latLng = marker && this.hasLayer(marker) ? marker.getLatLng().wrap() : this.getCenter().wrap(),
+      str = window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
+        'http://osm.org/go/' : 'http://' + window.location.hostname + '/go/',
+      char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~",
+      x = Math.round((latLng.lng + 180.0) * ((1 << 30) / 90.0)),
+      y = Math.round((latLng.lat + 90.0) * ((1 << 30) / 45.0)),
+      // JavaScript only has to keep 32 bits of bitwise operators, so this has to be
+      // done in two parts. each of the parts c1/c2 has 30 bits of the total in it
+      // and drops the last 4 bits of the full 64 bit Morton code.
+      c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff),
+      digit;
+
+    for (var i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
+      digit = (c1 >> (24 - 6 * i)) & 0x3f;
+      str += char_array.charAt(digit);
+    }
+    for (i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) {
+      digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f;
+      str += char_array.charAt(digit);

     }
     }

+    for (i = 0; i < ((zoom + 8) % 3); ++i) str += "-";
+
+    // Called to interlace the bits in x and y, making a Morton code.
+    function interlace(x, y) {
+      x = (x | (x << 8)) & 0x00ff00ff;
+      x = (x | (x << 4)) & 0x0f0f0f0f;
+      x = (x | (x << 2)) & 0x33333333;
+      x = (x | (x << 1)) & 0x55555555;
+      y = (y | (y << 8)) & 0x00ff00ff;
+      y = (y | (y << 4)) & 0x0f0f0f0f;
+      y = (y | (y << 2)) & 0x33333333;
+      y = (y | (y << 1)) & 0x55555555;
+      return (x << 1) | y;
+    }
+
+    var params = {};
+
+    if (marker && this.hasLayer(marker)) {
+      params.m = '';
+    }
+
+    if (this._object) {
+      params[this._object.type] = this._object.id;
+    }
+
+    var query = querystring.stringify(params);
+    if (query) {
+      str += '?' + query;
+    }
+
+    return str;
+  },
+
+  addObject: function(object, options) {
+    this._object = object;
+
+    if (this._objectLoader) this._objectLoader.abort();
+    if (this._objectLayer) this.removeLayer(this._objectLayer);
+
+    var map = this;
+    this._objectLoader = $.ajax({
+      url: OSM.apiUrl(object),
+      dataType: "xml",
+      success: function (xml) {
+        map._objectLayer = new L.OSM.DataLayer(null, {
+          styles: {
+            node: options.style,
+            way: options.style,
+            area: options.style,
+            changeset: {
+              weight: 2,
+              color: '#e90',
+              fillOpacity: 0
+            }
+          }
+        });
+
+        map._objectLayer.interestingNode = function (node, ways, relations) {
+          if (object.type === "node") {
+            return true;
+          } else if (object.type === "relation") {
+            for (var i = 0; i < relations.length; i++)
+              if (relations[i].members.indexOf(node) != -1)
+                return true;
+          } else {
+            return false;
+          }
+        };
+
+        map._objectLayer.addData(xml);
+
+        var bounds = map._objectLayer.getBounds();
+
+        if (options.zoom && bounds.isValid()) map.fitBounds(bounds);
+        if (options.callback) options.callback(bounds);
+
+        map._objectLayer.addTo(map);
+      }
+    });
+  },
+
+  removeObject: function() {
+    this._object = null;
+    if (this._objectLoader) this._objectLoader.abort();
+    if (this._objectLayer) this.removeLayer(this._objectLayer);
+  }
+});
+
+L.Icon.Default.imagePath = "/images";
+
+L.Icon.Default.imageUrls = {
+  "/images/marker-icon.png": "<%= asset_path("images/marker-icon.png") %>",
+  "/images/marker-icon-2x.png": "<%= asset_path("images/marker-icon-2x.png") %>",
+  "/images/marker-shadow.png": "<%= asset_path("images/marker-shadow.png") %>",
+  "/images/marker-shadow-2x.png": "<%= asset_path("images/marker-shadow-2x.png") %>"
+};
+
+L.extend(L.Icon.Default.prototype, {
+  _oldGetIconUrl: L.Icon.Default.prototype._getIconUrl,
+
+  _getIconUrl:  function (name) {
+    var url = this._oldGetIconUrl(name);
+    return L.Icon.Default.imageUrls[url];
+  }

 });
 
 });
 

-L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
+L.Hash.prototype.parseHash = OSM.parseHash;
+L.Hash.prototype.formatHash = OSM.formatHash;