X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/14136b27c2e242ae3913b427113f5294be4b76e0..e418075e26d80d68e4127d3358a2d8b11dee3a13:/app/assets/javascripts/leaflet.map.js.erb?ds=sidebyside
diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb
index 606a713b7..f65325e37 100644
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -10,6 +10,68 @@ L.extend(L.LatLngBounds.prototype, {
});
L.OSM.Map = L.Map.extend({
+ initialize: function(id, options) {
+ L.Map.prototype.initialize.call(this, id, options);
+
+ var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
+ var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'http://donate.openstreetmap.org'});
+
+ this.baseLayers = [
+ new L.OSM.Mapnik({
+ attribution: copyright + " ♥ " + donate,
+ code: "M",
+ keyid: "mapnik",
+ name: I18n.t("javascripts.map.base.standard")
+ }),
+ new L.OSM.CycleMap({
+ attribution: copyright + ". Tiles courtesy of Andy Allan",
+ code: "C",
+ keyid: "cyclemap",
+ name: I18n.t("javascripts.map.base.cycle_map")
+ }),
+ new L.OSM.TransportMap({
+ attribution: copyright + ". Tiles courtesy of Andy Allan",
+ code: "T",
+ keyid: "transportmap",
+ name: I18n.t("javascripts.map.base.transport_map")
+ }),
+ new L.OSM.MapQuestOpen({
+ attribution: copyright + ". Tiles courtesy of MapQuest ",
+ code: "Q",
+ keyid: "mapquest",
+ name: I18n.t("javascripts.map.base.mapquest")
+ }),
+ new L.OSM.HOT({
+ attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team",
+ code: "H",
+ keyid: "hot",
+ name: I18n.t("javascripts.map.base.hot")
+ })
+ ];
+
+ this.noteLayer = new L.FeatureGroup();
+ this.noteLayer.options = {code: 'N'};
+
+ this.dataLayer = new L.OSM.DataLayer(null);
+ this.dataLayer.options.code = 'D';
+ },
+
+ updateLayers: function(layerParam) {
+ layerParam = layerParam || "M";
+ var layersAdded = "";
+
+ for (var i = this.baseLayers.length - 1; i >= 0; i--) {
+ if (layerParam.indexOf(this.baseLayers[i].options.code) >= 0) {
+ this.addLayer(this.baseLayers[i]);
+ layersAdded = layersAdded + this.baseLayers[i].options.code;
+ } else if (i == 0 && layersAdded == "") {
+ this.addLayer(this.baseLayers[i]);
+ } else {
+ this.removeLayer(this.baseLayers[i]);
+ }
+ }
+ },
+
getLayersCode: function () {
var layerConfig = '';
for (var i in this._layers) { // TODO: map.eachLayer
@@ -107,7 +169,22 @@ L.OSM.Map = L.Map.extend({
return str;
},
- addObject: function(object, options) {
+ addObject: function(object) {
+ var objectStyle = {
+ color: "#FF6200",
+ weight: 4,
+ opacity: 1,
+ fillOpacity: 0.5
+ };
+
+ var changesetStyle = {
+ weight: 4,
+ color: '#FF9500',
+ opacity: 1,
+ fillOpacity: 0,
+ clickable: false
+ };
+
this._object = object;
if (this._objectLoader) this._objectLoader.abort();
@@ -120,15 +197,10 @@ L.OSM.Map = L.Map.extend({
success: function (xml) {
map._objectLayer = new L.OSM.DataLayer(null, {
styles: {
- node: options.style,
- way: options.style,
- area: options.style,
- changeset: {
- weight: 1,
- color: '#FF9500',
- opacity: 1,
- fillOpacity: 0
- }
+ node: objectStyle,
+ way: objectStyle,
+ area: objectStyle,
+ changeset: changesetStyle
}
});
@@ -145,13 +217,16 @@ L.OSM.Map = L.Map.extend({
};
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);
+
+ if (!window.location.hash) {
+ var bounds = map._objectLayer.getBounds();
+ if (bounds.isValid()) {
+ OSM.router.moveListenerOff();
+ map.once('moveend', OSM.router.moveListenerOn);
+ map.fitBounds(bounds);
+ }
+ }
}
});
},
@@ -160,6 +235,14 @@ L.OSM.Map = L.Map.extend({
this._object = null;
if (this._objectLoader) this._objectLoader.abort();
if (this._objectLayer) this.removeLayer(this._objectLayer);
+ },
+
+ getState: function() {
+ return {
+ center: this.getCenter().wrap(),
+ zoom: this.getZoom(),
+ layers: this.getLayersCode()
+ }
}
});
@@ -181,9 +264,6 @@ L.extend(L.Icon.Default.prototype, {
}
});
-L.Hash.prototype.parseHash = OSM.parseHash;
-L.Hash.prototype.formatHash = OSM.formatHash;
-
function getUserIcon(url) {
return L.icon({
iconUrl: url || <%= asset_path('marker-red.png').to_json %>,