movlog 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 823b6ef7a85624f2a3a27ced65136a65445db30d
4
- data.tar.gz: eabce79dc814ea5df9d088d6d81c0f2200f5045e
3
+ metadata.gz: 1ea512d6a381f943bd741a2e5fde27e310443559
4
+ data.tar.gz: f9c334811247d36fe0a354198e6795fca9341a24
5
5
  SHA512:
6
- metadata.gz: 5fee146f0936044cc05388b5458810e81d2426878f7a38cf19401e20705152043efd8d714c1993588c74cfb7600c16c24f6067f4710fbe4b63c46173b93d0435
7
- data.tar.gz: b2088e25575954ef4beececf5f4b9bc4a46ba480e25ca837d761b822af87d4912559aadea6cf80b9de005011e8173a6204dc9f9bd1833652b029b53814c9ada8
6
+ metadata.gz: cad533b29340d9bb8ce558dcec1425efdb2ae66ff978961282cd180d7b7417ad45af0036fbffe196829fc95cf86908c58be114b5479efc71841ed7785a27a427
7
+ data.tar.gz: 9deadff22b73ac3fb2afbc4769a22e99f443b3e27cf60424e94884d54e1fe173dfca9ce00b5d39d88424cd7377cf4a8cf9aa1d03e9784d10e81729f6dbf20562
@@ -22,7 +22,7 @@ module Airports
22
22
 
23
23
  def airports
24
24
  return @airports if @airports
25
- @airports = load_airport(GeonamesApi.near_airports(lat: @lat, lng: @lng))
25
+ load_airports(GeonamesApi.near_airports(lat: @lat, lng: @lng))
26
26
  end
27
27
 
28
28
  private
@@ -33,15 +33,33 @@ module Airports
33
33
  @lng = data['lng'].to_f
34
34
  end
35
35
 
36
- def load_airport(airports)
37
- airports.map do |ap|
36
+ def load_airports(airports)
37
+ @airports = airports.map do |ap|
38
38
  if ap['name'].include? 'Air'
39
- {
40
- name: ap['name'], country_code: ap['countryCode'],
41
- lat: ap['lat'].to_f, lng: ap['lng'].to_f
42
- }
39
+ airport_hash(ap)
43
40
  end
44
41
  end.compact
42
+ @airports = sort_airports
43
+ end
44
+
45
+ def sort_airports
46
+ inter = []
47
+ nomal = []
48
+ @airports.each do |ap|
49
+ if ap[:name].include? 'International'
50
+ inter << ap
51
+ elsif nomal.length < 5
52
+ nomal << ap
53
+ end
54
+ end
55
+ sorted_airports = inter + nomal
56
+ end
57
+
58
+ def airport_hash(ap)
59
+ {
60
+ name: ap['name'], country_code: ap['countryCode'],
61
+ lat: ap['lat'].to_f, lng: ap['lng'].to_f
62
+ }
45
63
  end
46
64
  end
47
65
  end
@@ -40,7 +40,7 @@ module Airports
40
40
  username: config[:username],
41
41
  fcode: 'AIRP',
42
42
  lat: lat, lng: lng,
43
- radius: 200, maxRows: 10
43
+ radius: 200, maxRows: 50
44
44
  }
45
45
  )
46
46
  JSON.parse(findnearby_response.to_s)['geonames']
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Movlog
4
- VERSION = '0.4.1'
4
+ VERSION = '0.4.2'
5
5
  end
@@ -18,8 +18,9 @@ describe 'Airports specifications' do
18
18
  end
19
19
 
20
20
  it 'should get airport by geocoord from Geonames' do
21
- airport_info = Airports::AirportInfo.find('Canterbury, New Zealand')
21
+ airport_info = Airports::AirportInfo.find('Taiwan')
22
22
  airports = airport_info.airports
23
+ puts airport_info.airports.to_json
23
24
  airports.length.must_be :>, 0
24
25
  end
25
26
  end
@@ -237,4 +237,233 @@ http_interactions:
237
237
  Zealand","fcodeName":"airport","adminName1":"Canterbury","lat":"-43.58832","fcode":"AIRP"}]}'
238
238
  http_version:
239
239
  recorded_at: Sat, 31 Dec 2016 08:21:03 GMT
240
+ - request:
241
+ method: get
242
+ uri: https://maps.googleapis.com/maps/api/geocode/json?address=Taiwan&key=<GOOGLEMAP_KEY>
243
+ body:
244
+ encoding: US-ASCII
245
+ string: ''
246
+ headers:
247
+ Connection:
248
+ - close
249
+ Host:
250
+ - maps.googleapis.com
251
+ User-Agent:
252
+ - http.rb/2.1.0
253
+ response:
254
+ status:
255
+ code: 200
256
+ message: OK
257
+ headers:
258
+ Content-Type:
259
+ - application/json; charset=UTF-8
260
+ Date:
261
+ - Sat, 31 Dec 2016 16:59:15 GMT
262
+ Expires:
263
+ - Sun, 01 Jan 2017 16:59:15 GMT
264
+ Cache-Control:
265
+ - public, max-age=86400
266
+ Access-Control-Allow-Origin:
267
+ - "*"
268
+ Server:
269
+ - mafe
270
+ X-Xss-Protection:
271
+ - 1; mode=block
272
+ X-Frame-Options:
273
+ - SAMEORIGIN
274
+ Alt-Svc:
275
+ - quic=":443"; ma=2592000; v="35,34"
276
+ Accept-Ranges:
277
+ - none
278
+ Vary:
279
+ - Accept-Language,Accept-Encoding
280
+ Connection:
281
+ - close
282
+ body:
283
+ encoding: UTF-8
284
+ string: |
285
+ {
286
+ "results" : [
287
+ {
288
+ "address_components" : [
289
+ {
290
+ "long_name" : "Taiwan",
291
+ "short_name" : "TW",
292
+ "types" : [ "country", "political" ]
293
+ }
294
+ ],
295
+ "formatted_address" : "Taiwan",
296
+ "geometry" : {
297
+ "bounds" : {
298
+ "northeast" : {
299
+ "lat" : 26.4545,
300
+ "lng" : 123.5021012
301
+ },
302
+ "southwest" : {
303
+ "lat" : 20.5170001,
304
+ "lng" : 116.6665
305
+ }
306
+ },
307
+ "location" : {
308
+ "lat" : 23.69781,
309
+ "lng" : 120.960515
310
+ },
311
+ "location_type" : "APPROXIMATE",
312
+ "viewport" : {
313
+ "northeast" : {
314
+ "lat" : 25.2996538,
315
+ "lng" : 122.0066942
316
+ },
317
+ "southwest" : {
318
+ "lat" : 21.8968211,
319
+ "lng" : 120.0350435
320
+ }
321
+ }
322
+ },
323
+ "place_id" : "ChIJL1cHXAbzbjQRaVScvwTwEec",
324
+ "types" : [ "country", "political" ]
325
+ }
326
+ ],
327
+ "status" : "OK"
328
+ }
329
+ http_version:
330
+ recorded_at: Sat, 31 Dec 2016 16:59:15 GMT
331
+ - request:
332
+ method: get
333
+ uri: http://api.geonames.org/findNearbyJSON?fcode=AIRP&lat=23.69781&lng=120.960515&maxRows=10&radius=200&username=<GEONAMES_USERNAME>
334
+ body:
335
+ encoding: US-ASCII
336
+ string: ''
337
+ headers:
338
+ Connection:
339
+ - close
340
+ Host:
341
+ - api.geonames.org
342
+ User-Agent:
343
+ - http.rb/2.1.0
344
+ response:
345
+ status:
346
+ code: 200
347
+ message: OK
348
+ headers:
349
+ Date:
350
+ - Sat, 31 Dec 2016 16:59:16 GMT
351
+ Server:
352
+ - Apache
353
+ Cache-Control:
354
+ - no-cache
355
+ Access-Control-Allow-Origin:
356
+ - "*"
357
+ Connection:
358
+ - close
359
+ Transfer-Encoding:
360
+ - chunked
361
+ Content-Type:
362
+ - application/json;charset=UTF-8
363
+ body:
364
+ encoding: UTF-8
365
+ string: '{"geonames":[{"adminCode1":"04","lng":"120.6558","distance":"62.02683","geonameId":8521367,"toponymName":"Shuinan
366
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Shuinan
367
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"24.18278","fcode":"AIRP"},{"adminCode1":"04","lng":"120.39283","distance":"63.57216","geonameId":6300295,"toponymName":"Chiayi
368
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Chiayi
369
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"23.46178","fcode":"AIRP"},{"adminCode1":"04","lng":"120.62694","distance":"71.16248","geonameId":6587703,"toponymName":"Taichung
370
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Taichung
371
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"24.2625","fcode":"AIRP"},{"adminCode1":"04","lng":"121.58942","distance":"73.72661","geonameId":6643073,"toponymName":"Jiashan
372
+ Jichang","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Jiashan
373
+ Jichang","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"24.02733","fcode":"AIRP"},{"adminCode1":"04","lng":"121.61691","distance":"75.98234","geonameId":6300306,"toponymName":"Hualien
374
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Hualien
375
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"24.02372","fcode":"AIRP"},{"adminCode1":"04","lng":"121.18197","distance":"102.72362","geonameId":6301823,"toponymName":"Chihhang
376
+ Tw-Afb","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Chihhang
377
+ Tw-Afb","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.79312","fcode":"AIRP"},{"adminCode1":"04","lng":"121.10168","distance":"105.41","geonameId":6300293,"toponymName":"Feng
378
+ Nin Tw-Afb","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Feng
379
+ Nin Tw-Afb","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.75499","fcode":"AIRP"},{"adminCode1":"04","lng":"120.20578","distance":"113.18456","geonameId":6300301,"toponymName":"Tainan
380
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Tainan
381
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.95036","fcode":"AIRP"},{"adminCode1":"04","lng":"120.482","distance":"120.85079","geonameId":6301824,"toponymName":"Pingtung
382
+ North Air Force Base","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Pingtung
383
+ North Air Force Base","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.70024","fcode":"AIRP"},{"adminCode1":"02","lng":"120.26257","distance":"124.00221","geonameId":6300289,"toponymName":"Kangshan
384
+ Tw-Afb","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Kangshan
385
+ Tw-Afb","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Kaohsiung","lat":"22.78253","fcode":"AIRP"}]}'
386
+ http_version:
387
+ recorded_at: Sat, 31 Dec 2016 16:59:16 GMT
388
+ - request:
389
+ method: get
390
+ uri: http://api.geonames.org/findNearbyJSON?fcode=AIRP&lat=23.69781&lng=120.960515&maxRows=50&radius=200&username=<GEONAMES_USERNAME>
391
+ body:
392
+ encoding: US-ASCII
393
+ string: ''
394
+ headers:
395
+ Connection:
396
+ - close
397
+ Host:
398
+ - api.geonames.org
399
+ User-Agent:
400
+ - http.rb/2.1.0
401
+ response:
402
+ status:
403
+ code: 200
404
+ message: OK
405
+ headers:
406
+ Date:
407
+ - Sat, 31 Dec 2016 17:13:17 GMT
408
+ Server:
409
+ - Apache/2.2.15 (CentOS)
410
+ Cache-Control:
411
+ - no-cache
412
+ Access-Control-Allow-Origin:
413
+ - "*"
414
+ Content-Length:
415
+ - '7540'
416
+ Connection:
417
+ - close
418
+ Content-Type:
419
+ - application/json;charset=UTF-8
420
+ body:
421
+ encoding: UTF-8
422
+ string: '{"geonames":[{"adminCode1":"04","lng":"120.6558","distance":"62.02683","geonameId":8521367,"toponymName":"Shuinan
423
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Shuinan
424
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"24.18278","fcode":"AIRP"},{"adminCode1":"04","lng":"120.39283","distance":"63.57216","geonameId":6300295,"toponymName":"Chiayi
425
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Chiayi
426
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"23.46178","fcode":"AIRP"},{"adminCode1":"04","lng":"120.62694","distance":"71.16248","geonameId":6587703,"toponymName":"Taichung
427
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Taichung
428
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"24.2625","fcode":"AIRP"},{"adminCode1":"04","lng":"121.58942","distance":"73.72661","geonameId":6643073,"toponymName":"Jiashan
429
+ Jichang","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Jiashan
430
+ Jichang","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"24.02733","fcode":"AIRP"},{"adminCode1":"04","lng":"121.61691","distance":"75.98234","geonameId":6300306,"toponymName":"Hualien
431
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Hualien
432
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"24.02372","fcode":"AIRP"},{"adminCode1":"04","lng":"121.18197","distance":"102.72362","geonameId":6301823,"toponymName":"Chihhang
433
+ Tw-Afb","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Chihhang
434
+ Tw-Afb","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.79312","fcode":"AIRP"},{"adminCode1":"04","lng":"121.10168","distance":"105.41","geonameId":6300293,"toponymName":"Feng
435
+ Nin Tw-Afb","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Feng
436
+ Nin Tw-Afb","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.75499","fcode":"AIRP"},{"adminCode1":"04","lng":"120.20578","distance":"113.18456","geonameId":6300301,"toponymName":"Tainan
437
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Tainan
438
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.95036","fcode":"AIRP"},{"adminCode1":"04","lng":"120.482","distance":"120.85079","geonameId":6301824,"toponymName":"Pingtung
439
+ North Air Force Base","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Pingtung
440
+ North Air Force Base","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.70024","fcode":"AIRP"},{"adminCode1":"02","lng":"120.26257","distance":"124.00221","geonameId":6300289,"toponymName":"Kangshan
441
+ Tw-Afb","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Kangshan
442
+ Tw-Afb","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Kaohsiung","lat":"22.78253","fcode":"AIRP"},{"adminCode1":"04","lng":"120.93939","distance":"124.09666","geonameId":6300303,"toponymName":"Hsinchu
443
+ Tw-Afb","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Hsinchu
444
+ Tw-Afb","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"24.81803","fcode":"AIRP"},{"adminCode1":"04","lng":"120.46173","distance":"124.5174","geonameId":6300291,"toponymName":"Pingtung
445
+ South Air Force Base","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Pingtung
446
+ South Air Force Base","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.67237","fcode":"AIRP"},{"adminCode1":"04","lng":"121.46639","distance":"124.77527","geonameId":6600376,"toponymName":"Lyudao
447
+ (Green Island) Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Lyudao
448
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.67278","fcode":"AIRP"},{"adminCode1":"04","lng":"120.94111","distance":"124.80382","geonameId":6600395,"toponymName":"Xinzhu
449
+ Jichang","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Xinzhu
450
+ Jichang","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"24.82444","fcode":"AIRP"},{"adminCode1":"04","lng":"119.62831","distance":"136.68536","geonameId":6300304,"toponymName":"Magong
451
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Magong
452
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"23.56867","fcode":"AIRP"},{"adminCode1":"02","lng":"120.35001","distance":"138.97464","geonameId":6301820,"toponymName":"Kaohsiung
453
+ International Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Kao-hsiung
454
+ International Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Kaohsiung","lat":"22.57709","fcode":"AIRP"},{"adminCode1":"04","lng":"119.50389","distance":"153.12383","geonameId":6587072,"toponymName":"Wang-an
455
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Wang-an
456
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"23.36944","fcode":"AIRP"},{"adminCode1":"04","lng":"121.23282","distance":"155.32144","geonameId":1980018,"toponymName":"Taiwan
457
+ Taoyuan International Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Taiwan
458
+ Taoyuan International Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"25.07773","fcode":"AIRP"},{"adminCode1":"04","lng":"121.55022","distance":"162.72546","geonameId":1980019,"toponymName":"Taipei
459
+ Songshan Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Taipei
460
+ Songshan Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"25.06405","fcode":"AIRP"},{"adminCode1":"04","lng":"119.418","distance":"166.49701","geonameId":7668413,"toponymName":"Chi
461
+ Mei Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Chi
462
+ Mei Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"23.2131","fcode":"AIRP"},{"adminCode1":"04","lng":"120.73021","distance":"184.98639","geonameId":6300296,"toponymName":"Hengchun
463
+ Airport","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Hengchun
464
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.04107","fcode":"AIRP"},{"adminCode1":"04","lng":"121.53364","distance":"193.9573","geonameId":6300299,"toponymName":"Lan
465
+ Yu","countryId":"1668284","fcl":"S","population":0,"countryCode":"TW","name":"Lan-yü
466
+ Airport","fclName":"spot, building, farm","countryName":"Taiwan","fcodeName":"airport","adminName1":"Taiwan","lat":"22.02884","fcode":"AIRP"}]}'
467
+ http_version:
468
+ recorded_at: Sat, 31 Dec 2016 17:13:24 GMT
240
469
  recorded_with: VCR 3.0.3
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: movlog
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.4.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andy Wen