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

diff --git a/public/js/syj.js b/public/js/syj.js
index 0233634..8c48c99 100644
--- 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, osmLayer, layerOptions, hidemessenger, layerCode, parameters;
+        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;
@@ -289,18 +293,18 @@ var SYJView = {
             theme: null
         });
 
-        osmLayer = 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'],
-                { wrapDateLine: true , attribution: SyjStrings.osmAttribution, layerCode: 'O'});
+                { attribution: SyjStrings.osmAttribution, layerCode: 'M' });
 
-        mapquestLayer = new OpenLayers.Layer.OSM("Mapquest", [
+        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.mapquestAttribution, layerCode: 'Q'});
 
         layerOptions = {format:     OpenLayers.Format.WKT,
                         projection: WGS84,
@@ -308,9 +312,9 @@ var SYJView = {
                         attribution: SyjStrings.geomAttribution };
 
         this.viewLayer = new OpenLayers.Layer.Vector("View Layer", layerOptions);
-        this.map.addLayers([osmLayer, mapquestLayer, this.viewLayer]);
+        this.map.addLayers([mapnikLayer, mapquestLayer, this.viewLayer]);
 
-        this.map.setBaseLayer(mapquestLayer);
+        this.map.setBaseLayer(mapnikLayer);
         layerCode = null;
         parameters = OpenLayers.Util.getParameters(window.location.href);
         if (parameters.layer) {
@@ -327,20 +331,19 @@ var SYJView = {
         if (layerCode) {
             layerCode = layerCode.toUpperCase();
             var self = this;
-            $([osmLayer, mapquestLayer]).each(function(layer) {
+            $([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() {
                 $("geom_submit").value = SyjStrings.editAction;
-                this.messenger.hide();
+                this.messenger.clearMessages();
                 this.editMode();
                 this.mode = 'edit';
             }.bind(this));
@@ -349,7 +352,7 @@ var SYJView = {
         if ($("create-btn")) {
             $("create-btn").observe('click', function() {
                 $("geom_submit").value = SyjStrings.createAction;
-                this.messenger.hide();
+                this.messenger.clearMessages();
                 this.editMode();
                 this.mode = 'create';
             }.bind(this));
@@ -359,7 +362,7 @@ var SYJView = {
             $("clone-btn").observe('click', function() {
                 $("geom_submit").value = SyjStrings.cloneAction;
                 $("geom_title").value = "";
-                this.messenger.hide();
+                this.messenger.clearMessages();
                 this.editMode();
                 this.mode = 'create';
             }.bind(this));
@@ -403,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;
@@ -414,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) {
@@ -433,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());
 
@@ -512,18 +522,11 @@ 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) {
         if (evt.eventName === "simplebox:shown" && evt.memo.element !== $("termsofusearea")) {
-            this.messenger.hide();
+            this.messenger.clearMessages();
         }
     },
 
@@ -559,7 +562,7 @@ var SYJView = {
         }
         this.needsFormResubmit = false;
         SyjSaveUI.disable.bind(SyjSaveUI).defer();
-        this.messenger.hide();
+        this.messenger.clearMessages();
         return true;
     },
 
@@ -638,7 +641,7 @@ var SYJView = {
                     }
                 },
                 create: function(f, line) {
-                    this.messenger.hide();
+                    this.messenger.clearMessages();
                     $("geom_upload_container").hide();
                 }.bind(this)
             },
@@ -807,7 +810,7 @@ var SYJModalClass = Class.create({
     },
 
     reset: function() {
-        this.messenger.hide();
+        this.messenger.clearMessages();
         this.area.select('.message').invoke('setMessageStatus', null);
     }
 });
@@ -820,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"]
@@ -832,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) {
@@ -865,7 +876,7 @@ var SYJUserClass = Class.create(SYJModalClass, {
     },
 
     presubmit: function() {
-        this.messenger.hide();
+        this.messenger.clearMessages();
         PseudoChecker.reset();
         if (!(this.checkNotEmpty("user_pseudo", SyjStrings.userEmptyWarn))) {
             return false;
@@ -983,7 +994,7 @@ var SYJLoginClass = Class.create(SYJModalClass, {
     },
 
     presubmit: function() {
-        this.messenger.hide();
+        this.messenger.clearMessages();
         if (!(this.checkNotEmpty("login_user", SyjStrings.userEmptyWarn))) {
             return false;
         }
@@ -1355,7 +1366,3 @@ window.onbeforeunload = function() {
         return undefined;
     }
 };
-
-window.onresize = function() {
-    SYJView.resizeMap();
-};