From 6a642fc4ff9526efe4ac180e53f356be79235c62 Mon Sep 17 00:00:00 2001 From: arno Date: Mon, 18 Apr 2011 13:30:42 +0200 Subject: [PATCH] revert: add mapquest layer --- .gitmodules | 3 - COPYING.TXT | 3 - application/configs/medias.ini | 2 +- application/controllers/IdxController.php | 2 - application/languages/lang_en.po | 24 +++--- application/languages/lang_fr.po | 24 +++--- application/languages/lang_ja.po | 27 +++---- public/css/syj.css | 31 -------- .../icons/layer-switcher-maximize-flipped.png | Bin 479 -> 0 bytes public/js/store.js | 1 - public/js/syj.js | 70 +----------------- public/js/syjraw.js | 35 +-------- public/store.js | 1 - scripts/fulljslint.js | 2 +- scripts/syj.cfg | 1 - 15 files changed, 37 insertions(+), 189 deletions(-) delete mode 100644 public/icons/layer-switcher-maximize-flipped.png delete mode 120000 public/js/store.js delete mode 160000 public/store.js diff --git a/.gitmodules b/.gitmodules index 0bbb505..26fad1a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,3 @@ [submodule "public/simplebox"] path = public/simplebox url = git://github.com/arenevier/simplebox.git -[submodule "public/store.js"] - path = public/store.js - url = git://github.com/cloudhead/store.js.git diff --git a/COPYING.TXT b/COPYING.TXT index e83ada2..6128571 100644 --- a/COPYING.TXT +++ b/COPYING.TXT @@ -10,9 +10,6 @@ - pseudo.gif files has been generated with http://ajaxload.info/ generator and is free for use. -- layer-switcher-maximize-flipped.png is a flipped version of - layer-switcher-maximize.png from OpenLayers. As such it is licensed under a - modified BSD license. =============================================================================== diff --git a/application/configs/medias.ini b/application/configs/medias.ini index 49f0f2d..6442a1d 100644 --- a/application/configs/medias.ini +++ b/application/configs/medias.ini @@ -1,7 +1,7 @@ ; This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier, ; and is published under the AGPL license. */ [production] -scripts.idx = OpenLayers, ModifiablePath, prototype, simplebox, utils, syj, store +scripts.idx = OpenLayers, ModifiablePath, prototype, simplebox, utils, syj scripts.rawidx = OpenLayers, syjraw scripts.login = prototype, utils, login scripts.contact = prototype, utils, contact diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php index 217295b..d525d34 100644 --- a/application/controllers/IdxController.php +++ b/application/controllers/IdxController.php @@ -144,7 +144,6 @@ class IdxController extends Zend_Controller_Action protected function _jsRawLocaleStrings() { $this->view->jslocales = array( 'osmAttribution' => __("Map by OpenStreetMap"), - 'mapquestAttribution' => __("Map by MapQuest, OpenStreetMap and contributors, CC-BY-SA"), ); } @@ -170,7 +169,6 @@ class IdxController extends Zend_Controller_Action 'canResubmit' => __("Now, you can retry to save"), 'routeBy' => __("route by"), 'osmAttribution' => __("Map by OpenStreetMap"), - 'mapquestAttribution' => __("Map by MapQuest, OpenStreetMap and contributors, CC-BY-SA"), 'pseudoChecking' => __("checking availibilty"), 'availablePseudo' => __("available pseudo"), 'unavailablePseudo' => __("unavailable pseudo"), diff --git a/application/languages/lang_en.po b/application/languages/lang_en.po index defca44..335ce2b 100644 --- a/application/languages/lang_en.po +++ b/application/languages/lang_en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: syj\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-12 23:13+0200\n" +"POT-Creation-Date: 2011-04-04 13:05+0200\n" "PO-Revision-Date: \n" "Last-Translator: arno \n" "Language-Team: arno \n" @@ -106,12 +106,12 @@ msgid "gpx export" msgstr "gpx export" #: application/views/scripts/idx/index.phtml:112 -#: application/controllers/IdxController.php:183 +#: application/controllers/IdxController.php:182 msgid "duplicate" msgstr "duplicate" #: application/views/scripts/idx/index.phtml:114 -#: application/controllers/IdxController.php:181 +#: application/controllers/IdxController.php:180 msgid "edit" msgstr "edit" @@ -476,7 +476,7 @@ msgstr "Hi," #: application/controllers/ContactController.php:121 #: application/controllers/NewpwdController.php:68 #: application/controllers/AccountController.php:70 -#: application/controllers/IdxController.php:185 +#: application/controllers/IdxController.php:184 msgid "Value is required" msgstr "Value is required" @@ -640,34 +640,30 @@ msgid "route by" msgstr "route by" #: application/controllers/IdxController.php:177 -msgid "Map by MapQuest, OpenStreetMap and contributors, CC-BY-SA" -msgstr "Map by MapQuest, OpenStreetMap and contributors, CC-BY-SA" - -#: application/controllers/IdxController.php:178 msgid "checking availibilty" msgstr "checking availibilty" -#: application/controllers/IdxController.php:179 +#: application/controllers/IdxController.php:178 msgid "available pseudo" msgstr "available pseudo" -#: application/controllers/IdxController.php:180 +#: application/controllers/IdxController.php:179 msgid "unavailable pseudo" msgstr "unavailable pseudo" -#: application/controllers/IdxController.php:182 +#: application/controllers/IdxController.php:181 msgid "create" msgstr "create" -#: application/controllers/IdxController.php:184 +#: application/controllers/IdxController.php:183 msgid "You have an unsaved route" msgstr "You have an unsaved route" -#: application/controllers/IdxController.php:186 +#: application/controllers/IdxController.php:185 msgid "no result" msgstr "no result" -#: application/controllers/IdxController.php:187 +#: application/controllers/IdxController.php:186 msgid "could not analyze file content" msgstr "could not analyze file content" diff --git a/application/languages/lang_fr.po b/application/languages/lang_fr.po index cc18240..6efd1a2 100644 --- a/application/languages/lang_fr.po +++ b/application/languages/lang_fr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: syj\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-12 23:13+0200\n" +"POT-Creation-Date: 2011-04-04 13:05+0200\n" "PO-Revision-Date: \n" "Last-Translator: arno \n" "Language-Team: arno \n" @@ -106,12 +106,12 @@ msgid "gpx export" msgstr "export gpx" #: application/views/scripts/idx/index.phtml:112 -#: application/controllers/IdxController.php:183 +#: application/controllers/IdxController.php:182 msgid "duplicate" msgstr "dupliquer" #: application/views/scripts/idx/index.phtml:114 -#: application/controllers/IdxController.php:181 +#: application/controllers/IdxController.php:180 msgid "edit" msgstr "modifier" @@ -478,7 +478,7 @@ msgstr "Bonjour," #: application/controllers/ContactController.php:121 #: application/controllers/NewpwdController.php:68 #: application/controllers/AccountController.php:70 -#: application/controllers/IdxController.php:185 +#: application/controllers/IdxController.php:184 msgid "Value is required" msgstr "Le champ est requis" @@ -642,34 +642,30 @@ msgid "route by" msgstr "tracé par" #: application/controllers/IdxController.php:177 -msgid "Map by MapQuest, OpenStreetMap and contributors, CC-BY-SA" -msgstr "Carte par MapQuest, OpenStreetMap et contributeurs, CC-BY-SA" - -#: application/controllers/IdxController.php:178 msgid "checking availibilty" msgstr "vérification de la disponibilité" -#: application/controllers/IdxController.php:179 +#: application/controllers/IdxController.php:178 msgid "available pseudo" msgstr "pseudo disponible" -#: application/controllers/IdxController.php:180 +#: application/controllers/IdxController.php:179 msgid "unavailable pseudo" msgstr "pseudo non disponible" -#: application/controllers/IdxController.php:182 +#: application/controllers/IdxController.php:181 msgid "create" msgstr "créér" -#: application/controllers/IdxController.php:184 +#: application/controllers/IdxController.php:183 msgid "You have an unsaved route" msgstr "Vous avez un itinéraire non sauvegardé" -#: application/controllers/IdxController.php:186 +#: application/controllers/IdxController.php:185 msgid "no result" msgstr "pas de résultat" -#: application/controllers/IdxController.php:187 +#: application/controllers/IdxController.php:186 msgid "could not analyze file content" msgstr "impossible d'analyser le contenu du fichier" diff --git a/application/languages/lang_ja.po b/application/languages/lang_ja.po index 00c952e..37704d4 100644 --- a/application/languages/lang_ja.po +++ b/application/languages/lang_ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: syj\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-12 23:13+0200\n" +"POT-Creation-Date: 2011-04-04 13:05+0200\n" "PO-Revision-Date: \n" "Last-Translator: S.Higashi \n" "Language: \n" @@ -110,12 +110,12 @@ msgid "gpx export" msgstr "gpxにエクスポート" #: application/views/scripts/idx/index.phtml:112 -#: application/controllers/IdxController.php:183 +#: application/controllers/IdxController.php:182 msgid "duplicate" msgstr "複製" #: application/views/scripts/idx/index.phtml:114 -#: application/controllers/IdxController.php:181 +#: application/controllers/IdxController.php:180 msgid "edit" msgstr "編集" @@ -572,7 +572,7 @@ msgstr "Hi," #: application/controllers/ContactController.php:121 #: application/controllers/NewpwdController.php:68 #: application/controllers/AccountController.php:70 -#: application/controllers/IdxController.php:185 +#: application/controllers/IdxController.php:184 msgid "Value is required" msgstr "値が必要です" @@ -736,37 +736,30 @@ msgid "route by" msgstr "ルート作成者" #: application/controllers/IdxController.php:177 -msgid "" -"Map by MapQuest, OpenStreetMap " -"and contributors, CC-BY-SA" -msgstr "" - -#: application/controllers/IdxController.php:178 msgid "checking availibilty" msgstr "利用可能かチェック中" -#: application/controllers/IdxController.php:179 +#: application/controllers/IdxController.php:178 msgid "available pseudo" msgstr "利用出来るID" -#: application/controllers/IdxController.php:180 +#: application/controllers/IdxController.php:179 msgid "unavailable pseudo" msgstr "利用できないID" -#: application/controllers/IdxController.php:182 +#: application/controllers/IdxController.php:181 msgid "create" msgstr "作成" -#: application/controllers/IdxController.php:184 +#: application/controllers/IdxController.php:183 msgid "You have an unsaved route" msgstr "保存されていないルートがあります" -#: application/controllers/IdxController.php:186 +#: application/controllers/IdxController.php:185 msgid "no result" msgstr "結果がありません" -#: application/controllers/IdxController.php:187 +#: application/controllers/IdxController.php:186 msgid "could not analyze file content" msgstr "ファイル内容を分析できませんでした" diff --git a/public/css/syj.css b/public/css/syj.css index ae8e1b6..b5151ae 100644 --- a/public/css/syj.css +++ b/public/css/syj.css @@ -29,37 +29,6 @@ body, html { left: 0.5em; } -.olControlLayerSwitcher { - bottom: 4em; - top: auto; - left: 13px; - opacity: 0.75; - height: 6em; - max-width: intrinsic; - max-width: -moz-max-content; -} - -/* setting opacity to .olControlLayerSwitcher does not work */ -.olControlLayerSwitcher .layersDiv, -.olControlLayerSwitcher .maximizeDiv, -.olControlLayerSwitcher .minimizeDiv -{ - filter:alpha(opacity=75); -} - -.olControlLayerSwitcher .dataLayersDiv, .olControlLayerSwitcher .dataLbl { - display: none; -} -.olControlLayerSwitcher .layersDiv { - padding: 5px 12px 5px 36px; -} -.olControlLayerSwitcher .maximizeDiv { - top: -6em; -} -.olControlLayerSwitcher .minimizeDiv { - left: 4px; -} - /* * main message rules */ diff --git a/public/icons/layer-switcher-maximize-flipped.png b/public/icons/layer-switcher-maximize-flipped.png deleted file mode 100644 index f87fa323d2f1f29426fc64f836d04b15935ed83f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 479 zcmV<50U-W~P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipV- z6f`Mx8wa`o00Cb~L_t(I%dM2XOG053#(%F~KM})*E8-Y}(9jeTE<(G5i>__1f&WE9 zOS`jstAk)D=-TM!Rm4T@qISLdHkcRudJF5B4(A-6^L+$7Nq$Bj=m2e?CS|F)?;w6j zw2un#C}nA~Rk%1055T(+<@B$JbUjEo>^)_U163i)7fPaBE`ebb>Gz8S0-B2KSxKbp zL6*xEn&!gib1TafqI`F5kM?oDlXEH+!|&fjPb4CaKAnzZnic@P-Ur?8WS{8P8GkAj zqh8N5pWBW#6!NlI*x2@ZvnxU%r6dx0IoLC&G$9W272;4YjyVEOX|2|POs0z8zfong zR}_mkXqt;c;T6+dI;9;!XQxN4*1(aI$xBCWGz`Y$PgS$q|24JRNutqchR5T^w%1tJ zN_lrumYT|=jYfma=Qh)+b;`v6uB9wZG*zhKaHcXFKz{oH&h1gR7fb*E002ovPDHLkV1nbS%R&GE diff --git a/public/js/store.js b/public/js/store.js deleted file mode 120000 index bc23b5e..0000000 --- a/public/js/store.js +++ /dev/null @@ -1 +0,0 @@ -../store.js/store.js \ No newline at end of file diff --git a/public/js/syj.js b/public/js/syj.js index ed68bcf..fbe3f73 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'}); + { wrapDateLine: true , 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; diff --git a/public/js/syjraw.js b/public/js/syjraw.js index 8a77bb0..cf6be9c 100644 --- a/public/js/syjraw.js +++ b/public/js/syjraw.js @@ -17,30 +17,12 @@ function resizeMap() { map.style.height = map.offsetHeight.toString() + 'px'; } -function mapquestLayer() { - return 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}); -} - -function osmLayer() { - return 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'], - { attribution: SyjStrings.osmAttribution}); -} - function init() { var map = new OpenLayers.Map('map', { controls: [ new OpenLayers.Control.Attribution() ], theme: null}), - parameters = OpenLayers.Util.getParameters(window.location.href), - baseLayer = null, + baseLayer = new OpenLayers.Layer.OSM("OSM", null, { attribution: SyjStrings.osmAttribution }), layerOptions = {format: OpenLayers.Format.WKT, projection: WGS84, @@ -50,21 +32,6 @@ function init() { viewLayer = new OpenLayers.Layer.Vector("View Layer", layerOptions), wkt = new OpenLayers.Format.WKT({ internalProjection: Mercator, externalProjection: WGS84 }); - if (parameters.layer) { - switch (parameters.layer.toUpperCase()) { - case 'M': - baseLayer = mapquestLayer(); - break; - case 'O': - baseLayer = osmLayer(); - break; - } - } - - if (!baseLayer) { - baseLayer = osmLayer(); - } - map.addLayers([baseLayer, viewLayer]); viewLayer.addFeatures([wkt.read(gInitialGeom.data)]); extent = viewLayer.getDataExtent(); diff --git a/public/store.js b/public/store.js deleted file mode 160000 index 25c640b..0000000 --- a/public/store.js +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25c640b09962bcbf46a17e88817ce195118cfeac diff --git a/scripts/fulljslint.js b/scripts/fulljslint.js index 4cd74d3..9bffa4f 100755 --- a/scripts/fulljslint.js +++ b/scripts/fulljslint.js @@ -6595,4 +6595,4 @@ loop: for (;;) { return itself; -}()); +}()); \ No newline at end of file diff --git a/scripts/syj.cfg b/scripts/syj.cfg index 5c729f7..f473f40 100644 --- a/scripts/syj.cfg +++ b/scripts/syj.cfg @@ -15,7 +15,6 @@ OpenLayers/BaseTypes/Element.js OpenLayers/Console.js OpenLayers/Control/Attribution.js OpenLayers/Control/DrawFeature.js -OpenLayers/Control/LayerSwitcher.js OpenLayers/Control/Navigation.js OpenLayers/Control/DragFeature.js OpenLayers/Control/PanZoom.js -- 2.39.2