X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=public%2Fjs%2Fsyj.js;h=62b2936a1248da6545966d3b0e95a43a41d0628f;hb=5f933abf0cc28142a0c4ed8d41ac79fd897ddb14;hp=02336343d9d781d8f6bacb808b4855ea8180b413;hpb=4022a532856c006efc57fbd8830bde4607c0114d;p=syj.git

diff --git a/public/js/syj.js b/public/js/syj.js
index 0233634..62b2936 100644
--- a/public/js/syj.js
+++ b/public/js/syj.js
@@ -272,7 +272,7 @@ var SYJView = {
     mode: 'view',
 
     init: function() {
-        var externalGraphic, baseURL, osmLayer, layerOptions, hidemessenger, layerCode, parameters;
+        var externalGraphic, baseURL, baseLayer, layerOptions, hidemessenger;
 
         // is svg context, opera does not resolve links with base element is svg context
         externalGraphic = styleMap.edit.styles.select.defaultStyle.externalGraphic;
@@ -283,24 +283,16 @@ var SYJView = {
             controls: [
                 new OpenLayers.Control.Navigation(),
                 new OpenLayers.Control.PanZoom(),
-                this.createLayerSwitcher(),
                 new OpenLayers.Control.Attribution()
             ],
             theme: null
         });
 
-        osmLayer = new OpenLayers.Layer.OSM("OSM", [
+        baseLayer = new OpenLayers.Layer.OSM("OSM", [
                 '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'],
-                { wrapDateLine: true , attribution: SyjStrings.osmAttribution, layerCode: 'O'});
-
-        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'],
-                { wrapDateLine: true , attribution: SyjStrings.mapquestAttribution, layerCode: 'M'});
+                { attribution: SyjStrings.osmAttribution });
 
         layerOptions = {format:     OpenLayers.Format.WKT,
                         projection: WGS84,
@@ -308,34 +300,7 @@ var SYJView = {
                         attribution: SyjStrings.geomAttribution };
 
         this.viewLayer = new OpenLayers.Layer.Vector("View Layer", layerOptions);
-        this.map.addLayers([osmLayer, mapquestLayer, this.viewLayer]);
-
-        this.map.setBaseLayer(mapquestLayer);
-        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;
-            $([osmLayer, mapquestLayer]).each(function(layer) {
-                if (layer.layerCode === layerCode) {
-                    self.map.setBaseLayer(layer);
-                }
-            });
-        }
-
-
-        this.map.events.register("changebaselayer", this, this.saveBaseLayer);
+        this.map.addLayers([baseLayer, this.viewLayer]);
 
         if ($("edit-btn")) {
             $("edit-btn").observe('click', function() {
@@ -466,33 +431,6 @@ 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;
 
@@ -512,13 +450,6 @@ var SYJView = {
         } else {
             this.map.setCenter(center, zoom);
         }
-        this.resizeMap();
-    },
-
-    resizeMap: function() {
-        var map = $('map');
-        map.style.width = map.offsetWidth.toString() + 'px';
-        map.style.height = map.offsetHeight.toString() + 'px';
     },
 
     observer: function(evt) {
@@ -1355,7 +1286,3 @@ window.onbeforeunload = function() {
         return undefined;
     }
 };
-
-window.onresize = function() {
-    SYJView.resizeMap();
-};