X-Git-Url: https://dev.renevier.net/?p=syj.git;a=blobdiff_plain;f=public%2Fjs%2Fsyjraw.js;h=cf6be9c37eb8e964d3ea010be1581735d046a28c;hp=8a77bb0ee948faf92d9495aa8ea27e07e8d7733c;hb=6a642fc4ff9526efe4ac180e53f356be79235c62;hpb=7ab93faefae14af39fc5449a2c3311dd68d2c0f9 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();