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 <a href='http://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
+ var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'https://donate.openstreetmap.org'});
+
+ this.baseLayers = [];
+
+ this.baseLayers.push(new L.OSM.Mapnik({
+ attribution: copyright + " ♥ " + donate,
+ code: "M",
+ keyid: "mapnik",
+ name: I18n.t("javascripts.map.base.standard")
+ }));
+
+ if (OSM.THUNDERFOREST_KEY) {
+ this.baseLayers.push(new L.OSM.CycleMap({
+ attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
+ apikey: OSM.THUNDERFOREST_KEY,
code: "C",
keyid: "cyclemap",
name: I18n.t("javascripts.map.base.cycle_map")
- }),
- new L.OSM.TransportMap({
- attribution: copyright + ". Tiles courtesy of <a href='http://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
+ }));
+
+ this.baseLayers.push(new L.OSM.TransportMap({
+ attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
+ apikey: OSM.THUNDERFOREST_KEY,
code: "T",
keyid: "transportmap",
name: I18n.t("javascripts.map.base.transport_map")
- }),
- new L.OSM.MapQuestOpen({
- attribution: copyright + ". Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='https://developer.mapquest.com/content/osm/mq_logo.png'>",
- code: "Q",
- keyid: "mapquest",
- name: I18n.t("javascripts.map.base.mapquest")
- }),
- new L.OSM.HOT({
- attribution: copyright + ". Tiles courtesy of <a href='http://hot.openstreetmap.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>",
- code: "H",
- keyid: "hot",
- name: I18n.t("javascripts.map.base.hot")
- })
- ];
+ }));
+ }
+
+ this.baseLayers.push(new L.OSM.HOT({
+ attribution: copyright + ". Tiles style by <a href='https://www.hotosm.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>" + " hosted by <a href='https://openstreetmap.fr/' target='_blank'>OpenStreetMap France</a>",
+ 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';
+
+ this.gpsLayer = new L.OSM.GPS({
+ pane: "overlayPane",
+ code: "G",
+ name: I18n.t("javascripts.map.base.gps")
+ });
},
updateLayers: function(layerParam) {
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 == "") {
+ } else if (i === 0 && layersAdded === "") {
this.addLayer(this.baseLayers[i]);
} else {
this.removeLayer(this.baseLayers[i]);
params.mlon = latLng.lng.toFixed(precision);
}
- var url = 'http://' + OSM.SERVER_URL + '/',
+ var url = window.location.protocol + '//' + OSM.SERVER_URL + '/',
query = querystring.stringify(params),
hash = OSM.formatHash(this);
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/',
+ window.location.protocol + '//osm.org/go/' :
+ window.location.protocol + '//' + 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)),
return str;
},
+ getGeoUri: function(marker) {
+ var precision = OSM.zoomPrecision(this.getZoom()),
+ latLng,
+ params = {};
+
+ if (marker && this.hasLayer(marker)) {
+ latLng = marker.getLatLng().wrap();
+ } else {
+ latLng = this.getCenter();
+ }
+
+ params.lat = latLng.lat.toFixed(precision);
+ params.lon = latLng.lng.toFixed(precision);
+ params.zoom = this.getZoom();
+
+ return 'geo:' + params.lat + ',' + params.lon + '?z=' + params.zoom;
+ },
+
addObject: function(object, callback) {
var objectStyle = {
color: "#FF6200",
color: '#FF9500',
opacity: 1,
fillOpacity: 0,
- clickable: false
+ interactive: false
};
- this._object = object;
-
- if (this._objectLoader) this._objectLoader.abort();
- if (this._objectLayer) this.removeLayer(this._objectLayer);
+ this.removeObject();
var map = this;
this._objectLoader = $.ajax({
url: OSM.apiUrl(object),
dataType: "xml",
success: function (xml) {
+ map._object = object;
+
map._objectLayer = new L.OSM.DataLayer(null, {
styles: {
node: objectStyle,
return true;
} else if (object.type === "relation") {
for (var i = 0; i < relations.length; i++)
- if (relations[i].members.indexOf(node) != -1)
+ if (relations[i].members.indexOf(node) !== -1)
return true;
} else {
return false;
center: this.getCenter().wrap(),
zoom: this.getZoom(),
layers: this.getLayersCode()
- }
+ };
},
setState: function(state, options) {
}
});
-L.Icon.Default.imagePath = "/images";
+L.Icon.Default.imagePath = "/images/";
L.Icon.Default.imageUrls = {
"/images/marker-icon.png": OSM.MARKER_ICON,
}
});
-function getUserIcon(url) {
+OSM.getUserIcon = function (url) {
return L.icon({
iconUrl: url || OSM.MARKER_RED,
iconSize: [25, 41],
shadowUrl: OSM.MARKER_SHADOW,
shadowSize: [41, 41]
});
-}
+};
projects / rails.git / blobdiff