X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c61d24f08e2c3a86bdac0630fd121ae23d3c3763..4f552430b4b302156e20ec4f2915fe927fdd356b:/app/assets/javascripts/map.js.erb
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 632f31456..529934048 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -4,15 +4,6 @@ var markers;
var vectors;
var popup;
-var nonamekeys = {
- 'openstreetmap.org': '2f59745a6b525b4ebdb100891d5b6711',
- 'www.openstreetmap.org': 'fd093e52f0965d46bb1c6c6281022199',
- 'openstreetmap.com': '4c60e7f5f31c576a9bb8da71c8d61152',
- 'www.openstreetmap.com': '142f25a0770a51a9a400b3513834a199',
- 'openstreetmap.net': '687c58fd1d715596bfc94abe653d8ac0',
- 'www.openstreetmap.net': '0bd1654141c85d30b9c2ccdb5302f2e4'
-};
-
function createMap(divName, options) {
options = options || {};
@@ -20,19 +11,19 @@ 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")
+ displayProjection: new OpenLayers.Projection("EPSG:4326"),
+ theme: "<%= asset_path 'theme/openstreetmap/style.css' %>"
});
- var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {
+ var mapnik = new OpenLayers.Layer.OSM.Mapnik(I18n.t("javascripts.map.base.standard"), {
+ attribution: "",
keyid: "mapnik",
displayOutsideMaxExtent: true,
wrapDateLine: true,
@@ -40,73 +31,90 @@ function createMap(divName, options) {
});
map.addLayer(mapnik);
- var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
- keyid: "osmarender",
+ var cyclemap = new OpenLayers.Layer.OSM.CycleMap(I18n.t("javascripts.map.base.cycle_map"), {
+ attribution: "Tiles courtesy of Andy Allan",
+ keyid: "cyclemap",
displayOutsideMaxExtent: true,
wrapDateLine: true,
- layerCode: "O"
+ layerCode: "C"
});
- map.addLayer(osmarender);
+ map.addLayer(cyclemap);
- var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
- keyid: "cyclemap",
+ var transportmap = new OpenLayers.Layer.OSM.TransportMap(I18n.t("javascripts.map.base.transport_map"), {
+ attribution: "Tiles courtesy of Andy Allan",
+ keyid: "transportmap",
displayOutsideMaxExtent: true,
wrapDateLine: true,
- layerCode: "C"
+ layerCode: "T"
});
- map.addLayer(cyclemap);
+ map.addLayer(transportmap);
- var nonamekey = nonamekeys[document.domain];
- 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"
+ 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",
+ "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png"
], {
+ attribution: "Tiles courtesy of MapQuest 
",
+ keyid: "mapquest",
displayOutsideMaxExtent: true,
wrapDateLine: true,
numZoomLevels: 19,
- layerCode: "N"
+ layerCode: "Q"
});
- map.addLayer(noname);
-
- var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
+ map.addLayer(mapquest);
markers = new OpenLayers.Layer.Markers("Markers", {
displayInLayerSwitcher: false,
- numZoomLevels: numZoomLevels,
- maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
- maxResolution: 156543,
- units: "m",
+ numZoomLevels: 20,
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;
}
function addMarkerToMap(position, icon, description) {
- var marker = new OpenLayers.Marker(position.clone().transform(epsg4326, map.getProjectionObject()), icon);
+ var marker = new OpenLayers.Marker(proj(position), icon);
markers.addMarker(marker);
if (description) {
- marker.events.register("mouseover", marker, function() { openMapPopup(marker, description) });
+ marker.events.register("mouseover", marker, function() {
+ openMapPopup(marker, 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,
@@ -144,8 +152,6 @@ function addObjectToMap(url, zoom, callback) {
});
map.addLayer(layer);
-
- layer.loadGML();
}
function addBoxToMap(boxbounds, id, outline) {
@@ -160,9 +166,9 @@ function addBoxToMap(boxbounds, id, outline) {
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());
+ geometry = proj(new OpenLayers.Geometry.LineString(vertices));
} else {
- geometry = boxbounds.toGeometry().transform(epsg4326, map.getProjectionObject());
+ geometry = proj(boxbounds.toGeometry());
}
var box = new OpenLayers.Feature.Vector(geometry, {}, {
strokeWidth: 2,
@@ -190,7 +196,6 @@ function openMapPopup(marker, description) {
function closeMapPopup() {
if (popup) {
map.removePopup(popup);
- delete popup;
}
}
@@ -198,31 +203,19 @@ function removeMarkerFromMap(marker){
markers.removeMarker(marker);
}
-function removeBoxFromMap(box){
- vectors.removeFeature(box);
+function proj(x) {
+ return x.clone().transform(epsg4326, map.getProjectionObject());
}
-function getMapCenter() {
- return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
+function unproj(x) {
+ return x.clone().transform(map.getProjectionObject(), epsg4326);
}
function setMapCenter(center, zoom) {
- zoom = parseInt(zoom);
+ zoom = parseInt(zoom, 10);
var numzoom = map.getNumZoomLevels();
if (zoom >= numzoom) zoom = numzoom - 1;
- map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom);
-}
-
-function setMapExtent(extent) {
- map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
-}
-
-function getMapExtent() {
- return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);
-}
-
-function getMapZoom() {
- return map.getZoom();
+ map.setCenter(proj(center), zoom);
}
function getEventPosition(event) {
@@ -263,14 +256,10 @@ function setMapLayers(layerConfig) {
} else {
map.layers[i].setVisibility(true);
}
- } else {
+ } else if (!map.layers[i].isBaseLayer) {
map.layers[i].setVisibility(false);
}
}
}
}
}
-
-function scaleToZoom(scale) {
- return Math.log(360.0/(scale * 512.0)) / Math.log(2.0);
-}