X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/701325e9ef6720a16646c7218010e33b5c58d544..6f9ad2eab60b45266e1287da58406e1aa25fd708:/app/assets/javascripts/map.js.erb diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb index aff258ad2..c06c9c8ea 100644 --- a/app/assets/javascripts/map.js.erb +++ b/app/assets/javascripts/map.js.erb @@ -11,20 +11,18 @@ function createMap(divName, options) { controls: options.controls || [ new OpenLayers.Control.ArgParser(), new OpenLayers.Control.Attribution(), - new OpenLayers.Control.LayerSwitcher(), + new SimpleLayerSwitcher(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PanZoom(), - new OpenLayers.Control.PanZoomBar(), + new OpenLayers.Control.Zoom(), + new OpenLayers.Control.SimplePanZoom(), new OpenLayers.Control.ScaleLine({geodesic: true}) ], - units: "m", - maxResolution: 156543.0339, numZoomLevels: 20, displayProjection: new OpenLayers.Projection("EPSG:4326"), - theme: "<%= asset_path 'theme/default/style.css' %>" + theme: "<%= asset_path 'theme/openstreetmap/style.css' %>" }); - var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.standard"), { + var mapnik = new OpenLayers.Layer.OSM.Mapnik(I18n.t("javascripts.map.base.standard"), { attribution: "", keyid: "mapnik", displayOutsideMaxExtent: true, @@ -33,7 +31,7 @@ function createMap(divName, options) { }); map.addLayer(mapnik); - var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), { + var cyclemap = new OpenLayers.Layer.OSM.CycleMap(I18n.t("javascripts.map.base.cycle_map"), { attribution: "Tiles courtesy of Andy Allan", keyid: "cyclemap", displayOutsideMaxExtent: true, @@ -42,7 +40,7 @@ function createMap(divName, options) { }); map.addLayer(cyclemap); - var transportmap = new OpenLayers.Layer.OSM.TransportMap(i18n("javascripts.map.base.transport_map"), { + var transportmap = new OpenLayers.Layer.OSM.TransportMap(I18n.t("javascripts.map.base.transport_map"), { attribution: "Tiles courtesy of Andy Allan", keyid: "transportmap", displayOutsideMaxExtent: true, @@ -51,7 +49,7 @@ function createMap(divName, options) { }); map.addLayer(transportmap); - var mapquest = new OpenLayers.Layer.OSM(i18n("javascripts.map.base.mapquest"), [ + var mapquest = new OpenLayers.Layer.OSM(I18n.t("javascripts.map.base.mapquest"), [ "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", @@ -69,19 +67,26 @@ function createMap(divName, options) { markers = new OpenLayers.Layer.Markers("Markers", { displayInLayerSwitcher: false, numZoomLevels: 20, - maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508), - maxResolution: 156543, - units: "m", projection: "EPSG:900913" }); map.addLayer(markers); + map.dataLayer = new OpenLayers.Layer(I18n.t('browse.start_rjs.data_layer_name'), { + visibility: false, + displayInLayerSwitcher: false + }); + map.addLayer(map.dataLayer); + + $("#" + divName).on("resized", function () { + map.updateSize(); + }); + return map; } function getArrowIcon() { var size = new OpenLayers.Size(25, 22); - var offset = new OpenLayers.Pixel(-30, -27); + var offset = new OpenLayers.Pixel(-22, -20); var icon = new OpenLayers.Icon("<%= asset_path 'arrow.png' %>", size, offset); return icon; @@ -101,9 +106,15 @@ function addMarkerToMap(position, icon, description) { return marker; } -function addObjectToMap(url, zoom, callback) { - var layer = new OpenLayers.Layer.GML("Objects", url, { - format: OpenLayers.Format.OSM, +function addObjectToMap(object, zoom, callback) { + var layer = new OpenLayers.Layer.Vector("Objects", { + strategies: [ + new OpenLayers.Strategy.Fixed() + ], + protocol: new OpenLayers.Protocol.HTTP({ + url: OSM.apiUrl(object), + format: new OpenLayers.Format.OSM() + }), style: { strokeColor: "blue", strokeWidth: 3, @@ -141,8 +152,6 @@ function addObjectToMap(url, zoom, callback) { }); map.addLayer(layer); - - layer.loadGML(); } function addBoxToMap(boxbounds, id, outline) { @@ -187,7 +196,6 @@ function openMapPopup(marker, description) { function closeMapPopup() { if (popup) { map.removePopup(popup); - delete popup; } } @@ -195,10 +203,6 @@ function removeMarkerFromMap(marker){ markers.removeMarker(marker); } -function removeBoxFromMap(box){ - vectors.removeFeature(box); -} - function proj(x) { return x.clone().transform(epsg4326, map.getProjectionObject()); } @@ -215,7 +219,7 @@ function setMapCenter(center, zoom) { } function getEventPosition(event) { - return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326); + return unproj(map.getLonLatFromViewPortPx(event.xy)); } function getMapLayers() {