strans-client 1.1.0.pre.rc3 → 1.1.0.pre.rc4
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 +4 -4
- data/lib/lazy_strans_client.rb +17 -9
- data/lib/parada.rb +2 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5d1551228db90d93819975a7d01e54a07234da0e
|
|
4
|
+
data.tar.gz: c97adb3bced8380151e7fb583350cc1547d2fb95
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0aca4f0617b76da083fbf52845a4a455449228bc6d4e3e0c5dbc9e6b26b9c442330c287086867f0a26adda48e1f56eeb061677fedd31313f04d5cd7dfd1e661a
|
|
7
|
+
data.tar.gz: 2e4517c390fdab75acce1b45a4143e6617d8d39ca7b271ce290b7f6eb09756a4b312b96a8c71e965b3fa5d5fa12688234a28ad738c55b6e2a0e66baf7cc77d97
|
data/lib/lazy_strans_client.rb
CHANGED
|
@@ -7,15 +7,21 @@ class LazyStransClient < StransClient
|
|
|
7
7
|
|
|
8
8
|
def load
|
|
9
9
|
@linhas = get(:linhas)
|
|
10
|
-
@
|
|
11
|
-
@
|
|
10
|
+
@paradas_linha = {} # paradas de uma linha
|
|
11
|
+
@linhas_parada = {} # linhas de uma parada
|
|
12
12
|
@linhas.each do |l|
|
|
13
13
|
paradas = get(:paradas_linha, l.codigoLinha)
|
|
14
|
-
@
|
|
14
|
+
@paradas_linha[l.codigoLinha] = paradas
|
|
15
15
|
if(!paradas.kind_of?(Erro))
|
|
16
16
|
paradas.each do |p|
|
|
17
|
-
@
|
|
18
|
-
|
|
17
|
+
@linhas_parada[p.codigoParada] = [] if @linhas_parada[p.codigoParada].nil?
|
|
18
|
+
|
|
19
|
+
puts ">|#{p.codigoParada}|<"
|
|
20
|
+
#puts "---------- "
|
|
21
|
+
#puts "#{@linhas_parada[p.codigoParada]}"
|
|
22
|
+
#puts "---------- "
|
|
23
|
+
|
|
24
|
+
@linhas_parada[p.codigoParada] << p.linha
|
|
19
25
|
end
|
|
20
26
|
end
|
|
21
27
|
end
|
|
@@ -27,7 +33,7 @@ class LazyStransClient < StransClient
|
|
|
27
33
|
long = long.to_f
|
|
28
34
|
lat = lat.to_f
|
|
29
35
|
dist = dist.to_f
|
|
30
|
-
paradas =
|
|
36
|
+
paradas = []
|
|
31
37
|
get(:paradas).each do |parada|
|
|
32
38
|
if(!parada.long.nil? && !parada.long.nil?)
|
|
33
39
|
dLong = calc_distan(long, parada.long)
|
|
@@ -47,7 +53,8 @@ class LazyStransClient < StransClient
|
|
|
47
53
|
|
|
48
54
|
#puts dist_parada
|
|
49
55
|
if(dist_parada < dist)
|
|
50
|
-
|
|
56
|
+
parada.dist = dist_parada # metros
|
|
57
|
+
paradas << parada
|
|
51
58
|
end
|
|
52
59
|
end
|
|
53
60
|
end
|
|
@@ -55,8 +62,9 @@ class LazyStransClient < StransClient
|
|
|
55
62
|
end
|
|
56
63
|
|
|
57
64
|
def linhas_parada(codigoParada)
|
|
58
|
-
|
|
59
|
-
@parada_linhas
|
|
65
|
+
load() if @linhas.nil?
|
|
66
|
+
puts @parada_linhas
|
|
67
|
+
@linhas_parada[codigoParada.to_f]
|
|
60
68
|
end
|
|
61
69
|
|
|
62
70
|
private
|
data/lib/parada.rb
CHANGED
|
@@ -6,7 +6,7 @@ class Parada
|
|
|
6
6
|
load_atts(fields)
|
|
7
7
|
end
|
|
8
8
|
|
|
9
|
-
attr_accessor :codigoParada, :denomicao, :endereco, :lat, :long, :linha
|
|
9
|
+
attr_accessor :codigoParada, :denomicao, :endereco, :lat, :long, :linha, :dist
|
|
10
10
|
|
|
11
11
|
def load_atts(fields)
|
|
12
12
|
@codigoParada = fields['CodigoParada'] || fields[:codigoParada]
|
|
@@ -23,6 +23,7 @@ class Parada
|
|
|
23
23
|
serialized[:endereco] = @endereco if(@endereco)
|
|
24
24
|
serialized[:lat] = @lat if(@lat)
|
|
25
25
|
serialized[:long] = @long if(@long)
|
|
26
|
+
serialized[:dist] = @dist if(@dist)
|
|
26
27
|
serialized.to_json(*a)
|
|
27
28
|
end
|
|
28
29
|
|