@@ -176,7 +176,8 @@ <script type="text/javascript" language="javascript1.2"> // <![CDATA[ - var map = makeMap('map', 'http://tile.cloudmade.com/{$constants.CLOUDMADE_KEY|escape}/2/256/{literal}{Z}/{X}/{Y}{/literal}.png'); + var map = makeMap('map', '{$provider|escape:"javascript"}'); + map.setCenterZoom(new mm.Location({$latitude}, {$longitude}), {$zoom}); // {literal} @@ -326,42 +327,44 @@ <input class="mac-button" type="submit" name="action" value="{$label}" /> </p> - <p> - {if $language == "de"} - Kartenstil: - {elseif $language == "nl"} - Provider: - {elseif $language == "es"} - Provider: - {elseif $language == "fr"} - Provider: - {elseif $language == "ja"} - Provider: - {elseif $language == "it"} - Provider: - {else} - Provider: - {/if} - <select name="provider" onchange="setProvider(this.value);"> - {assign var="label" value="Cloudmade: Fineline"} - <option label="{$label}" value="http://tile.cloudmade.com/{$constants.CLOUDMADE_KEY|escape}/2/256/{literal}{Z}/{X}/{Y}{/literal}.png" selected="selected">{$label}</option> - - {assign var="label" value="OpenStreetMap"} - <option label="{$label}" value="http://tile.openstreetmap.org/{literal}{Z}/{X}/{Y}{/literal}.png">{$label}</option> - - {assign var="label" value="Cloudmade: No Name"} - <option label="{$label}" value="http://tile.cloudmade.com/{$constants.CLOUDMADE_KEY|escape}/3/256/{literal}{Z}/{X}/{Y}{/literal}.png">{$label}</option> - - {assign var="label" value="OpenStreetMap: Osmarender"} - <option label="{$label}" value="http://tah.openstreetmap.org/Tiles/tile/{literal}{Z}/{X}/{Y}{/literal}.png">{$label}</option> - - {assign var="label" value="OpenStreetMap: CycleMap"} - <option label="{$label}" value="http://andy.sandbox.cloudmade.com/tiles/cycle/{literal}{Z}/{X}/{Y}{/literal}.png">{$label}</option> - - {assign var="label" value="Cloudmade: Fresh"} - <option label="{$label}" value="http://tile.cloudmade.com/{$constants.CLOUDMADE_KEY|escape}/997/256/{literal}{Z}/{X}/{Y}{/literal}.png">{$label}</option> - </select> - </p> + {if !$request.get.provider} + <p> + {if $language == "de"} + Kartenstil: + {elseif $language == "nl"} + Provider: + {elseif $language == "es"} + Provider: + {elseif $language == "fr"} + Provider: + {elseif $language == "ja"} + Provider: + {elseif $language == "it"} + Provider: + {else} + Provider: + {/if} + <select name="provider" onchange="setProvider(this.value);"> + {assign var="label" value="Cloudmade: Fineline"} + <option label="{$label}" value="http://tile.cloudmade.com/{$constants.CLOUDMADE_KEY|escape}/2/256/{literal}{Z}/{X}/{Y}{/literal}.png" selected="selected">{$label}</option> + + {assign var="label" value="OpenStreetMap"} + <option label="{$label}" value="http://tile.openstreetmap.org/{literal}{Z}/{X}/{Y}{/literal}.png">{$label}</option> + + {assign var="label" value="Cloudmade: No Name"} + <option label="{$label}" value="http://tile.cloudmade.com/{$constants.CLOUDMADE_KEY|escape}/3/256/{literal}{Z}/{X}/{Y}{/literal}.png">{$label}</option> + + {assign var="label" value="OpenStreetMap: Osmarender"} + <option label="{$label}" value="http://tah.openstreetmap.org/Tiles/tile/{literal}{Z}/{X}/{Y}{/literal}.png">{$label}</option> + + {assign var="label" value="OpenStreetMap: CycleMap"} + <option label="{$label}" value="http://andy.sandbox.cloudmade.com/tiles/cycle/{literal}{Z}/{X}/{Y}{/literal}.png">{$label}</option> + + {assign var="label" value="Cloudmade: Fresh"} + <option label="{$label}" value="http://tile.cloudmade.com/{$constants.CLOUDMADE_KEY|escape}/997/256/{literal}{Z}/{X}/{Y}{/literal}.png">{$label}</option> + </select> + </p> + {/if} </form> <h2>{strip} site/templates/index.html.tpl @@ -69,7 +69,6 @@ function makeMap(elementID, providerURL) map.addCallback('extentset', function(m, a) { return onMapChanged(m); }); map.addCallback('panned', function(m, a) { return onMapChanged(m); }); - map.setCenterZoom(new mm.Location(37.660, -122.168), 9); map.draw(); return map; site/www/index.js @@ -6,6 +6,10 @@ require_once 'data.php'; list($user_id, $language) = read_userdata($_COOKIE['visitor'], $_SERVER['HTTP_ACCEPT_LANGUAGE']); + $provider = is_null($_GET['provider']) ? 'http://tile.cloudmade.com/'.CLOUDMADE_KEY.'/2/256/{Z}/{X}/{Y}.png' : $_GET['provider']; + $latitude = is_numeric($_GET['lat']) ? floatval($_GET['lat']) : 37.660; + $longitude = is_numeric($_GET['lon']) ? floatval($_GET['lon']) : -122.168; + $zoom = is_numeric($_GET['zoom']) ? intval($_GET['zoom']) : 9; /**** ... ****/ @@ -25,6 +29,11 @@ $sm->assign('scans', $scans); $sm->assign('language', $language); + $sm->assign('provider', $provider); + $sm->assign('latitude', $latitude); + $sm->assign('longitude', $longitude); + $sm->assign('zoom', $zoom); + header("Content-Type: text/html; charset=UTF-8"); print $sm->fetch("index.html.tpl"); site/www/index.php 1240a813f3f41b7bc39a36debba0ffc181561734 Michal Migurski migurski@or.pair.com http://github.com/migurski/paperwalking/commit/59839d1cc1be40ff90c727ad61f6fb7620d98edb 59839d1cc1be40ff90c727ad61f6fb7620d98edb 2009-11-04T23:24:14-08:00 2009-11-04T23:24:14-08:00 Added in-URL provider, location, and zoom for direct links e3d438ab965cdb724bea438d6195a05587a0ea63 Michal Migurski migurski@or.pair.com