From 1c26c53c110b9dd594a912adc623638171ed6e52 Mon Sep 17 00:00:00 2001
From: maltaesousa <stephane.maltaesousa@ne.ch>
Date: Tue, 21 May 2019 15:03:58 +0200
Subject: [PATCH] add markers

---
 img/marker.svg   |  7 +++++
 index.html       | 52 +++++++++++++++++++++++++++++++++++
 js/sitnlayers.js | 71 ++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 121 insertions(+), 9 deletions(-)
 create mode 100644 img/marker.svg

diff --git a/img/marker.svg b/img/marker.svg
new file mode 100644
index 0000000..47bc9f7
--- /dev/null
+++ b/img/marker.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<svg width="30" height="30" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg"
+	 viewBox="0 0 52 52" style="enable-background:new 0 0 52 52;" xml:space="preserve">
+<path style="fill:#FFFFFF;" d="M38.853,5.324L38.853,5.324c-7.098-7.098-18.607-7.098-25.706,0h0
+	C6.751,11.72,6.031,23.763,11.459,31L26,52l14.541-21C45.969,23.763,45.249,11.72,38.853,5.324z M26.177,24c-3.314,0-6-2.686-6-6
+	s2.686-6,6-6s6,2.686,6,6S29.491,24,26.177,24z"/>
+</svg>
diff --git a/index.html b/index.html
index 28c5a3b..cd257fb 100644
--- a/index.html
+++ b/index.html
@@ -129,6 +129,58 @@ <h3>Exemple 3</h3>
 
     <hr>
 
+    <h3>Exemple 4</h3>
+    <p>Ajouter, modifier et supprimer un marker selon une paire de coordonnées Est-Nord. Recenter la carte.</p>
+    <div class="row form-group">
+      <div class="col">
+        <label for="coorde">Est</label>
+        <input class="form-control" type="number" name="coorde" id="coorde" value="2540000">
+      </div>
+      <div class="col">
+        <label for="coorde">Nord</label>
+        <input class="form-control" type="number" name="coordn" id="coordn" value="1203000">
+      </div>
+    </div>
+    <div class="form-group">
+      <button class="btn btn-primary" onclick="addMarker()">Ajouter</button>
+      <button class="btn btn-info" onclick="updateMarker()">Mettre à jour</button>
+      <button class="btn btn-danger" onclick="map4.removeMarker()">Supprimer</button>
+      <button class="btn btn-dark" onclick="recenterMap()">Recentrer la carte</button>
+    </div>
+    <div id="sitn-map-4" class="map"></div>
+
+    <script>
+      // Création de la carte
+      map4 = new SitnMap()
+      map4.createMap({
+        target: 'sitn-map-4'
+      })
+
+      // construction du tableau de coordonnées à partir des inputs
+      getCoord = function() {
+        return [$('#coorde').val(), $('#coordn').val()]
+      }
+
+      // ajouter un marker en lui passant une couleur (optionnel)
+      addMarker = function() {
+        map4.addMarker(getCoord(), "#4286f4")
+      }
+
+      // mettre à jour un marker
+      updateMarker = function() {
+        map4.updateMarker(getCoord())
+      }
+
+      // recentrer la carte à partir d'une paire 
+      // de coordonées et d'un niveau de zoom
+      recenterMap = function() {
+        map4.recenterMap(getCoord(), 14)
+      }
+      
+    </script>
+
+    <hr>
+
   </div>
 </body>
 
diff --git a/js/sitnlayers.js b/js/sitnlayers.js
index 1b1d947..271148b 100644
--- a/js/sitnlayers.js
+++ b/js/sitnlayers.js
@@ -6,7 +6,7 @@
     const _crs = 'EPSG:2056'
     const _WMTSurl = 'https://sitn.ne.ch/web_getcapabilities/WMTSGetCapabilities95.xml'
     const _drawSource = new ol.source.Vector()
-    const _vectorLayer = new ol.layer.Vector({ source: _drawSource })
+    const _markerSource = new ol.source.Vector()
     const _sitnBaseLayers = {
       'plan_ville': 'Plan de ville',
       'plan_cadastral': 'Plan cadastral',
@@ -17,6 +17,8 @@
     var _target
     var _selectTarget
     var _drawSimpleGeom = false
+    var _map = false
+    var _markerColor
 
     sitnLayers.sitnCurrentBaseLayer = new ol.layer.Tile()
 
@@ -72,11 +74,12 @@
       _selectTarget = options['selectTarget']
       _drawSimpleGeom = options['drawSimpleGeom'] // controls wether or not an user can draw multiple geometries
       let _mainbar
-      let _map = new ol.Map({
+      _map = new ol.Map({
         target: _target,
         layers: [
           sitnLayers.sitnCurrentBaseLayer,
-          _vectorLayer
+          new ol.layer.Vector({ source: _drawSource }),
+          new ol.layer.Vector({ source: _markerSource })
         ],
         view: sitnLayers.view
       })
@@ -123,7 +126,7 @@
               if (!features.getLength()) console.log('Select an object first...')
               else console.log(features.getLength() + ' object(s) deleted.')
               for (var i = 0, f; (f = features.item(i)); i++) {
-                _vectorLayer.getSource().removeFeature(f)
+                _drawSource.removeFeature(f)
               }
               selectCtrl.getInteraction().getFeatures().clear()
             }
@@ -147,7 +150,7 @@
             title: 'Point',
             interaction: new ol.interaction.Draw({
               type: 'Point',
-              source: _vectorLayer.getSource()
+              source: _drawSource
             })
           })
           editbar.addControl(pedit)
@@ -159,7 +162,7 @@
               title: 'LineString',
               interaction: new ol.interaction.Draw({
                 type: 'LineString',
-                source: _vectorLayer.getSource(),
+                source: _drawSource,
                 // Count inserted points
                 geometryFunction: function (coordinates, geometry) {
                   if (geometry) {
@@ -199,7 +202,7 @@
               title: 'Polygon',
               interaction: new ol.interaction.Draw({
                 type: 'Polygon',
-                source: _vectorLayer.getSource(),
+                source: _drawSource,
                 // Count inserted points
                 geometryFunction: function (coordinates, geometry) {
                   this.nbpts = coordinates[0].length
@@ -240,6 +243,7 @@
         });
       }
     }
+
     sitnLayers.loadWKT = function (wkt) {
       let format = new ol.format.WKT()
       let data = wkt;
@@ -247,16 +251,65 @@
         dataProjection: _crs,
         featureProjection: _crs
       })
-      _vectorLayer.getSource().addFeatures(features)
+      _drawSource.addFeatures(features)
     }
 
     sitnLayers.getWKTData = function () {
-      let features = _vectorLayer.getSource().getFeatures()
+      let features = _drawSource.getFeatures()
       if (features) {
         let wktData = new ol.format.WKT().writeFeatures(features)
         return wktData
       }
     }
+
+    /**
+     * Adds a marker based on coordinates: an array of 2 numbers
+     * and clears another existing maker before. The color is optional
+     */
+    sitnLayers.addMarker = function (coordinates, color) {
+      _markerColor = color
+      _markerSource.clear()
+      let marker = new ol.Feature({
+        geometry: new ol.geom.Point(coordinates)
+      })
+      marker.setStyle(new ol.style.Style({
+        image: new ol.style.Icon({
+          anchor: [0.5, 1],
+          color: _markerColor || '#8959A8',
+          opacity: 1,
+          src: '../img/marker.svg'
+        })
+      }))
+      _markerSource.addFeature(marker)
+    }
+
+    /**
+     * Updates marker position based
+     * on coordinates: an array of 2 numbers
+     */
+    sitnLayers.updateMarker = function (coordinates) {
+      sitnLayers.addMarker(coordinates)
+    }
+
+    /**
+     * Removes marker
+     */
+    sitnLayers.removeMarker = function () {
+      _markerSource.clear()
+    }
+
+    /**
+     * Recenters the map based
+     * on coordinates: an array of 2 numbers
+     */
+    sitnLayers.recenterMap = function (coordinates, zoomLevel) {
+      if (_map) {
+        let view = _map.getView()
+        view.setCenter(coordinates)
+        view.setZoom(zoomLevel)
+      }
+    }
+
     return sitnLayers
   }