Changeset 24e428b in osmose-frontend


Ignore:
Timestamp:
Nov 25, 2012 7:38:35 PM (6 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
eb4b497
Parents:
f696c4d (diff), 38a1ca7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'frodrigo/bottle' into dev

Files:
3 deleted
3 edited
24 moved

Legend:

Unmodified
Added
Removed
  • static/map/map.js

    r8390d78 r38a1ca7  
    55var oldzoom = -1; 
    66var heat = null; 
     7var poisParams = null; 
    78 
    89//----------------------------------------// 
     
    5556    }); 
    5657    map.addLayer(bing); 
    57  
    58     heat = new OpenLayers.Layer.OSM("Heatmap", ["heat/${z}/${x}/${y}.png"], { 
    59         transitionEffect: 'resize', 
    60         isBaseLayer: false, 
    61     }); 
    62     map.addLayer(heat); 
    6358 
    6459    //var layerTilesAtHome = new OpenLayers.Layer.OSM.Osmarender("Osmarender"); 
     
    118113    map.addLayers(layers); 
    119114 
     115    heat = new OpenLayers.Layer.OSM("Osmose Errors Heatmap", ["heat/${z}/${x}/${y}.png"], { 
     116        transitionEffect: 'resize', 
     117        isBaseLayer: false, 
     118    }); 
     119    map.addLayer(heat); 
     120 
    120121    /* Must be the last layers so that markers are above any other layers */ 
    121     pois = new OpenLayers.Layer.DynPoi("Erreurs Osmose", { 
     122    pois = new OpenLayers.Layer.DynPoi("Osmose Errors", { 
    122123        location: "markers", 
    123124        projection: new OpenLayers.Projection("EPSG:4326") 
     
    428429    permalink.href = permalink.href.replace(/&level=[-0-9x,]*/, '').replace(/\?level=[-0-9x,]*&?/, '?') + "&level=" + document.myform.level.value; 
    429430 
    430     var params = 
     431    poisParams = 
    431432        "?lat=" + document.myform.lat.value + 
    432433        "&lon=" + document.myform.lon.value + 
     
    436437        "&item=" + ch + 
    437438        "&level=" + document.myform.level.value; 
    438  
    439     pois.loadText(params); 
     439    pois.loadText(poisParams); 
    440440 
    441441    if (heat.visibility) { 
     442        var params = 
     443            "?source=" + document.myform.source.value + 
     444            "&user=" + document.myform.user.value + 
     445            "&item=" + ch + 
     446            "&level=" + document.myform.level.value; 
    442447        var url = "heat/${z}/${x}/${y}.png" + params; 
    443448        if (heat.url != url) { 
     
    448453    } 
    449454} 
     455 
     456function poisUpdate() { 
     457    pois.loadText(poisParams); 
     458} 
  • views/map/popup.tpl

    rb441b4a r38a1ca7  
    7777  <div class="bulle_maj"> 
    7878    <b>{{_("change status")}} :</b> 
    79     <a onclick="setTimeout('pois.loadText();',2000);" href="../error/<%error_id%>/done" target="hiddenIframe">{{_("corrected")}}</a> 
    80     <a onclick="setTimeout('pois.loadText();',2000);" href="../error/<%error_id%>/false" target="hiddenIframe">{{_("false positive")}}</a> 
     79    <a onclick="setTimeout('poisUpdate();',2000);" href="../error/<%error_id%>/done" target="hiddenIframe">{{_("corrected")}}</a> 
     80    <a onclick="setTimeout('poisUpdate();',2000);" href="../error/<%error_id%>/false" target="hiddenIframe">{{_("false positive")}}</a> 
    8181</div> 
    8282 
  • README

    r073e3a4 r8bdfa12  
    1111  python-psycopg2 > 2.4 
    1212  python-matplotlib 
     13  python-imaging 
    1314  apache2 
    1415  libapache2-mod-wsgi 
Note: See TracChangeset for help on using the changeset viewer.