X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f5c9a41e8729ab9bfc54fff6be9c1a9b6e0f4d56..2e03861300bca1a44d50a9e9c684ffc0e2d6ad65:/public/javascripts/map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 217e6e758..0c13b016e 100644
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -2,13 +2,12 @@ var map;
 var markers;
 var popup;
 
+OpenLayers._getScriptLocation = function () {
+   return "/openlayers/";
+}
+   
 function createMap(divName) {
-   map = new OpenLayers.Map(divName,
-                            { maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
-                              numZoomLevels: 19,
-                              maxResolution: 156543,
-                              units: 'm',
-                              projection: "EPSG:41001" });
+   map = new OpenLayers.Map(divName);
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", { displayOutsideMaxExtent: true });
    map.addLayer(mapnik);
@@ -16,7 +15,17 @@ function createMap(divName) {
    var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", { displayOutsideMaxExtent: true });
    map.addLayer(osmarender);
 
-   markers = new OpenLayers.Layer.Markers("markers", { visibility: false });
+   var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", { displayOutsideMaxExtent: true });
+   map.addLayer(maplint);
+
+   var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
+   markers = new OpenLayers.Layer.Markers("Markers", { 
+      displayInLayerSwitcher: false, numZoomLevels: numZoomLevels,
+      maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
+      maxResolution: 156543,
+      units: "m",
+      projection: "EPSG:41001"
+   });
    map.addLayer(markers);
 
    map.addControl(new OpenLayers.Control.LayerSwitcher());
@@ -37,7 +46,6 @@ function addMarkerToMap(position, icon, description) {
    var marker = new OpenLayers.Marker(position, icon);
 
    markers.addMarker(marker);
-   markers.setVisibility(true);
 
    if (description) {
       marker.events.register("click", marker, function() { openMapPopup(marker, description) });
@@ -138,6 +146,56 @@ function lonLatToMercator(ll) {
    return new OpenLayers.LonLat(lon, lat);
 }
 
+// for interacting with the PostGIS database which uses non spherical
+// Mercator. Taken from Freemap which in turn was taken from a standard
+// algorithm off the net.
+
+function lonLatToNonSphericalMercator(ll) {
+    var custLat  = ll.lat * (Math.PI/180);
+    var a = 6378137;
+    var b = 6356752.3142;
+    var f = (a-b)/a;
+    var e = Math.sqrt(2*f-Math.pow(f,2));
+    custLat=a*Math.log(Math.tan(Math.PI/4+custLat/2)*
+        Math.pow(( (1-e*Math.sin(custLat)) / (1+e*Math.sin(custLat))),e/2));
+    custLon = ll.lon * (Math.PI/180) * 6378137;
+    return new OpenLayers.LonLat (custLon,custLat);
+}
+
+function nonSphericalMercatorToLonLat(merc) {
+    var lon_deg, lat_deg;
+    var a = 6378137.0;
+    var b = 6356752.3142;
+    var k0 = 1.0;
+    var t = 1.0 - b/a;
+    var es = 2*t - t*t;
+    var e = Math.sqrt(es);
+    lon_deg = merc.lon;
+    lat_deg = merc.lat;
+    lon_deg /= a;
+    lat_deg /= a;
+    lon_deg /= k0;
+    lat_deg = phi2(Math.exp(-lat_deg/k0), e);
+    lon_deg *= (180/M_PI);
+    lat_deg *= (180/M_PI);
+    return new OpenLayers.LonLat(lon_deg,lat_deg);
+}
+
+function phi2 (ts,e) {
+    var eccnth = 0.5*e;
+    var Phi = (PI/2) - 2.0*Math.atan(ts);
+    var dphi;
+    var i=15;
+    do {
+        var con = e*Math.sin(Phi);
+        dphi = (PI/2) - 2.0*Math.atan(ts*Math.pow((1.0-con)/(1.0+con),eccnth))
+            - Phi;
+        Phi += dphi;
+    }
+    while(Math.abs(dphi) > 0.0000000001 && --i);
+    return Phi;
+}
+
 function scaleToZoom(scale) {
    return Math.log(360.0/(scale * 512.0)) / Math.log(2.0);
 }