feat(rename): Renamed to lonlat.

Author: trevorgerhardt

.travis.yml

@@ -1,16 +1,9 @@
 sudo: false
 language: node_js
-cache:
-  directories:
-    - node_modules
 notifications:
   email: false
 node_js:
   - '6'
-before_install:
-  - npm i -g npm@^3.0.0
-before_script:
-  - npm prune
 after_success:
   - npm run semantic-release
 branches:

index.js

@@ -1,7 +1,7 @@
 
 module.exports = normalize
 module.exports.fromCoordinates = module.exports.fromGeoJSON = fromCoordinates
-module.exports.fromLatlng = module.exports.fromLatlon = module.exports.fromLeaflet = fromLatlon
+module.exports.fromLatlng = module.exports.fromLeaflet = fromLatlng
 module.exports.fromPoint = fromPoint
 module.exports.fromString = fromString
 
@@ -10,22 +10,18 @@ module.exports.print = function print (input, fixed) {
   return ll.lon.toFixed(fixed || 5) + ', ' + ll.lat.toFixed(fixed || 5)
 }
 
-module.exports.isEqual = function (latlon1, latlon2, epsilon) {
-  latlon1 = normalize(latlon1)
-  latlon2 = normalize(latlon2)
+module.exports.isEqual = function (lonlat1, lonlat2, epsilon) {
+  lonlat1 = normalize(lonlat1)
+  lonlat2 = normalize(lonlat2)
   epsilon = epsilon || 0
-  return (Math.abs(latlon1.lat - latlon2.lat) <= epsilon) && (Math.abs(latlon1.lon - latlon2.lon) <= epsilon)
+  return (Math.abs(lonlat1.lat - lonlat2.lat) <= epsilon) && (Math.abs(lonlat1.lon - lonlat2.lon) <= epsilon)
 }
 
 module.exports.toCoordinates = module.exports.toGeoJSON = function toCoordinates (input) {
   var ll = normalize(input)
   return [ll.lon, ll.lat]
 }
 
-module.exports.tolatlon = function tolatlon (input) {
-  return normalize(input)
-}
-
 module.exports.toPoint = function toPoint (input) {
   var ll = normalize(input)
   return {x: ll.lon, y: ll.lat}
@@ -46,8 +42,8 @@ function fromCoordinates (coordinates) {
   return floatize({lon: coordinates[0], lat: coordinates[1]})
 }
 
-function fromLatlon (latlon) {
-  return floatize(latlon)
+function fromLatlng (lonlat) {
+  return floatize(lonlat)
 }
 
 function fromPoint (point) {
@@ -59,9 +55,9 @@ function fromString (str) {
   return floatize({lon: arr[0], lat: arr[1]})
 }
 
-function floatize (latlon) {
-  const lon = parseFloat(latlon.lon || latlon.lng || latlon.longitude)
-  return {lng: lon, lon: lon, lat: parseFloat(latlon.lat || latlon.latitude)}
+function floatize (lonlat) {
+  const lon = parseFloat(lonlat.lon || lonlat.lng || lonlat.longitude)
+  return {lon: lon, lat: parseFloat(lonlat.lat || lonlat.latitude)}
 }
 
 function normalize (unknown) {

package.json

@@ -1,9 +1,9 @@
 {
-  "name": "lonlng",
-  "description": "Lat/lon normalization cause...**sigh**",
+  "name": "@conveyal/lonlat",
+  "description": "Lon/lat normalization",
   "main": "index.js",
   "scripts": {
-    "test": "node test.js",
+    "test": "mastarm lint && node test.js",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "repository": {
@@ -24,6 +24,7 @@
   },
   "homepage": "https://github.com/conveyal/lonlng",
   "devDependencies": {
+    "mastarm": "^1.3.0",
     "semantic-release": "^4.3.5"
   }
 }

test.js

@@ -3,28 +3,29 @@ const ll = require('./')
 
 const lat = 38.13234
 const lon = 70.01232
-const latlon = {lat, lon, lng: lon}
+const lonlat = {lon, lat}
 const point = {x: lon, y: lat}
 const coordinates = [lon, lat]
 const str = `${lon},${lat}`
+const latlng = {lat, lng: lon}
 
 const pairs = [
   // normalization
-  [latlon, ll(latlon)],
-  [latlon, ll(point)],
-  [latlon, ll(coordinates)],
-  [latlon, ll(str)],
+  [lonlat, ll(lonlat)],
+  [lonlat, ll(point)],
+  [lonlat, ll(coordinates)],
+  [lonlat, ll(str)],
 
   // convert to type, normalizes to `latlng` first in each function
-  [ll.toCoordinates(latlon), coordinates],
-  [ll.toPoint(latlon), point],
-  [ll.toString(latlon), str],
+  [ll.toCoordinates(lonlat), coordinates],
+  [ll.toPoint(lonlat), point],
+  [ll.toString(lonlat), str],
 
   // if the type is known, use the specific convert function directly
-  [latlon, ll.fromLatlng(latlon)],
-  [latlon, ll.fromCoordinates(coordinates)],
-  [latlon, ll.fromPoint(point)],
-  [latlon, ll.fromString(str)]
+  [lonlat, ll.fromLatlng(latlng)],
+  [lonlat, ll.fromCoordinates(coordinates)],
+  [lonlat, ll.fromPoint(point)],
+  [lonlat, ll.fromString(str)]
 ]
 
 pairs.forEach((pair) => assert.deepEqual(pair[0], pair[1]))