diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-12 11:22:35 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-12 11:22:35 +0200 |
commit | efa92f5a8e03de8ea5c44677f6dbc815206b287c (patch) | |
tree | 28e41a4355c5ed1f5632d12038fad01ad6d4328d | |
parent | 4c35ed24302e54773044d336c70008678fa48b2f (diff) | |
download | Chimère-efa92f5a8e03de8ea5c44677f6dbc815206b287c.tar.bz2 Chimère-efa92f5a8e03de8ea5c44677f6dbc815206b287c.zip |
Fix live latlon widget
-rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 6 | ||||
-rw-r--r-- | chimere/templates/chimere/blocks/live_coordinates.html | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 1eea767..d70b870 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -2988,10 +2988,10 @@ function transformCoordToLonLat(coord) { } }, /* put the marker on the map and update latitude and longitude fields */ - putEditMarker: function (lonlat, zoom){ + putEditMarker: function (latlon, zoom){ if (settings.features.getLength()) settings.features.pop(); - // console.log(lonlat); - var point = new ol.geom.Point(lonlat); + // console.log(latlon); + var point = new ol.geom.Point(latlon); point.transform(EPSG_DISPLAY_PROJECTION, EPSG_PROJECTION); var feature = new ol.Feature({ geometry: point diff --git a/chimere/templates/chimere/blocks/live_coordinates.html b/chimere/templates/chimere/blocks/live_coordinates.html index a87bfd8..00e75cf 100644 --- a/chimere/templates/chimere/blocks/live_coordinates.html +++ b/chimere/templates/chimere/blocks/live_coordinates.html @@ -23,11 +23,11 @@ <div id='live_lonlat'> <p> <label for='live_latitude'>{{lat}}</label> - <input type='text' readonly='readonly' name='live_latitude' id='live_latitude' size='8' adisabled='true' value='{{value_y|stringformat:"f"}}'/> + <input type='text' name='live_latitude' id='live_latitude' size='8' adisabled='true' value='{{value_y|stringformat:"f"}}'/> </p> <p> <label for='live_longitude'>{{lon}}</label> - <input type='text' readonly='readonly' name='live_longitude' id='live_longitude' size='8' adisabled='true' value='{{value_x|stringformat:"f"}}'/> + <input type='text' name='live_longitude' id='live_longitude' size='8' adisabled='true' value='{{value_x|stringformat:"f"}}'/> </p> <input type='hidden' name='{{name}}' id='id_{{name}}' value='{{val}}'/> @@ -35,10 +35,10 @@ function init_map_edit(){ $('#map_edit').chimere(chimere_init_options); {% if isvalue %} - var mylonlat = [{{value_x|stringformat:"f"}}, + var mylatlon = [{{value_x|stringformat:"f"}}, {{value_y|stringformat:"f"}}]; $("#map_edit").chimere("putEditMarker", - mylonlat, true); + mylatlon, true); $('#map_edit').chimere('activateModify'); {% else %} $('#map_edit').chimere('activateDraw'); @@ -46,10 +46,12 @@ $('#map_edit').chimere('zoom', { 'area':%s }); function update_marker_on_map(){ - var mylonlat = [$('#live_longitude').val(), - $('#live_latitude').val()]; + var mylatlon = [ + parseFloat($('#live_longitude').val()), + parseFloat($('#live_latitude').val()) + ]; $("#map_edit").chimere("putEditMarker", - mylonlat, + mylatlon, true); } $('#live_latitude').change(update_marker_on_map); |