X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8e1b0b69086a3beb49f8f9398da231578d5bb35a..5cb9f2b022ba1c829ae5f4d980f27c7aad694ff6:/app/assets/javascripts/map.js.erb
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 094a02cd5..4c1a849dc 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -13,16 +13,16 @@ function createMap(divName, options) {
new OpenLayers.Control.Attribution(),
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})
],
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,
@@ -31,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,
@@ -40,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,
@@ -49,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",
@@ -71,12 +71,24 @@ function createMap(divName, options) {
});
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();
+ });
+
+ $("#" + divName).trigger("initialised");
+
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;
@@ -96,13 +108,13 @@ function addMarkerToMap(position, icon, description) {
return marker;
}
-function addObjectToMap(url, zoom, callback) {
+function addObjectToMap(object, zoom, callback) {
var layer = new OpenLayers.Layer.Vector("Objects", {
strategies: [
new OpenLayers.Strategy.Fixed()
],
protocol: new OpenLayers.Protocol.HTTP({
- url: url,
+ url: OSM.apiUrl(object),
format: new OpenLayers.Format.OSM()
}),
style: {
@@ -186,7 +198,6 @@ function openMapPopup(marker, description) {
function closeMapPopup() {
if (popup) {
map.removePopup(popup);
- delete popup;
}
}
@@ -194,10 +205,6 @@ function removeMarkerFromMap(marker){
markers.removeMarker(marker);
}
-function removeBoxFromMap(box){
- vectors.removeFeature(box);
-}
-
function proj(x) {
return x.clone().transform(epsg4326, map.getProjectionObject());
}
@@ -214,7 +221,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() {