gb_mapfish_appserver 0.0.4 → 0.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/app/controllers/apps_controller.rb +2 -0
  2. data/app/controllers/topics_controller.rb +1 -1
  3. data/app/models/search_model.rb +2 -1
  4. data/lib/gb_mapfish_appserver/version.rb +1 -1
  5. metadata +27 -27
data/app/controllers/apps_controller.rb CHANGED
@@ -28,6 +28,7 @@ class AppsController < ApplicationController
28
28
  else
29
29
  model = rule.model.constantize
30
30
  features = if rule.layer.nil?
31
+ #User defined model
31
32
  @seltopic = model.selection_topic
32
33
  @sellayer = model.selection_layer
33
34
  @selproperty = model.primary_key
@@ -35,6 +36,7 @@ class AppsController < ApplicationController
35
36
  search_locs = model.search_locations(params['locations'])
36
37
  model.locate(search_locs)
37
38
  else
39
+ #Generic SearchModel
38
40
  layer = Layer.find_by_name(rule.layer)
39
41
  @seltopic = @topic_name
40
42
  @sellayer = layer.name
data/app/controllers/topics_controller.rb CHANGED
@@ -55,7 +55,7 @@ class TopicsController < ApplicationController
55
55
  x1, y1, x2, y2 = (params['bbox']).split(',').collect(&:to_f)
56
56
  @xx = (x1 + x2) / 2.0
57
57
  @yy = (y1 + y2) / 2.0
58
- @height = Dtm.getHeight(params['bbox'])
58
+ @height = 0 #Dtm.getHeight(params['bbox'])
59
59
  else
60
60
  @xx = 0
61
61
  @yy = 0
data/app/models/search_model.rb CHANGED
@@ -32,7 +32,8 @@ class SearchModel < GeoModel
32
32
  feature_class.where(search_field => locations).select(feature_class.primary_key).select(feature_class.extent_field).limit(LOCATE_MAX_COUNT).all
33
33
  end
34
34
 
35
- # "261,AU4998;261,AU4999" -> [["261","AU4998"],["261","AU4999"]]
35
+ # "261,AU4998$261,AU4999" -> [["261","AU4998"],["261","AU4999"]]
36
+ # TODO: inconsistent with single field search -> "261|AU4998,261|AU4999" -> [["261","AU4998"],["261","AU4999"]]
36
37
  def self.search_locations(param)
37
38
  locations = param.split('$')
38
39
  locations.collect {|l| l.split(',') }
data/lib/gb_mapfish_appserver/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GbMapfishAppserver
2
- VERSION = "0.0.4"
2
+ VERSION = "0.0.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gb_mapfish_appserver
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
4
+ version: 0.0.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,22 +9,22 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-10-18 00:00:00.000000000 Z
12
+ date: 2013-10-28 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &25026000 !ruby/object:Gem::Requirement
16
+ requirement: &20708920 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: 3.2.15
21
+ version: 3.2.13
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *25026000
24
+ version_requirements: *20708920
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: json
27
- requirement: &24973460 !ruby/object:Gem::Requirement
27
+ requirement: &20708360 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *24973460
35
+ version_requirements: *20708360
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: acts_as_tree
38
- requirement: &24888160 !ruby/object:Gem::Requirement
38
+ requirement: &20707420 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - =
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.2.0
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *24888160
46
+ version_requirements: *20707420
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: devise
49
- requirement: &24035820 !ruby/object:Gem::Requirement
49
+ requirement: &20745120 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - =
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 2.0.4
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *24035820
57
+ version_requirements: *20745120
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: cancan
60
- requirement: &24597980 !ruby/object:Gem::Requirement
60
+ requirement: &20744240 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - =
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.6.7
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *24597980
68
+ version_requirements: *20744240
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rails_admin
71
- requirement: &24651580 !ruby/object:Gem::Requirement
71
+ requirement: &20743400 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - =
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 0.0.5
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *24651580
79
+ version_requirements: *20743400
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: fastercsv
82
- requirement: &23933560 !ruby/object:Gem::Requirement
82
+ requirement: &20742920 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *23933560
90
+ version_requirements: *20742920
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: GeoRuby
93
- requirement: &24231680 !ruby/object:Gem::Requirement
93
+ requirement: &20742180 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 0.1.4
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *24231680
101
+ version_requirements: *20742180
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rgeo
104
- requirement: &24233940 !ruby/object:Gem::Requirement
104
+ requirement: &20741280 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - =
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 0.3.20
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *24233940
112
+ version_requirements: *20741280
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rgeo-geojson
115
- requirement: &24236460 !ruby/object:Gem::Requirement
115
+ requirement: &20740260 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - =
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 0.2.1
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *24236460
123
+ version_requirements: *20740260
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: pg
126
- requirement: &24188780 !ruby/object:Gem::Requirement
126
+ requirement: &20739400 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - =
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 0.14.0
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *24188780
134
+ version_requirements: *20739400
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: activerecord-postgis-adapter
137
- requirement: &24194940 !ruby/object:Gem::Requirement
137
+ requirement: &20738460 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - =
@@ -142,7 +142,7 @@ dependencies:
142
142
  version: 0.4.1
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *24194940
145
+ version_requirements: *20738460
146
146
  description: Mapfish Appserver is a framework for web mapping applications using OGC
147
147
  standards and the Mapfish protocol.
148
148
  email: