X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/596ab82461c6662cbfbe027c16e332d75a1e3c2e..e759079423a95a7b749f706f5c6eb9b27b7b61b7:/public/javascripts/map.js diff --git a/public/javascripts/map.js b/public/javascripts/map.js index 8ae2349ea..66ed9e909 100644 --- a/public/javascripts/map.js +++ b/public/javascripts/map.js @@ -13,12 +13,6 @@ var nonamekeys = { 'www.openstreetmap.net': '0bd1654141c85d30b9c2ccdb5302f2e4' }; -OpenLayers._getScriptLocation = function () { - // Should really have this file as an erb, so that this can return - // the real rails root - return "/openlayers/"; -} - function createMap(divName, options) { options = options || {}; @@ -28,7 +22,9 @@ function createMap(divName, options) { new OpenLayers.Control.Attribution(), new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PanZoomBar() + new OpenLayers.Control.PanZoom(), + new OpenLayers.Control.PanZoomBar(), + new OpenLayers.Control.ScaleLine({geodesic: true}) ], units: "m", maxResolution: 156543.0339, @@ -36,42 +32,43 @@ function createMap(divName, options) { displayProjection: new OpenLayers.Projection("EPSG:4326") }); - var mapnik = new OpenLayers.Layer.OSM.Mapnik(rails_i18n["javascripts.map.base.mapnik"], { + var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), { + keyid: "mapnik", displayOutsideMaxExtent: true, - wrapDateLine: true + wrapDateLine: true, + layerCode: "M" }); map.addLayer(mapnik); - var osmarender = new OpenLayers.Layer.OSM.Osmarender(rails_i18n["javascripts.map.base.osmarender"], { + var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), { + keyid: "osmarender", displayOutsideMaxExtent: true, - wrapDateLine: true + wrapDateLine: true, + layerCode: "O" }); map.addLayer(osmarender); - var cyclemap = new OpenLayers.Layer.OSM.CycleMap(rails_i18n["javascripts.map.base.cycle_map"], { + var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), { + keyid: "cyclemap", displayOutsideMaxExtent: true, - wrapDateLine: true + wrapDateLine: true, + layerCode: "C" }); map.addLayer(cyclemap); var nonamekey = nonamekeys[document.domain]; - var noname = new OpenLayers.Layer.OSM(rails_i18n["javascripts.map.base.noname"], [ + var noname = new OpenLayers.Layer.OSM(i18n("javascripts.map.base.noname"), [ "http://a.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png", "http://b.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png", "http://c.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png" ], { displayOutsideMaxExtent: true, wrapDateLine: true, - numZoomLevels: 19 + numZoomLevels: 19, + layerCode: "N" }); map.addLayer(noname); - var maplint = new OpenLayers.Layer.OSM.Maplint(rails_i18n["javascripts.map.overlays.maplint"], { - displayOutsideMaxExtent: true, - wrapDateLine: true - }); - map.addLayer(maplint); - var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels); markers = new OpenLayers.Layer.Markers("Markers", { @@ -101,7 +98,8 @@ function addMarkerToMap(position, icon, description) { markers.addMarker(marker); if (description) { - marker.events.register("click", marker, function() { openMapPopup(marker, description) }); + marker.events.register("mouseover", marker, function() { openMapPopup(marker, description) }); + marker.events.register("mouseout", marker, function() { closeMapPopup() }); } return marker; @@ -151,7 +149,7 @@ function addObjectToMap(url, zoom, callback) { layer.loadGML(); } -function addBoxToMap(boxbounds) { +function addBoxToMap(boxbounds, id, outline) { if (!vectors) { // Be aware that IE requires Vector layers be initialised on page load, and not under deferred script conditions vectors = new OpenLayers.Layer.Vector("Boxes", { @@ -159,12 +157,20 @@ function addBoxToMap(boxbounds) { }); map.addLayer(vectors); } - var geometry = boxbounds.toGeometry().transform(epsg4326, map.getProjectionObject()); + var geometry; + if (outline) { + vertices = boxbounds.toGeometry().getVertices(); + vertices.push(new OpenLayers.Geometry.Point(vertices[0].x, vertices[0].y)); + geometry = new OpenLayers.Geometry.LineString(vertices).transform(epsg4326, map.getProjectionObject()); + } else { + geometry = boxbounds.toGeometry().transform(epsg4326, map.getProjectionObject()); + } var box = new OpenLayers.Feature.Vector(geometry, {}, { strokeWidth: 2, strokeColor: '#ee9900', fillOpacity: 0 }); + box.fid = id; vectors.addFeatures(box); @@ -174,10 +180,9 @@ function addBoxToMap(boxbounds) { function openMapPopup(marker, description) { closeMapPopup(); - popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat, null, - description, marker.icon, true); + popup = new OpenLayers.Popup.FramedCloud("popup", marker.lonlat, null, + description, marker.icon, true); popup.setBackgroundColor("#E3FFC5"); - popup.autoSize = true; map.addPopup(popup); return popup; @@ -198,7 +203,7 @@ function removeBoxFromMap(box){ vectors.removeFeature(box); } -function getMapCenter(center, zoom) { +function getMapCenter() { return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326); } @@ -217,6 +222,10 @@ function getMapExtent() { return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326); } +function getMapZoom() { + return map.getZoom(); +} + function getEventPosition(event) { return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326); } @@ -224,39 +233,39 @@ function getEventPosition(event) { function getMapLayers() { var layerConfig = ""; - for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) { - layerConfig += layers[i] == map.baseLayer ? "B" : "0"; - } - - for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) { - layerConfig += layers[i].getVisibility() ? "T" : "F"; + for (var i = 0; i < map.layers.length; i++) { + if (map.layers[i].layerCode && map.layers[i].getVisibility()) { + layerConfig += map.layers[i].layerCode; + } } return layerConfig; } function setMapLayers(layerConfig) { - var l = 0; + if (layerConfig.charAt(0) == "B" || layerConfig.charAt(0) == "0") { + var l = 0; - for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) { - var c = layerConfig.charAt(l++); + for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) { + var c = layerConfig.charAt(l++); - if (c == "B") { - map.setBaseLayer(layers[i]); + if (c == "B") { + map.setBaseLayer(layers[i]); + } } - } - - while (layerConfig.charAt(l) == "B" || layerConfig.charAt(l) == "0") { - l++; - } - - for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) { - var c = layerConfig.charAt(l++); - - if (c == "T") { - layers[i].setVisibility(true); - } else if(c == "F") { - layers[i].setVisibility(false); + } else { + for (var i = 0; i < map.layers.length; i++) { + if (map.layers[i].layerCode) { + if (layerConfig.indexOf(map.layers[i].layerCode) >= 0) { + if (map.layers[i].isBaseLayer) { + map.setBaseLayer(map.layers[i]); + } else { + map.layers[i].setVisibility(true); + } + } else { + map.layers[i].setVisibility(false); + } + } } } }