Merge pull request #2 from mikemoraned/feature/optional-popup

0.1.1: add "markNames: true/false" option

Author: brendan-ward

L.Control.Geonames.js

@@ -11,7 +11,8 @@ L.Control.Geonames = L.Control.extend({
         workingClass: 'fa-spin', //class for search underway
         featureClasses: ['A', 'H', 'L', 'P', 'R', 'T', 'U', 'V'], //feature classes to search against.  See: http://www.geonames.org/export/codes.html
         baseQuery: 'isNameRequired=true', //The core query sent to GeoNames, later combined with other parameters above
-        position: 'topleft'
+        position: 'topleft',
+	markNames: true //show a marker at the location of each geoname found, with an associated popup which shows the name
     },
     onAdd: function() {
         this._container = L.DomUtil.create('div', 'leaflet-geonames-search leaflet-bar');
@@ -107,6 +108,7 @@ L.Control.Geonames = L.Control.extend({
             L.DomUtil.addClass(this._resultsList, 'hasResults');
             this._hasResults = true;
             var li;
+	    var zoomLevel = this.options.zoomLevel || this._map.getMaxZoom();
             response.geonames.forEach(function(geoname){
                 li = L.DomUtil.create('li', '', this._resultsList);
                 li.innerHTML = this._getName(geoname);
@@ -117,9 +119,12 @@ L.Control.Geonames = L.Control.extend({
                         this._map.removeLayer(this._marker);
                         this._marker = null;
                     }
-                    this._marker = L.marker([lat, lon]).addTo(this._map).bindPopup(this._getName(geoname));
-                    this._map.setView([lat, lon], this.options.zoomLevel || this._map.getMaxZoom(), false);
-                    this._marker.openPopup();
+		    this._map.setView([lat, lon], zoomLevel, false);
+		    if (this.options.markNames) {
+			this._marker = L.marker([lat, lon]);
+			this._marker.addTo(this._map).bindPopup(this._getName(geoname));
+			this._marker.openPopup();
+		    }
                 }, this);
             }, this);
         }

L.Control.Geonames.min.js

@@ -60,7 +60,8 @@ var control = L.control.geonames({
     workingClass: 'fa-spin',  // class for search underway
     featureClasses: ['A', 'H', 'L', 'P', 'R', 'T', 'U', 'V'],  // feature classes to search against.  See: http://www.geonames.org/export/codes.html
     baseQuery: 'isNameRequired=true',  // The core query sent to GeoNames, later combined with other parameters above
-    position: 'topleft'
+    position: 'topleft',
+    markNames: true // show a marker at the location of each geoname found, with an associated popup which shows the name
 });
 map.addControl(control);
 ```

README.md

@@ -1,9 +1,10 @@
 {
   "name": "Leaflet.Geonames",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "homepage": "https://github.com/consbio/Leaflet.Geonames",
   "authors": [
-    "Brendan Ward <bcward@consbio.org>"
+    "Brendan Ward <bcward@consbio.org>",
+    "Mike Moran <mike@houseofmoran.com>"
   ],
   "description": "GeoNames geocoding search control for Leaflet",
   "main": [

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "leaflet-geonames",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"description": "Geonames Geocoding Search Control for Leaflet",
   	"homepage": "http://github.com/consbio/Leaflet.Geonames",
   	"author": {