Remove mapboxgl.util.inherit (#63)

* Update to reflect removal of util.inherit
* Utilize mapboxgl.LngLat wrap fn
* Update geocoder test after landmark additions; add tests for lnglat wrapping

CHANGELOG.md

@@ -1,3 +1,7 @@
+### v1.3.2
+
+- Eliminate reliance on mapboxgl.util in preparation for [mapbox-gl-js#1408](https://github.com/mapbox/mapbox-gl-js/issues/1408)
+
 ### v1.3.1
 
 - [BUG] Bump `suggestions@v1.3.1` to fix lagged results [#48](https://github.com/mapbox/mapbox-gl-geocoder/issues/48)

index.js

@@ -37,7 +37,16 @@ function Geocoder(options) {
   this.options = extend({}, this.options, options);
 }
 
-Geocoder.prototype = mapboxgl.util.inherit(mapboxgl.Control, {
+function inherit(parent, props) {
+  var parentProto = typeof parent === 'function' ? parent.prototype : parent,
+    proto = Object.create(parentProto);
+  for (var i in props) {
+    Object.defineProperty(proto, i, Object.getOwnPropertyDescriptor(props, i));
+  }
+  return proto;
+}
+
+Geocoder.prototype = inherit(mapboxgl.Control, {
 
   options: {
     position: 'top-left',
@@ -194,10 +203,8 @@ Geocoder.prototype = mapboxgl.util.inherit(mapboxgl.Control, {
   _query: function(input) {
     if (!input) return;
     if (typeof input === 'object' && input.length) {
-      input = [
-        mapboxgl.util.wrap(input[0], -180, 180),
-        mapboxgl.util.wrap(input[1], -180, 180)
-      ].join();
+      // wrap to [-180, 180]
+      input = mapboxgl.LngLat.convert(input).wrap().toArray().join();
     }
 
     this._geocode(input, function(results) {
@@ -213,10 +220,8 @@ Geocoder.prototype = mapboxgl.util.inherit(mapboxgl.Control, {
   _setInput: function(input) {
     if (!input) return;
     if (typeof input === 'object' && input.length) {
-      input = [
-        mapboxgl.util.wrap(input[0], -180, 180),
-        mapboxgl.util.wrap(input[1], -180, 180)
-      ].join();
+      // wrap to [-180, 180]
+      input = mapboxgl.LngLat.convert(input).wrap().toArray().join();
     }
 
     // Set input value to passed value and clear everything else.

package.json

@@ -32,7 +32,7 @@
     "envify": "^3.4.1",
     "eslint": "^2.13.1",
     "lodash.once": "^4.0.0",
-    "mapbox-gl": "^0.20.1",
+    "mapbox-gl": "0.26.0",
     "smokestack": "^3.3.1",
     "tap-status": "^1.0.1",
     "tape": "^4.6.0",

test/test.geocoder.js

@@ -65,10 +65,10 @@ test('geocoder', function(tt) {
       ]
     });
 
-    geocoder.query('Paris');
+    geocoder.query('London');
     geocoder.on('results', once(function(e) {
       t.ok(e.results.length, 'Event for results emitted');
-      t.equals(e.results[0].text, 'Paris Jewelry', 'Result is returned within a bbox');
+      t.equals(e.results[0].text, 'London Sole', 'Result is returned within a bbox');
     }));
   });
 
@@ -78,7 +78,7 @@ test('geocoder', function(tt) {
     geocoder.query('1714 14th St NW');
     geocoder.on('result', once(function() {
       map.once(map.on('moveend', function() {
-        t.equals(map.getZoom(), 12, 'Custom zoom is supported');
+        t.equals(parseInt(map.getZoom()), 12, 'Custom zoom is supported');
       }));
     }));
   });

test/test.ui.js

@@ -21,7 +21,7 @@ test('Geocoder#inputControl', function(tt) {
 
   tt.test('input', function(t) {
     setup();
-    t.plan(8);
+    t.plan(10);
     var inputEl = container.querySelector('.mapboxgl-ctrl-geocoder input');
     var clearEl = container.querySelector('.mapboxgl-ctrl-geocoder button');
     inputEl.addEventListener('change', once(function() {
@@ -42,6 +42,12 @@ test('Geocoder#inputControl', function(tt) {
       t.equals(inputEl.value, 'Paris', 'value populates in input');
       t.ok(clearEl.classList.contains('active'), 'clear link is active');
       t.notOk(geocoder.getResult(), 'input is set but result is null');
+
+      geocoder.setInput([90, 45]);
+      t.equals(inputEl.value, '90,45', 'valid LngLat value populates in input');
+
+      geocoder.setInput([270, 45]);
+      t.equals(inputEl.value, '-90,45', 'LngLat wraps if need be');
     }));
 
     geocoder.query([-79, 43]);