From d1674110dc05e3061119e19d6b0dbc1aee7b58a9 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 6 Feb 2019 10:37:20 +0100
Subject: [PATCH] Correction bug virgules dans la localisation X/Y pour Firefox
---
.../module/javascript/app/vmap/tools/location.js | 11 +++++++----
src/module_vmap/module/template/tools/location.html | 4 ++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/module_vmap/module/javascript/app/vmap/tools/location.js b/src/module_vmap/module/javascript/app/vmap/tools/location.js
index f5af7b56..00cf0e9f 100644
--- a/src/module_vmap/module/javascript/app/vmap/tools/location.js
+++ b/src/module_vmap/module/javascript/app/vmap/tools/location.js
@@ -421,15 +421,18 @@ nsVmap.nsToolsManager.Location.prototype.locationController.prototype.selectHist
/**
* Localise the map on the entry position
- * @param {string} CoordX html id to the X value
- * @param {string} CoordY html id to the Y value
+ * @param {string} sCoordX html id to the X value
+ * @param {string} sCoordY html id to the Y value
* @param {string} projectionId html id to the projection value
* @export
*/
-nsVmap.nsToolsManager.Location.prototype.locationController.prototype.goTo = function (CoordX, CoordY, projection) {
+nsVmap.nsToolsManager.Location.prototype.locationController.prototype.goTo = function (sCoordX, sCoordY, projection) {
oVmap.log("nsVmap.nsToolsManager.Location.prototype.locationController.goTo");
- var coordinates = [parseFloat(CoordX), parseFloat(CoordY)];
+ sCoordX = sCoordX.replace(',', '.');
+ sCoordY = sCoordY.replace(',', '.');
+
+ var coordinates = [parseFloat(sCoordX), parseFloat(sCoordY)];
var currentProjeciton = oVmap.getMap().getOLMap().getView().getProjection();
var projectedCoordinates = ol.proj.transform(coordinates, projection, currentProjeciton);
diff --git a/src/module_vmap/module/template/tools/location.html b/src/module_vmap/module/template/tools/location.html
index 59d1b1fa..39157c30 100644
--- a/src/module_vmap/module/template/tools/location.html
+++ b/src/module_vmap/module/template/tools/location.html
@@ -143,10 +143,10 @@
<div class="row margin-sides-0 margin-10">
<div class="col-md-5">
<div class="input-group-sm">
- <input type="number" class="form-control" placeholder="X" ng-model="goToX">
+ <input type="text" class="form-control" placeholder="X" ng-model="goToX">
</div>
<div class="input-group-sm">
- <input type="number" class="form-control" placeholder="Y" ng-model="goToY">
+ <input type="text" class="form-control" placeholder="Y" ng-model="goToY">
</div>
</div>
<div class="col-md-5">
--
GitLab