diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-10 18:26:10 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-10 18:26:10 +0200 |
| commit | aec62dcc91cb9bc858af1b5f5bd3c9bcee3b3ae4 (patch) | |
| tree | 4d7029e49de9a52548d2e0f2179ae8b9c1aadee9 | |
| parent | 4b7473631f362469008018c6015ecb8dbc4b2ee5 (diff) | |
| download | Chimère-aec62dcc91cb9bc858af1b5f5bd3c9bcee3b3ae4.tar.bz2 Chimère-aec62dcc91cb9bc858af1b5f5bd3c9bcee3b3ae4.zip | |
Fix routing panel show/hide
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index d2cfd98..181f05f 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -304,6 +304,7 @@ function transformCoordToLonLat(coord) { } settings = $.extend({}, defaults); settings._revision = 0; + if ( options ) $.extend(settings, options); if (settings.controls == null){ @@ -2396,25 +2397,6 @@ function transformCoordToLonLat(coord) { ); settings.routingFeatures.push(feature); - /* - var lonlat = new OpenLayers.LonLat( - feat.geometry.coordinates[0], - feat.geometry.coordinates[1]); - lonlat.transform(EPSG_DISPLAY_PROJECTION, - settings.map.getProjectionObject()); - var icon_height = feat.properties.icon_height; - var icon_width = feat.properties.icon_width; - var marker = new OpenLayers.Marker(lonlat, - new OpenLayers.Icon( - feat.properties.icon_path, - new OpenLayers.Size(icon_width, - icon_height), - new OpenLayers.Pixel( - -(icon_width/2), - -icon_height)) - ); - settings.layerRouteMarker.addMarker(marker); - */ } } if (data.message) methods.displayMessage(data.message); @@ -2435,14 +2417,17 @@ function transformCoordToLonLat(coord) { $('#chimere_itinerary_content').html( data.properties.description); $('#chimere_itinerary').show(); - if(!settings.edition_type_is_route){ + /* + TODO + if(settings.edition_type_is_route){ + methods.updateRoutingInput(); + } else { + */ if (!settings.mobile){ $('#chimere_itinerary_form').hide(); settings.routing_panel_open(); } - } else { - methods.updateRoutingInput(); - } + // } // Added for mobile - START // // iOS methods.connectWebViewJavascriptBridge( |