add mapquest layer back

[syj.git] / public / js / syj.js

diff --git a/public/js/syj.js b/public/js/syj.js
index 3ed9ad60b8b639cb7995754066ae02ada1428244..8c48c99e980bc844773f70dbc6af9a8f9d72b16e 100644 (file)
--- a/public/js/syj.js
+++ b/public/js/syj.js
@@ -1,11 +1,15 @@
 /*  This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier,
     and is published under the AGPL license. */
 
+"use strict";
+
 // avoid openlayers alerts
 OpenLayers.Console.userError = function(error) {
     SYJView.messenger.setMessage(error, "error");
 };
 
+OpenLayers.Layer.Vector.prototype.renderers = ["SVG2", "VML", "Canvas"];
+
 var SyjSaveUI = {
     status: "unknown",
 
@@ -272,7 +276,7 @@ var SYJView = {
     mode: 'view',
 
     init: function() {
-        var externalGraphic, baseURL, baseLayer, layerOptions, hidemessenger;
+        var externalGraphic, baseURL, mapnikLayer, mapquestLayer, layerOptions, hidemessenger, layerCode, parameters;
 
         // is svg context, opera does not resolve links with base element is svg context
         externalGraphic = styleMap.edit.styles.select.defaultStyle.externalGraphic;
@@ -283,16 +287,24 @@ var SYJView = {
             controls: [
                 new OpenLayers.Control.Navigation(),
                 new OpenLayers.Control.PanZoom(),
+                this.createLayerSwitcher(),
                 new OpenLayers.Control.Attribution()
             ],
             theme: null
         });
 
-        baseLayer = new OpenLayers.Layer.OSM("OSM", [
+        mapnikLayer = new OpenLayers.Layer.OSM("Mapnik", [
                 'http://a.tile.openstreetmap.org/${z}/${x}/${y}.png',
                 'http://b.tile.openstreetmap.org/${z}/${x}/${y}.png',
                 'http://c.tile.openstreetmap.org/${z}/${x}/${y}.png'],
-                { attribution: SyjStrings.osmAttribution });
+                { attribution: SyjStrings.osmAttribution, layerCode: 'M' });
+
+        mapquestLayer = new OpenLayers.Layer.OSM("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: SyjStrings.mapquestAttribution, layerCode: 'Q'});
 
         layerOptions = {format:     OpenLayers.Format.WKT,
                         projection: WGS84,
@@ -300,7 +312,33 @@ var SYJView = {
                         attribution: SyjStrings.geomAttribution };
 
         this.viewLayer = new OpenLayers.Layer.Vector("View Layer", layerOptions);
-        this.map.addLayers([baseLayer, this.viewLayer]);
+        this.map.addLayers([mapnikLayer, mapquestLayer, this.viewLayer]);
+
+        this.map.setBaseLayer(mapnikLayer);
+        layerCode = null;
+        parameters = OpenLayers.Util.getParameters(window.location.href);
+        if (parameters.layer) {
+            layerCode = parameters.layer;
+            try {
+                store.remove('baselayer');
+            } catch(e) {}
+        } else {
+            try {
+                layerCode = store.get('baselayer');
+            } catch(e) {}
+        }
+
+        if (layerCode) {
+            layerCode = layerCode.toUpperCase();
+            var self = this;
+            $([mapnikLayer, mapquestLayer]).each(function(layer) {
+                if (layer.layerCode === layerCode) {
+                    self.map.setBaseLayer(layer);
+                }
+            });
+        }
+
+        this.map.events.register("changebaselayer", this, this.saveBaseLayer);
 
         if ($("edit-btn")) {
             $("edit-btn").observe('click', function() {
@@ -368,7 +406,7 @@ var SYJView = {
                     this.messenger.setMessage(SyjStrings.uploadFileError, "warn");
                 }.bind(this);
                 reader.onload = function(evt) {
-                    var data = null, results = null, engine = null, vector = null, i = 0, formats = ['KML', 'GPX', 'GeoJSON'];
+                    var data = null, results = null, engine = null, vector = null, i = 0, format = null, formats = ['KML', 'GPX', 'GeoJSON'];
 
                     $("geom_upload_container").removeClassName("disabled");
                     $("geom_upload").disabled = false;
@@ -379,7 +417,8 @@ var SYJView = {
                     data = evt.target.result;
 
                     for (i = 0; i < formats.length; i++) {
-                        engine = new OpenLayers.Format[formats[i]]({ internalProjection: Mercator, externalProjection: WGS84 });
+                        format = formats[i];
+                        engine = new OpenLayers.Format[format]({ internalProjection: Mercator, externalProjection: WGS84 });
                         try {
                             results = engine.read(data);
                         } catch(e) {
@@ -398,6 +437,12 @@ var SYJView = {
                         readerror();
                         return;
                     }
+                    // merge linestrings for gpx containting multiple trkseg elements.
+                    if (format === 'GPX') {
+                      for (i = 1; i < results.length; i++) {
+                        vector.geometry.addComponents(results[i].geometry.components);
+                      }
+                    }
                     this.viewLayer.addFeatures([vector]);
                     this.map.zoomToExtent(this.viewLayer.getDataExtent());
 
@@ -431,6 +476,33 @@ var SYJView = {
         SYJPathLength.update();
     },
 
+    saveBaseLayer: function(data) {
+        try {
+            store.set('baselayer', data.layer.layerCode);
+        } catch(e) {}
+    },
+
+    createLayerSwitcher: function() {
+        var control = new OpenLayers.Control.LayerSwitcher({roundedCorner: false});
+        // XXX: we need to "live-patch" LayerSwitcher to use our icons. We use
+        // a regexp instead of a string in case OpenLayers is modified and in
+        // case browsers modify the function representation
+        control.loadContents = eval('(function() { return (' + control.loadContents.toString().replace(
+                    /\s*=\s*imgLocation\s*\+\s*['"]layer-switcher-maximize\.png['"]\s*;/,
+                    " = 'icons/layer-switcher-maximize-flipped.png';"
+                    ) + ')}())');
+        var oldMaximizeControl = control.maximizeControl;
+        var self = this;
+        control.maximizeControl = (function(oldfunc) {
+            return function() {
+                oldfunc.apply(control, arguments);
+                self.messenger.hide();
+            };
+        }(control.maximizeControl));
+
+        return control;
+    },
+
     initMaPos: function (aPos) {
         var extent = null, center = null, zoom = 0;
 
@@ -751,7 +823,11 @@ var SYJUserClass = Class.create(SYJModalClass, {
         $super();
         $("termsofusearea").hide();
 
-        $$("#user_termsofuse_anchor, #geom_termsofuse_anchor").invoke('observe', "click", function(evt) {
+        var touevt = (function(evt) {
+            if (evt.type === "keyup" && evt.keyCode !== 32) { // 32 = space
+                // allow opening box by pressing space
+                return;
+            }
             if (!this.toubox) {
                 this.toubox = new SimpleBox($("termsofusearea"), {
                     closeMethods: ["onescapekey", "onouterclick", "onbutton"]
@@ -763,7 +839,11 @@ var SYJUserClass = Class.create(SYJModalClass, {
                 $("termsofuseiframe").setAttribute("src", evt.target.href);
             }
             evt.stop();
-        }.bindAsEventListener(this));
+        }).bindAsEventListener(this);
+
+        ["click", "keyup"].each(function (evtName) {
+            $$("#user_termsofuse_anchor, #geom_termsofuse_anchor").invoke('observe', evtName, touevt);
+        })
 
         $$("#login_area_create > a").invoke('observe', 'click',
             function(evt) {