X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d0ed118ee24401a7e6117efa74522e67a9babba6..9d33721630e02ab9bed1d7853be4fcb5960d7b4f:/app/assets/javascripts/index.js
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 753cf4740..c9316ebae 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -9,38 +9,6 @@
//= require index/key
//= require index/notes
-function allLayers() {
- return [{
- layer: new L.OSM.Mapnik({
- attribution: '',
- code: "M"
- }),
- keyid: "mapnik",
- name: I18n.t("javascripts.map.base.standard")
- }, {
- layer: new L.OSM.CycleMap({
- attribution: "Tiles courtesy of Andy Allan",
- code: "C"
- }),
- keyid: "cyclemap",
- name: I18n.t("javascripts.map.base.cycle_map")
- }, {
- layer: new L.OSM.TransportMap({
- attribution: "Tiles courtesy of Andy Allan",
- code: "T"
- }),
- keyid: "transportmap",
- name: I18n.t("javascripts.map.base.transport_map")
- }, {
- layer: new L.OSM.MapQuestOpen({
- attribution: "Tiles courtesy of MapQuest ",
- code: "Q"
- }),
- keyid: "mapquest",
- name: I18n.t("javascripts.map.base.mapquest")
- }];
-}
-
$(document).ready(function () {
var params = OSM.mapParams();
@@ -51,9 +19,34 @@ $(document).ready(function () {
map.attributionControl.setPrefix('');
- var layers = allLayers();
+ var layers = [
+ new L.OSM.Mapnik({
+ attribution: '',
+ code: "M",
+ keyid: "mapnik",
+ name: I18n.t("javascripts.map.base.standard")
+ }),
+ new L.OSM.CycleMap({
+ attribution: "Tiles courtesy of Andy Allan",
+ code: "C",
+ keyid: "cyclemap",
+ name: I18n.t("javascripts.map.base.cycle_map")
+ }),
+ new L.OSM.TransportMap({
+ attribution: "Tiles courtesy of Andy Allan",
+ code: "T",
+ keyid: "transportmap",
+ name: I18n.t("javascripts.map.base.transport_map")
+ }),
+ new L.OSM.MapQuestOpen({
+ attribution: "Tiles courtesy of MapQuest ",
+ code: "Q",
+ keyid: "mapquest",
+ name: I18n.t("javascripts.map.base.mapquest")
+ })
+ ];
- layers[0].layer.addTo(map);
+ layers[0].addTo(map);
$("#map").on("resized", function () {
map.invalidateSize();
@@ -105,15 +98,15 @@ $(document).ready(function () {
if (params.layers) {
var foundLayer = false;
for (var i = 0; i < layers.length; i++) {
- if (params.layers.indexOf(layers[i].layer.options.code) >= 0) {
- map.addLayer(layers[i].layer);
+ if (params.layers.indexOf(layers[i].options.code) >= 0) {
+ map.addLayer(layers[i]);
foundLayer = true;
} else {
- map.removeLayer(layers[i].layer);
+ map.removeLayer(layers[i]);
}
}
if (!foundLayer) {
- map.addLayer(layers[0].layer);
+ map.addLayer(layers[0]);
}
}
@@ -152,13 +145,16 @@ $(document).ready(function () {
if (!("autofocus" in document.createElement("input"))) {
$("#query").focus();
}
+
+ initializeBrowse(map);
+ initializeNotes(map);
});
-// non-scoped utilities
-function getMapBaseLayer() {
- for (var i = 0; i < layers.length; i++) {
- if (map.hasLayer(layers[i].layer)) {
- return layers[i];
+function getMapBaseLayerId(map) {
+ for (var i in map._layers) { // TODO: map.eachLayer
+ var layer = map._layers[i];
+ if (layer.options && layer.options.keyid) {
+ return layer.options.keyid;
}
}
}