geoblacklight 4.0.0.pre.rc2 → 4.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ruby.yml +2 -6
- data/.rubocop.yml +6 -0
- data/.rubocop_todo.yml +100 -81
- data/.solr_wrapper +0 -1
- data/CODE_OF_CONDUCT.md +1 -1
- data/README.md +22 -14
- data/app/assets/images/blacklight/geoblacklight-icons.json +98 -66
- data/app/assets/images/blacklight/george-mason.svg +4 -0
- data/app/controllers/wms_controller.rb +1 -1
- data/config/locales/geoblacklight.en.yml +2 -0
- data/geoblacklight.gemspec +1 -1
- data/lib/generators/geoblacklight/assets_generator.rb +1 -1
- data/lib/generators/geoblacklight/install_generator.rb +17 -0
- data/lib/generators/geoblacklight/templates/settings.yml +19 -0
- data/lib/geoblacklight/download.rb +1 -1
- data/lib/geoblacklight/engine.rb +4 -2
- data/lib/geoblacklight/metadata_transformer/base.rb +1 -1
- data/lib/geoblacklight/version.rb +1 -1
- data/lib/tasks/geoblacklight.rake +20 -3
- data/schema/geoblacklight-schema-1.0.json +3 -3
- data/schema/readme.md +8 -0
- data/spec/controllers/catalog_controller_spec.rb +7 -7
- data/spec/controllers/download_controller_spec.rb +4 -4
- data/spec/controllers/relation_controller_spec.rb +1 -1
- data/spec/controllers/wms_controller_spec.rb +1 -3
- data/spec/helpers/geoblacklight_helper_spec.rb +4 -4
- data/spec/views/catalog/_results_pagination.html.erb_spec.rb +1 -1
- data/spec/views/catalog/_show_downloads.html.erb_spec.rb +1 -1
- data/template.rb +1 -1
- metadata +6 -4
@@ -1,279 +1,311 @@
|
|
1
1
|
{
|
2
2
|
"selection": [
|
3
3
|
{
|
4
|
-
"order":
|
4
|
+
"order": 7,
|
5
|
+
"name": "george-mason"
|
6
|
+
},
|
7
|
+
{
|
8
|
+
"order": 8,
|
5
9
|
"name": "university-of-colorado-boulder"
|
6
10
|
},
|
7
11
|
{
|
8
|
-
"order":
|
12
|
+
"order": 9,
|
9
13
|
"name": "wisconsin"
|
10
14
|
},
|
11
15
|
{
|
12
|
-
"order":
|
16
|
+
"order": 10,
|
13
17
|
"name": "web_services"
|
14
18
|
},
|
15
19
|
{
|
16
|
-
"order":
|
20
|
+
"order": 11,
|
17
21
|
"name": "uva"
|
18
22
|
},
|
19
23
|
{
|
20
|
-
"order":
|
24
|
+
"order": 12,
|
21
25
|
"name": "ucla"
|
22
26
|
},
|
23
27
|
{
|
24
|
-
"order":
|
28
|
+
"order": 13,
|
25
29
|
"name": "tufts"
|
26
30
|
},
|
27
31
|
{
|
28
|
-
"order":
|
32
|
+
"order": 14,
|
29
33
|
"name": "texas"
|
30
34
|
},
|
31
35
|
{
|
32
|
-
"order":
|
36
|
+
"order": 15,
|
33
37
|
"name": "tags"
|
34
38
|
},
|
35
39
|
{
|
36
|
-
"order":
|
40
|
+
"order": 16,
|
37
41
|
"name": "table"
|
38
42
|
},
|
39
43
|
{
|
40
|
-
"order":
|
44
|
+
"order": 17,
|
41
45
|
"name": "stanford"
|
42
46
|
},
|
43
47
|
{
|
44
|
-
"order":
|
48
|
+
"order": 18,
|
45
49
|
"name": "sms"
|
46
50
|
},
|
47
51
|
{
|
48
|
-
"order":
|
52
|
+
"order": 19,
|
49
53
|
"name": "restricted"
|
50
54
|
},
|
51
55
|
{
|
52
|
-
"order":
|
56
|
+
"order": 20,
|
53
57
|
"name": "raster"
|
54
58
|
},
|
55
59
|
{
|
56
|
-
"order":
|
60
|
+
"order": 21,
|
57
61
|
"name": "purdue"
|
58
62
|
},
|
59
63
|
{
|
60
|
-
"order":
|
64
|
+
"order": 22,
|
61
65
|
"name": "public"
|
62
66
|
},
|
63
67
|
{
|
64
|
-
"order":
|
68
|
+
"order": 23,
|
65
69
|
"name": "princeton"
|
66
70
|
},
|
67
71
|
{
|
68
|
-
"order":
|
72
|
+
"order": 24,
|
69
73
|
"name": "polyline"
|
70
74
|
},
|
71
75
|
{
|
72
|
-
"order":
|
76
|
+
"order": 25,
|
73
77
|
"name": "polygon"
|
74
78
|
},
|
75
79
|
{
|
76
|
-
"order":
|
80
|
+
"order": 26,
|
77
81
|
"name": "point"
|
78
82
|
},
|
79
83
|
{
|
80
|
-
"order":
|
84
|
+
"order": 27,
|
81
85
|
"name": "penn-state"
|
82
86
|
},
|
83
87
|
{
|
84
|
-
"order":
|
88
|
+
"order": 28,
|
85
89
|
"name": "paper-map"
|
86
90
|
},
|
87
91
|
{
|
88
|
-
"order":
|
92
|
+
"order": 29,
|
89
93
|
"name": "pagelines-brands"
|
90
94
|
},
|
91
95
|
{
|
92
|
-
"order":
|
96
|
+
"order": 30,
|
93
97
|
"name": "ohio-state"
|
94
98
|
},
|
95
99
|
{
|
96
|
-
"order":
|
100
|
+
"order": 31,
|
97
101
|
"name": "nyu"
|
98
102
|
},
|
99
103
|
{
|
100
|
-
"order":
|
104
|
+
"order": 32,
|
101
105
|
"name": "multipolygon"
|
102
106
|
},
|
103
107
|
{
|
104
|
-
"order":
|
108
|
+
"order": 33,
|
105
109
|
"name": "multipoint"
|
106
110
|
},
|
107
111
|
{
|
108
|
-
"order":
|
112
|
+
"order": 34,
|
109
113
|
"name": "multilinestring"
|
110
114
|
},
|
111
115
|
{
|
112
|
-
"order":
|
116
|
+
"order": 35,
|
113
117
|
"name": "mixed"
|
114
118
|
},
|
115
119
|
{
|
116
|
-
"order":
|
120
|
+
"order": 36,
|
117
121
|
"name": "mit"
|
118
122
|
},
|
119
123
|
{
|
120
|
-
"order":
|
124
|
+
"order": 37,
|
121
125
|
"name": "minnesota"
|
122
126
|
},
|
123
127
|
{
|
124
|
-
"order":
|
128
|
+
"order": 38,
|
125
129
|
"name": "michigan"
|
126
130
|
},
|
127
131
|
{
|
128
|
-
"order":
|
132
|
+
"order": 39,
|
129
133
|
"name": "michigan-state"
|
130
134
|
},
|
131
135
|
{
|
132
|
-
"order":
|
136
|
+
"order": 40,
|
133
137
|
"name": "metadata"
|
134
138
|
},
|
135
139
|
{
|
136
|
-
"order":
|
140
|
+
"order": 41,
|
137
141
|
"name": "massgis"
|
138
142
|
},
|
139
143
|
{
|
140
|
-
"order":
|
144
|
+
"order": 42,
|
141
145
|
"name": "maryland"
|
142
146
|
},
|
143
147
|
{
|
144
|
-
"order":
|
148
|
+
"order": 43,
|
145
149
|
"name": "map"
|
146
150
|
},
|
147
151
|
{
|
148
|
-
"order":
|
152
|
+
"order": 44,
|
149
153
|
"name": "map-marker"
|
150
154
|
},
|
151
155
|
{
|
152
|
-
"order":
|
156
|
+
"order": 45,
|
153
157
|
"name": "line"
|
154
158
|
},
|
155
159
|
{
|
156
|
-
"order":
|
160
|
+
"order": 46,
|
157
161
|
"name": "lewis-clark"
|
158
162
|
},
|
159
163
|
{
|
160
|
-
"order":
|
164
|
+
"order": 47,
|
161
165
|
"name": "leaf"
|
162
166
|
},
|
163
167
|
{
|
164
|
-
"order":
|
168
|
+
"order": 48,
|
165
169
|
"name": "iowa"
|
166
170
|
},
|
167
171
|
{
|
168
|
-
"order":
|
172
|
+
"order": 49,
|
169
173
|
"name": "indiana"
|
170
174
|
},
|
171
175
|
{
|
172
|
-
"order":
|
176
|
+
"order": 50,
|
173
177
|
"name": "image"
|
174
178
|
},
|
175
179
|
{
|
176
|
-
"order":
|
180
|
+
"order": 51,
|
177
181
|
"name": "illinois"
|
178
182
|
},
|
179
183
|
{
|
180
|
-
"order":
|
184
|
+
"order": 52,
|
181
185
|
"name": "harvard"
|
182
186
|
},
|
183
187
|
{
|
184
|
-
"order":
|
188
|
+
"order": 53,
|
185
189
|
"name": "globe"
|
186
190
|
},
|
187
191
|
{
|
188
|
-
"order":
|
192
|
+
"order": 54,
|
189
193
|
"name": "esri-globe"
|
190
194
|
},
|
191
195
|
{
|
192
|
-
"order":
|
196
|
+
"order": 55,
|
193
197
|
"name": "email"
|
194
198
|
},
|
195
199
|
{
|
196
|
-
"order":
|
200
|
+
"order": 56,
|
197
201
|
"name": "dvd-rom"
|
198
202
|
},
|
199
203
|
{
|
200
|
-
"order":
|
204
|
+
"order": 57,
|
201
205
|
"name": "cornell"
|
202
206
|
},
|
203
207
|
{
|
204
|
-
"order":
|
208
|
+
"order": 58,
|
205
209
|
"name": "columbia"
|
206
210
|
},
|
207
211
|
{
|
208
|
-
"order":
|
212
|
+
"order": 59,
|
209
213
|
"name": "chicago"
|
210
214
|
},
|
211
215
|
{
|
212
|
-
"order":
|
216
|
+
"order": 60,
|
213
217
|
"name": "cd-rom"
|
214
218
|
},
|
215
219
|
{
|
216
|
-
"order":
|
220
|
+
"order": 61,
|
217
221
|
"name": "bookmark"
|
218
222
|
},
|
219
223
|
{
|
220
|
-
"order":
|
224
|
+
"order": 62,
|
221
225
|
"name": "book"
|
222
226
|
},
|
223
227
|
{
|
224
|
-
"order":
|
228
|
+
"order": 63,
|
225
229
|
"name": "baruch-cuny"
|
226
230
|
},
|
227
231
|
{
|
228
|
-
"order":
|
232
|
+
"order": 64,
|
229
233
|
"name": "berkeley"
|
230
234
|
},
|
231
235
|
{
|
232
|
-
"order":
|
236
|
+
"order": 65,
|
233
237
|
"name": "logo"
|
234
238
|
},
|
235
239
|
{
|
236
|
-
"order":
|
240
|
+
"order": 66,
|
237
241
|
"name": "arrow-circle-down"
|
238
242
|
},
|
239
243
|
{
|
240
|
-
"order":
|
244
|
+
"order": 67,
|
241
245
|
"name": "home"
|
242
246
|
}
|
243
247
|
],
|
244
248
|
"metadata": {
|
245
249
|
"name": "geoblacklight-icons",
|
246
250
|
"importSize": {
|
247
|
-
"width":
|
248
|
-
"height":
|
251
|
+
"width": 1024,
|
252
|
+
"height": 1024
|
249
253
|
},
|
250
|
-
"iconsHash":
|
254
|
+
"iconsHash": 2136029298
|
251
255
|
},
|
252
256
|
"height": 1024,
|
253
257
|
"prevSize": 32,
|
254
258
|
"icons": [
|
255
259
|
{
|
256
260
|
"paths": [
|
257
|
-
"
|
261
|
+
"M1026.803 19.195l81.437-147.195c-19.359 18.143-28.799 23.839-47.039 36.159-98.461 67.582-219.641 83.677-341.365 183.802-82.557 67.966-120.732 166.459-120.732 166.459s110.845-124.796 278.487-186.618c67.614-25.055 114.78-38.815 149.211-52.222z",
|
262
|
+
"M983.349 98.297c-88.253 28.159-193.338 54.91-301.015 127.58-83.837 56.638-132.572 153.179-132.572 153.179s118.268-118.268 290.167-158.651l87.997-20.543 55.486-101.565zM885.112 281.459c-42.239 3.84-130.492 11.712-233.689 69.182-67.902 37.759-121.436 89.501-121.436 89.501l-0.16 0.32-0.096-0.064c-20.159 37.823-48.062 100.701-75.422 168.315l-136.092-248.408h-178.458l57.022 57.086v420.339l-57.022 56.958h195.194l-57.982-57.022v-326.39l127.452 228.153-40.223 132.316 41.055-47.999s33.279-158.555 164.539-314.23v332.566l-57.054 53.886h226.041l-49.15-57.086v-444.146c118.844-94.205 195.674-113.276 195.194-113.276z"
|
258
263
|
],
|
259
264
|
"attrs": [
|
265
|
+
{
|
266
|
+
"fill": "rgb(108, 117, 125)"
|
267
|
+
},
|
260
268
|
{
|
261
269
|
"fill": "rgb(108, 117, 125)"
|
262
270
|
}
|
263
271
|
],
|
264
|
-
"width": 1060,
|
265
272
|
"grid": 0,
|
266
273
|
"tags": [
|
267
|
-
"
|
274
|
+
"george-mason"
|
268
275
|
],
|
269
276
|
"colorPermutations": {
|
270
277
|
"110811712512052052051255255255177186109189791": [
|
278
|
+
{
|
279
|
+
"f": 2
|
280
|
+
},
|
271
281
|
{
|
272
282
|
"f": 2
|
273
283
|
}
|
274
284
|
]
|
275
285
|
}
|
276
286
|
},
|
287
|
+
{
|
288
|
+
"paths": [
|
289
|
+
"M842.667 1024h-408.889l-145.778-144v-108.444h-144l-144-144v-483.556l144-144h483.556l144 144v108.444h288v266.667h-71.111v360.889l-145.778 144zM442.667 1000.889h391.111l131.556-129.778v-373.333h71.111v-222.222h-288v-122.667l-129.778-129.778h-465.778l-129.778 129.778v464l131.556 129.778h156.444v124.444l131.556 129.778zM782.222 312.889v504.889h-288v-108.444h108.444l108.444-108.444v-144h-144v106.667h-71.111v-250.667h-218.667v144h71.111v106.667h-144v-359.111h360.889v108.444h145.778v-144l-108.444-108.444h-433.778l-108.444 108.444v432l108.444 108.444h179.556v144l110.222 108.444h359.111l110.222-108.444v-394.667h71.111v-144c-1.778-1.778-216.889-1.778-216.889-1.778z"
|
290
|
+
],
|
291
|
+
"width": 1060,
|
292
|
+
"attrs": [
|
293
|
+
{
|
294
|
+
"fill": "rgb(108, 117, 125)"
|
295
|
+
}
|
296
|
+
],
|
297
|
+
"colorPermutations": {
|
298
|
+
"110811712512052052051255255255177186109189791": [
|
299
|
+
{
|
300
|
+
"f": 2
|
301
|
+
}
|
302
|
+
]
|
303
|
+
},
|
304
|
+
"tags": [
|
305
|
+
"university-of-colorado-boulder"
|
306
|
+
],
|
307
|
+
"grid": 0
|
308
|
+
},
|
277
309
|
{
|
278
310
|
"paths": [
|
279
311
|
"M320.64 1023.68c-0.64 0-0.96-0.64-0.64-0.96s0-0.64-0.32-0.64c-1.28 0-6.4-4.8-10.24-9.6l-3.52-4.8-7.68-1.92c-60.058-18.149-110.491-53.053-147.382-99.247l-0.458-0.593c-25.6-30.72-45.12-60.8-66.24-103.36-47.029-95.050-77.073-206.21-83.116-323.712l-0.084-2.048-0.96-16.32c-0.158-4.474-0.247-9.732-0.247-15.010 0-14.431 0.671-28.706 1.983-42.794l-0.136 1.805c0.32-21.12 5.76-66.24 11.52-94.72 19.2-96 57.6-165.12 112-201.6 24.411-17.022 54.697-27.198 87.359-27.2l0.001-0c0.96 0 2.56-2.24 4.48-6.4 6.4-13.44 20.16-22.4 40-27.2 4.16-0.64 7.36-1.6 7.68-1.92l2.56-5.44c3.84-8.96 8.64-15.68 15.36-22.4 8.32-8.32 16.64-12.8 26.88-15.040 2.24-0.32 3.84-0.96 3.2-1.28s1.6-0.64 4.48-0.64c5.76-0.64 16 0 15.040 0.64l4.8 1.6c17.28 4.16 33.28 18.88 40.96 37.76 1.92 4.48 3.2 5.76 4.8 5.76 4.16 0 16 3.84 23.36 7.36 6.4 3.2 8.64 4.8 13.44 9.6 4.48 4.48 6.4 6.72 8.64 11.52 1.6 3.2 3.2 6.080 4.16 6.4l7.040 0.32c17.92 0 42.24 6.4 61.12 16 55.36 26.88 96.96 85.44 121.6 171.52 12.502 43.518 20.458 93.765 22.057 145.614l0.023 0.946 0.32 26.88c0.046 2.021 0.072 4.402 0.072 6.789 0 10.341-0.491 20.568-1.451 30.657l0.099-1.287c-5.725 124.246-38.080 239.703-91.444 342.503l2.164-4.583c-28.939 57.499-68.273 105.734-115.958 143.987l-0.842 0.653c-27.643 21.45-60.415 37.799-96.072 46.957l-1.848 0.403-5.12 5.76c-2.24 2.88-5.44 6.080-6.72 7.040l-1.92 1.92c0.96 0-1.92 1.28-2.88 0.96h-1.92zM327.040 1011.84c8-8.64 16-24.64 18.56-36.48 1.28-6.4 1.6-17.28 0.64-23.36-0.64-5.12-2.56-8-7.36-10.88-10.24-6.080-27.2-5.12-35.2 1.92-4.16 3.2-4.8 5.76-5.44 14.72-0.96 16.64 3.84 32 15.040 48.32 4.8 7.040 6.4 8.32 9.6 8.32 1.6 0 2.56-0.64 4.48-2.56zM299.2 995.2c-0.293-2.952-0.972-5.663-1.991-8.2l0.071 0.2c-2.524-6.777-4.237-14.621-4.786-22.783l-0.014-0.257c0-5.44-0.64-6.4-4.8-8-19.075-7.361-35.531-16.189-50.691-26.749l0.771 0.509c-1.28 0-7.68 6.4-11.52 11.2-4.16 5.44-8.64 12.8-8.32 14.72 22.543 17.692 49.14 31.429 78.070 39.611l1.61 0.389 1.6-0.64zM353.92 993.92c28.223-9.479 52.719-22.4 74.65-38.595l-0.73 0.515c0.64-0.96-2.56-7.040-6.4-12.16-3.637-5.444-8.105-10.014-13.277-13.651l-0.163-0.109c-15.668 10.737-33.617 20.119-52.659 27.267l-1.741 0.573c-0.617 1.88-0.974 4.043-0.974 6.289 0 0.264 0.005 0.527 0.015 0.789l-0.001-0.038c-0.64 8.32-2.24 15.040-4.8 22.4-3.2 9.6-3.2 9.6 6.4 6.72zM216.96 949.44c3.2-5.44 8.32-12.16 12.8-16.64 2.24-2.24 3.84-4.16 3.84-4.8s-2.88-3.2-6.4-6.4c-15.36-11.52-38.4-33.6-52.48-50.56-22.234-26.761-42.134-56.886-58.561-89.080l-1.279-2.76-1.28-1.6-5.44 1.6c-3.2 0.64-8.96 3.2-13.44 5.12-6.72 3.2-7.68 4.16-7.68 5.44 19.349 41.261 42.107 76.822 68.821 108.979l-0.661-0.819c9.28 11.52 32 34.56 41.6 42.56 9.28 8 16 13.12 17.28 13.12l3.2-3.84zM440.64 946.88c49.808-41.748 89.508-93.855 116.041-153.142l1.079-2.698c0-2.56-14.080-9.6-23.040-11.84-2.88-0.96-3.52-0.96-4.48 0l-6.4 11.52c-27.771 54.436-65.484 100.025-111.138 135.985l-0.862 0.655 4.16 5.44c5.44 5.76 9.28 10.56 12.16 16 1.6 2.88 2.88 4.16 3.52 4.16s4.8-2.88 8.96-6.4zM292.8 950.080c2.24-8 5.76-12.16 12.48-15.36 11.2-4.8 23.36-4.8 34.24 0 7.040 3.2 10.88 7.68 12.16 13.76 0.32 1.92 0.96 2.24 2.24 2.24 16.74-5.473 31.282-13.086 44.256-22.694l-0.416 0.294c0-0.96-1.92-3.2-4.16-4.8-6.4-5.12-18.24-17.92-23.36-24.32-5.12-7.040-9.6-14.080-12.48-21.12-1.28-2.88-2.56-5.44-3.2-5.44s-4.16 1.6-7.68 3.84c-8.32 4.8-22.4 11.52-24.32 11.52s-18.24-8-24.96-11.84c-1.729-1.277-3.759-2.267-5.955-2.852l-0.125-0.028c-0.64 0-1.92 1.92-3.2 5.12-2.88 6.4-7.040 13.12-12.8 21.12-5.12 7.040-17.6 19.84-23.68 24.64-3.52 2.88-4.48 4.16-3.84 5.12s14.080 8.96 22.72 13.12c15.040 7.36 21.44 9.6 22.080 7.36zM249.6 922.24c15.36-12.8 28.48-28.8 35.2-43.2 4.16-8.64 4.16-8.64-4.8-15.36-29.44-21.44-62.72-60.8-88.64-104-3.2-5.44-4.8-7.68-5.76-7.68-1.754 0.652-3.25 1.633-4.479 2.879l-0.001 0.001c-16.053 12.76-35.502 21.968-56.762 26.104l-0.838 0.136c24.654 51.593 58.419 95.083 99.609 130.103l0.551 0.457c8.96 7.36 19.2 14.72 20.16 14.72l5.76-4.16zM409.28 921.28c39.68-28.48 76.8-72.64 107.84-129.28 5.12-9.6 5.44-11.2 2.56-11.84-10.945-2.686-20.226-5.756-29.184-9.451l1.344 0.491c-9.778-3.885-18.224-8.73-25.852-14.586l0.252 0.186c-3.2-2.56-6.4-4.8-7.040-4.8s-3.2 3.84-6.080 8.64c-12.16 20.16-27.52 41.6-41.6 58.56-13.44 16-33.28 35.2-48 46.4-5.12 3.52-5.44 3.84-4.8 6.080 9.001 22.466 23.906 40.977 42.811 54.144l0.389 0.256c0.64 0 3.84-2.24 7.36-4.8zM277.44 794.56l20.8-133.44 20.48-133.12 25.92 131.2 26.24 133.76 0.64 2.24h6.4c3.84 0 6.080-0.32 6.4-0.96 0.64-0.64 20.16-87.68 43.52-193.92 28.48-128.96 43.2-193.92 43.84-194.88 2.24-3.2 4.48-4.16 9.6-4.8l5.44-0.32v-23.68h-67.2v23.68l5.12-0.32c9.28-0.32 13.12 2.88 13.44 10.88 0 3.84-50.56 224-51.2 223.040l-30.72-144.32c-22.4-106.88-30.4-144.32-31.36-145.28-1.92-1.92-10.88-1.6-11.84 0.32l-22.4 143.040-22.4 142.080-25.6-108.16c-26.56-114.24-25.92-112-23.36-117.12 1.92-3.52 4.48-4.8 9.6-4.8 3.2 0 4.48-0.32 4.8-1.28 0.96-1.28 0.96-19.2 0-20.8-0.64-1.28-1.6-1.28-37.12-1.28-30.4 0-36.8 0-37.44 0.96-0.64 0.64-0.64 4.16-0.64 11.2v10.24l4.48 1.6c5.44 1.92 7.36 3.2 8.64 6.080 0.64 1.28 21.44 88.64 46.080 194.56l45.44 193.28c0.64 0.96 13.76 1.28 14.4 0.32zM564.8 777.28c45.075-97.58 71.363-211.759 71.363-332.078 0-0.816-0.001-1.633-0.004-2.449l0 0.127c0-41.6-0.64-56.64-2.88-57.92-1.92-1.6-14.4 0.64-22.4 3.2l-4.48 1.6 0.32 13.44c0.601 11.384 0.943 24.714 0.943 38.123 0 116.744-25.94 227.429-72.372 326.606l1.989-4.729c-3.52 7.68-4.8 10.88-4.16 11.52 0.32 0.64 2.88 1.92 5.44 2.56 5.44 1.6 14.080 5.76 17.28 8 3.84 2.56 4.48 1.92 8.96-8zM94.080 781.44l12.8-5.12c3.52-0.96 4.8-1.6 4.8-2.56-15.949-32.147-30.664-70.175-41.991-109.637l-1.209-4.923c-19.515-66.485-30.742-142.865-30.742-221.868 0-11.554 0.24-23.051 0.716-34.488l-0.054 1.635c0.64-9.6 0.64-13.44 0-14.080-2.24-2.88-25.6-7.36-27.2-5.44-1.542 18.541-2.421 40.129-2.421 61.923 0 45.258 3.79 89.631 11.070 132.818l-0.649-4.661c10.56 63.68 28.16 125.76 52.16 182.080 7.040 17.28 12.8 28.16 13.76 28.16l8.96-3.52zM129.92 776c15.040-3.84 30.4-10.24 40.32-16.64 7.040-4.48 13.76-9.92 13.76-11.52l-3.84-8c-1.92-3.84-7.36-13.12-11.2-21.12-4.16-8-7.68-14.4-8.32-14.4s-1.6 1.6-3.2 3.2c-2.443 4.231-6.065 7.544-10.417 9.541l-0.143 0.059c-10.24 4.8-18.24 3.84-24.64-2.88-2.924-2.724-4.76-6.584-4.8-10.873l-0-0.007c0-8.64 7.68-16.64 14.72-15.36 3.52 0.64 7.68 4.48 7.36 6.4-0.32 2.56-2.24 2.88-4.8 0.64-1.6-1.28-2.88-1.6-4.16-1.28-5.76 1.28-8 9.6-3.84 15.040 6.72 8.96 23.68 3.2 27.2-9.28 2.56-8.96-1.92-18.24-10.88-23.040-3.52-1.92-4.48-2.24-11.2-2.24-6.4 0-7.36 0-11.2 2.24-5.12 2.56-11.52 8.64-13.76 13.12-6.72 13.12-5.76 34.88 2.56 60.8 4.16 11.84 8.96 24 10.88 26.56 0.96 1.28 2.24 0.96 9.6-0.96zM527.68 771.2c3.84-8.32 9.92-26.88 12.16-37.12 3.2-14.080 3.52-28.16 1.28-37.44-2.363-8.892-8.301-16.085-16.142-20.078l-0.178-0.082c-2.868-1.624-6.299-2.581-9.953-2.581-0.326 0-0.651 0.008-0.973 0.023l0.046-0.002c-5.44 0-6.4 0-9.6 1.6-4.796 2.18-8.713 5.583-11.457 9.816l-0.063 0.104c-1.6 3.2-1.92 4.16-1.92 8.96 0 6.080 0.64 8 4.8 12.48 2.56 3.2 9.6 6.4 13.12 6.4 1.6 0 4.16-0.64 5.76-1.28 7.36-3.84 8.32-14.72 1.28-17.92-1.6-0.96-2.24-0.96-4.16 0l-2.56 1.92c0 0.32-0.64 0.64-1.6 0.64-2.24-0.32-2.24-3.52 0-5.76 4.16-4.16 10.88-3.84 15.68 0.96 4.8 5.12 5.76 11.52 3.2 17.6-2.796 6.243-8.954 10.513-16.11 10.513-1.092 0-2.161-0.099-3.198-0.29l0.108 0.016c-8.282-1.303-15.296-5.9-19.776-12.382l-0.064-0.098c-0.96-1.6-2.24-2.88-2.88-2.88s-3.2 4.8-6.4 11.2c-7.141 14.923-12.689 25.515-18.491 35.946l1.851-3.626c0 3.2 12.16 11.52 24.64 17.6 8.64 4.16 16.64 7.36 27.2 10.24 11.2 3.2 10.56 3.2 14.4-4.48zM96 710.4c0-8.96 1.6-16 5.12-23.36 5.12-11.2 14.4-17.6 26.88-19.2 5.12-0.96 7.040-0.64 16.32 1.6 1.28 0.32 1.6 0 1.6-0.64l-4.48-14.72c-15.532-45.643-25.344-98.318-27.176-153.014l-0.024-0.906-0.64-15.040-2.24-3.2c-2.705-4.516-6.648-8.047-11.361-10.176l-0.159-0.064c-4.299-2.115-9.357-3.353-14.704-3.353-1.132 0-2.252 0.055-3.356 0.164l0.14-0.011c-15.040 0.96-26.88 8.32-33.28 21.44-3.2 6.4-3.2 8-1.28 26.24 6.72 67.2 20.48 129.28 42.24 189.76 5.12 13.76 6.4 14.72 6.4 4.16zM82.56 648l-1.92-5.76 1.28-3.2c2.241-4.561 5.915-8.132 10.426-10.185l0.134-0.055c6.4-3.2 11.52-4.16 18.56-3.84 8 0.64 8.64 0.96 11.52 8.32l2.56 6.72-3.2-2.24c-3.2-3.84-6.4-4.48-14.72-3.84-5.926 0.169-11.35 2.186-15.751 5.491l0.071-0.051c-4.8 3.52-6.4 5.76-6.4 10.56l-0.64 4.16-1.92-6.080zM72 604.16c-0.442-1.722-0.695-3.698-0.695-5.734 0-0.572 0.020-1.139 0.059-1.701l-0.004 0.076c1.28-4.48 8.64-10.88 15.36-12.8 1.6-0.64 6.4-0.96 10.56-0.96 6.4 0 8.64 0 10.88 1.28 2.56 1.28 2.88 1.92 4.8 7.68l2.24 7.040c0 0.64-1.28-0.32-3.2-2.56-2.56-3.2-3.2-3.52-7.040-4.16-6.4-1.6-15.040-0.64-20.16 1.92-7.36 3.52-10.24 7.040-10.24 11.84 0 1.92 0 3.2-0.64 3.2s-1.28-2.24-1.92-5.12zM64 565.76l-0.96-7.040-0.64-4.8 4.48-4.16c3.2-3.2 5.76-4.8 8.96-6.080 8.32-3.2 25.28-1.92 28.16 1.6 0.96 0.96 3.84 13.76 3.2 14.080l-2.24-2.88c-2.88-4.16-5.44-5.12-13.76-5.76-0.965-0.117-2.081-0.184-3.214-0.184-5.573 0-10.767 1.619-15.139 4.412l0.113-0.068c-4.48 3.2-6.4 5.44-7.36 9.6l-1.28 3.52-0.64-2.24zM59.2 524.16l-0.96-7.040-0.32-4.16 3.2-3.52c6.080-7.040 16-9.92 26.88-8.64 6.4 0.96 10.88 2.56 12.48 4.16 1.28 1.28 4.16 14.72 3.2 14.72l-2.56-3.2c-3.2-5.12-6.4-6.4-17.6-6.4-8.32 0-8.96 0-13.12 2.24-4.8 2.24-8.96 6.080-8.96 8l-0.96 3.84-0.96 2.56-0.32-2.56zM552.64 712.96c22.366-59.811 38.551-129.269 45.498-201.428l0.262-3.372c0.96-11.2 0.96-12.8-2.24-19.52-7.36-14.72-26.24-23.040-43.52-19.52-8.216 1.785-15.015 6.805-19.126 13.628l-0.074 0.132c-1.92 3.2-2.24 4.48-2.24 10.56-1.565 60.354-12.338 117.678-30.96 171.332l1.2-3.972c-2.56 7.040-2.56 9.28-0.32 8.64l6.080-1.6c9.6-2.24 22.4 1.6 30.4 9.6 7.36 7.36 10.88 16.96 11.52 30.4 0.64 9.6 1.28 10.56 3.84 5.12zM560.32 649.6v-4.16l-3.84-4.16c-4.608-4.54-10.935-7.348-17.918-7.36l-0.002-0c-8.96-0.64-11.52 0-15.040 3.84-0.911 1.004-1.966 1.856-3.138 2.527l-0.062 0.033s4.16-11.52 5.44-12.8c3.2-3.84 19.2-3.2 27.2 0.64 4.16 2.24 8.96 7.040 10.56 10.56l1.6 3.2-1.6 5.76c-2.56 7.040-3.2 7.36-3.2 1.92zM571.2 608c-0.204-1.094-0.321-2.354-0.321-3.64 0-0.070 0-0.141 0.001-0.211l-0 0.011c0-2.56-2.56-5.44-6.72-8.32-4.777-2.729-10.499-4.338-16.597-4.338-2.624 0-5.178 0.298-7.631 0.862l0.228-0.044c-3.2 0.64-4.16 1.28-7.040 4.48l-3.2 3.2 1.28-4.16c2.88-9.6 3.2-10.24 6.4-11.52 6.4-2.56 17.92-2.24 25.6 0.96 3.2 1.6 8.64 6.4 10.56 9.6 1.28 3.2 1.28 3.2 0 8.64l-1.92 6.080-0.64-1.6zM580.16 565.12c-0.314-1.58-0.757-2.973-1.332-4.294l0.052 0.134c-2.452-3.338-5.691-5.961-9.451-7.621l-0.149-0.059c-4.16-2.24-4.48-2.24-12.8-2.24-11.2 0-13.76 1.28-17.6 8-1.28 2.24-0.96 0 0.32-6.4 1.28-4.48 2.24-7.040 3.2-7.68 4.48-3.52 19.2-4.16 27.2-1.28 5.12 1.92 9.6 5.76 11.84 9.28 1.6 2.88 1.6 3.2 0.96 8.64-0.32 3.2-0.96 5.76-1.28 6.080s-0.64-0.96-0.96-2.56zM586.24 526.72l-1.92-5.12c-1.28-4.16-1.6-4.8-5.76-7.36-5.44-3.52-9.92-4.8-18.88-4.16-9.6 0.64-12.8 1.92-15.68 6.4-1.28 1.92-2.24 3.2-2.24 2.56 0-2.24 2.24-12.8 2.88-13.76 0.96-1.28 8-3.52 12.8-4.48 6.4-0.96 13.76 0 19.2 2.88 4.8 1.92 9.6 6.72 10.56 9.6 0.018 0.57 0.029 1.241 0.029 1.914 0 3.96-0.36 7.837-1.048 11.598l0.060-0.392zM51.84 475.2c16-15.68 41.6-17.92 57.28-5.12 3.84 3.2 4.8 3.2 4.8-3.2 0-7.040 1.28-22.4 2.88-35.2 0.64-6.4 1.28-11.52 0.96-11.84l-8.32-1.28c-21.592-2.535-41.275-8.176-59.47-16.504l1.23 0.504c-5.12-2.88-6.4-2.56-7.040 0.64s-0.64 72.64 0 74.88c0.32 1.28 0.96 1.92 1.6 1.92s3.2-2.24 6.080-4.8zM600.64 475.52c0.64-5.12 0.64-63.36 0-69.76-0.32-4.8-0.64-4.8-2.24-4.8-0.96 0-5.76 1.92-10.56 3.84-15.36 6.4-32.96 11.2-51.2 13.76l-9.28 0.96v3.2l1.28 12.48 2.24 23.36c0.64 10.88 0.96 14.080 1.6 14.080s2.24-1.28 3.84-2.56c6.72-5.44 15.040-8 24.32-8 12.8 0 23.68 4.16 32.64 12.8 3.2 2.88 5.76 5.12 6.4 5.12s0.64-2.24 0.96-4.48zM119.040 415.040l2.56-12.16c6.386-36.295 20.079-68.545 39.556-96.461l-0.516 0.781c6.4-8.32 17.28-19.52 24-24.96 2.56-1.92 4.8-4.16 4.8-4.8s-3.2-3.2-9.28-6.72c-30.427-17.366-55.108-41.636-72.462-70.777l-0.498-0.903c-2.56 0-13.44 16.96-22.72 36.16-23.026 46.938-37.143 101.958-38.709 160.109l-0.011 0.531c0.64 1.6 9.92 6.080 21.12 9.92 20.48 7.68 50.24 12.8 52.16 9.6zM538.88 415.36c20.046-2.861 38.156-8.237 55.026-15.873l-1.266 0.513 7.36-3.52-0.32-7.040c-4.16-62.080-21.44-125.12-46.4-168.32-4.293-8.418-9.299-15.672-15.126-22.177l0.086 0.097c-17.609 29.551-41.97 53.399-71.045 69.901l-0.955 0.499-10.88 7.68c34.356 29.343 58.376 69.896 66.391 115.944l0.169 1.176 3.2 15.68c1.28 7.36 0.64 7.36 13.44 5.44zM39.040 385.92l2.24-15.040c5.249-68.635 27.196-131.222 61.747-184.933l-0.947 1.573c0.96-3.2-18.88-19.52-23.68-19.52-2.56 0-15.040 20.16-24.96 40.96-7.36 15.68-11.84 26.56-17.92 45.12-11.96 35.777-20.481 77.362-23.882 120.388l-0.118 1.852-0.32 4.48 8 1.28c4.48 0.64 10.24 1.92 13.12 2.88 6.4 1.92 6.080 1.92 6.72 0.96zM625.6 381.76l7.68-0.96 0.32-2.88c-3.415-53.549-14.859-103.451-33.16-149.901l1.16 3.341c-7.36-18.56-20.16-43.52-30.080-58.56-2.56-3.52-3.84-4.8-5.12-4.8-3.84 0-23.36 15.36-23.36 18.88l3.2 6.4c12.8 18.56 25.92 45.12 35.2 71.040 11.2 33.6 19.2 71.040 23.040 110.4 0.32 6.080 1.28 10.88 1.6 11.2s3.2 0 6.4-1.28l12.8-2.88zM462.4 268.8c28.16-17.28 51.2-38.4 64.64-58.56 2.24-3.84 5.44-8.96 6.4-11.52l2.24-4.48-3.2-3.84c-4.48-6.4-17.92-19.84-24.96-25.6-17.551-14.853-39.754-24.718-64.146-27.16l-0.494-0.040c-9.6-0.96-17.6-0.32-24.32 1.92-9.6 3.2-16 8.64-20.8 18.56-8 16-6.080 43.52 4.8 59.84 6.4 10.24 13.76 15.040 22.4 14.4 11.52-0.96 19.2-16 19.2-37.44 0-14.72-4.16-25.6-11.84-30.72-5.44-3.52-12.8-0.96-16.32 5.76-3.2 5.44-3.84 16.64-1.28 24.96 1.6 4.8 5.44 9.28 8.64 9.28 1.6 0 2.56-0.64 3.52-2.24 1.28-1.92 1.28-3.2 1.28-8.32 0-4.8-0.64-6.4-1.92-8-1.92-2.88-1.6-4.8 0.32-5.12 4.48-0.32 7.68 7.68 7.040 17.28-0.96 17.28-8.64 24-16.96 15.040-7.040-7.68-10.56-24-8.32-37.76 1.92-11.2 6.4-17.92 12.8-21.12 4.48-2.56 8.64-2.56 12.8 0 16.32 9.6 21.44 48.96 9.6 73.6-3.2 6.4-6.4 10.56-10.88 12.8-3.2 1.6-3.84 1.6-20.8 1.6-11.2 0-19.2-0.32-22.4-0.96-17.564-2.027-32.973-9.966-44.465-21.745l-0.015-0.015c-4.556-5.888-8.078-12.835-10.143-20.385l-0.097-0.415c-1.112-4.229-1.75-9.085-1.75-14.089 0-1.461 0.054-2.909 0.161-4.342l-0.011 0.191c-0.012-0.576-0.019-1.256-0.019-1.937 0-22.090 7.083-42.526 19.103-59.16l-0.204 0.297c5.12-7.040 16-17.28 22.4-21.44s6.72-5.44 1.92-7.68c-1.967-1.040-4.299-1.651-6.774-1.651-0.432 0-0.859 0.019-1.281 0.055l0.055-0.004c-6.483 0.221-12.37 2.601-17.007 6.438l0.047-0.038c-9.6 6.4-22.4 22.4-25.92 31.68-1.92 5.12-3.2 5.12-5.44-0.32-5.12-12.8-20.48-29.12-32.96-35.2-3.191-1.536-6.938-2.434-10.895-2.434-1.807 0-3.57 0.187-5.271 0.543l0.167-0.029c-2.88 0.64-6.4 3.2-6.4 4.16l6.4 4.48c7.68 5.12 18.56 16 23.68 24 16 23.68 22.080 57.6 14.4 80.32-3.2 8.96-5.44 13.12-12.48 19.84-6.4 6.4-11.84 9.92-20.16 13.12-13.44 5.44-26.24 7.36-46.080 6.72-12.8 0-14.72-0.32-17.28-1.6-16.96-7.68-24-49.6-12.16-73.92 2.465-5.448 6.305-9.905 11.085-13.049l0.115-0.071c7.36-3.52 16 0.64 20.8 9.92 9.28 17.92 2.24 51.2-10.88 53.76-1.92 0.32-2.56 0-4.8-2.24-7.040-7.040-8-27.2-1.6-32.96 3.2-3.2 5.44 0.64 2.56 4.48-1.28 1.6-1.6 2.88-1.6 7.68 0 7.040 1.6 10.24 4.8 10.24s5.76-2.24 8-6.72c1.6-3.2 1.92-5.12 2.24-11.52 0.32-12.16-2.24-18.56-8.32-21.76-4.16-1.92-7.36-1.92-10.56 0-8 5.44-11.84 15.68-11.84 31.36 0 10.88 1.6 18.24 4.8 24.96 4.16 8.32 8.96 12.16 16 12.16 12.8 0 24.64-14.72 28.8-35.2 1.92-8 1.92-23.68 0-30.080-2.47-11.222-9.501-20.454-19.005-25.819l-0.195-0.101c-5.76-3.2-10.88-4.16-21.12-3.84-28.16 0-54.4 10.88-79.040 32.96-8.32 7.36-21.44 22.4-21.44 24.32s4.16 9.6 8.96 16.96c10.88 16 26.88 31.68 47.68 46.4 9.6 6.72 25.6 16.64 26.88 16.64l10.24-4.48c19.52-9.6 36.48-13.44 57.28-12.8 13.44 0.32 19.2 1.28 40.64 6.72 21.12 5.44 21.44 5.44 41.6 0l22.4-4.8c9.6-1.92 27.2-2.56 36.16-1.28 14.4 1.6 31.68 7.040 44.16 14.080 3.2 1.6 6.080 2.88 6.4 2.56l10.24-5.76zM256.96 229.44c15.268-1.117 28.734-8.028 38.362-18.518l0.038-0.042c7.040-9.6 9.6-17.92 9.6-32 0.64-34.56-19.2-66.88-48.96-81.28-12.508-5.576-27.103-8.823-42.456-8.823-3.643 0-7.242 0.183-10.791 0.54l0.447-0.036c-42.334 3.557-79.435 23.441-105.441 53.254l-0.159 0.186c-8 8.96-16.32 19.52-16.32 21.12 0 0.64 1.92 2.24 5.12 4.48 3.2 1.92 8 6.080 11.52 8.96s6.4 5.76 7.040 5.76c0.64 0 2.24-1.6 3.84-3.52 19.494-25.753 47.13-44.44 79.032-52.279l0.968-0.201c9.92-1.92 26.88-2.56 33.6-0.96 13.76 3.2 24.32 11.52 30.72 24.96 7.68 15.68 8.64 34.24 2.88 53.12-2.24 6.4-5.76 13.76-9.28 18.56-2.56 3.84-2.88 5.76-0.96 6.72 1.6 0.96 3.84 0.96 11.52 0zM399.040 229.76c2.56-0.64 2.56-2.56-0.64-7.040-17.92-26.56-16.64-64.96 2.88-84.48 5.44-5.44 10.56-8.64 18.56-11.52 5.44-1.92 25.92-1.92 35.2 0 18.24 3.52 36.16 11.84 52.16 24 12.262 9.719 23.068 20.322 32.668 31.956l0.292 0.364c0.64 0 3.2-2.24 6.4-5.12 4.8-4.16 10.56-8.64 16.96-12.48 1.92-0.96 0.96-2.56-6.4-11.84-21.236-27.552-50.179-48.219-83.592-58.868l-1.208-0.332c-11.554-3.434-24.829-5.41-38.566-5.41-8.763 0-17.339 0.804-25.657 2.343l0.863-0.133c-39.583 8.429-68.844 43.096-68.844 84.598 0 0.971 0.016 1.939 0.048 2.903l-0.004-0.14c0 11.2 0 12.16 1.92 17.6 0.96 3.2 2.56 7.040 3.84 8.96 4.8 8.32 14.4 16 24.64 20.16 8.96 3.2 23.68 5.76 28.48 4.48zM327.040 111.040c13.44-23.36 32-35.84 48.64-33.28 5.76 0.96 12.48 3.84 16 7.040l2.88 2.56 4.16-1.28 12.16-2.56c3.33-0.426 6.354-1.326 9.146-2.639l-0.186 0.079c1.6-1.6-2.24-8-8.64-14.4-4.8-4.8-6.72-6.4-12.8-9.28-6.673-3.617-14.571-5.84-22.966-6.078l-0.074-0.002c-11.84-0.64-21.76 1.92-31.040 8-8.32 5.76-15.36 14.4-19.2 24l-2.56 4.48-1.92-3.2c-2.996-7.010-6.869-13.037-11.576-18.304l0.056 0.064c-6.4-6.4-14.080-11.2-22.72-13.44-6.72-1.92-21.44-1.92-28.8 0s-16 6.4-21.12 10.88c-4.8 4.16-10.88 12.16-11.52 15.68-0.32 2.24-0.32 2.24 6.72 3.2l11.84 2.88 7.36 1.92 3.2-2.56c5.372-4.443 12.33-7.138 19.919-7.138 0.873 0 1.738 0.036 2.593 0.106l-0.112-0.007c5.44 0.32 11.84 2.88 17.28 5.76 7.68 4.8 17.6 16 24.64 27.84 3.52 6.4 4.8 6.4 8.64-0.32zM325.76 72.64c5.12-8.64 12.16-15.36 21.76-20.48 6.4-3.2 6.4-4.16 1.92-6.72-2.88-1.6-4.16-1.6-8.96-1.6-7.040 0-11.2 1.6-15.36 5.76l-2.56 2.88-3.2-3.2c-3.795-3.47-8.833-5.636-14.375-5.76l-0.025-0c-6.4 0-13.76 3.2-12.8 5.44 0 0.64 3.2 2.24 6.080 3.84 6.72 3.2 15.040 10.88 19.52 17.92 4.16 6.4 5.44 6.4 8 1.92zM288 43.84c4.876-5.34 11.867-8.678 19.638-8.678 3.896 0 7.596 0.839 10.929 2.346l-0.167-0.068c4.16 1.6 4.48 1.6 7.040 0.32 10.88-4.8 22.4-2.88 30.72 5.44l3.52 3.84 4.8-0.96c1.885-0.166 3.622-0.621 5.227-1.322l-0.107 0.042c1.6-1.6-5.76-16-11.84-23.040-8.936-9.378-21.521-15.209-35.468-15.209-7.823 0-15.217 1.835-21.777 5.097l0.285-0.128c-10.24 5.12-21.12 17.92-24.64 28.8-1.28 4.48-0.96 4.8 3.2 5.76 5.12 0.96 5.76 0.96 8.64-2.24z"
|
@@ -0,0 +1,4 @@
|
|
1
|
+
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
|
2
|
+
<path fill="#6c757d" d="M32.088 0.6l2.545-4.6c-0.605 0.567-0.9 0.745-1.47 1.13-3.077 2.112-6.864 2.615-10.668 5.744-2.58 2.124-3.773 5.202-3.773 5.202s3.464-3.9 8.703-5.832c2.113-0.783 3.587-1.213 4.663-1.632z"></path>
|
3
|
+
<path fill="#6c757d" d="M30.73 3.072c-2.758 0.88-6.042 1.716-9.407 3.987-2.62 1.77-4.143 4.787-4.143 4.787s3.696-3.696 9.068-4.958l2.75-0.642 1.734-3.174zM27.66 8.796c-1.32 0.12-4.078 0.366-7.303 2.162-2.122 1.18-3.795 2.797-3.795 2.797l-0.005 0.010-0.003-0.002c-0.63 1.182-1.502 3.147-2.357 5.26l-4.253-7.763h-5.577l1.782 1.784v13.136l-1.782 1.78h6.1l-1.812-1.782v-10.2l3.983 7.13-1.257 4.135 1.283-1.5s1.040-4.955 5.142-9.82v10.393l-1.783 1.684h7.064l-1.536-1.784v-13.88c3.714-2.944 6.115-3.54 6.1-3.54z"></path>
|
4
|
+
</svg>
|
@@ -20,6 +20,7 @@ en:
|
|
20
20
|
export_shapefile_link: 'Shapefile'
|
21
21
|
export_kmz_link: 'KMZ'
|
22
22
|
export_geojson_link: 'GeoJSON'
|
23
|
+
export_geotiff_link: 'GeoTIFF'
|
23
24
|
home:
|
24
25
|
headline: 'Explore and discover...'
|
25
26
|
search_heading: 'Find the maps and data you need'
|
@@ -134,6 +135,7 @@ en:
|
|
134
135
|
cornell: Cornell University
|
135
136
|
dvd-rom: DVD-Rom
|
136
137
|
esri-globe: Esri Global
|
138
|
+
george-mason: George Mason University
|
137
139
|
harvard: Harvard University
|
138
140
|
illinois: University of Illinois
|
139
141
|
indiana: Indiana University
|
data/geoblacklight.gemspec
CHANGED
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
|
|
19
19
|
spec.require_paths = ['lib']
|
20
20
|
spec.required_rubygems_version = '>= 2.5.2'
|
21
21
|
|
22
|
-
spec.add_dependency 'rails', '>= 6.1', '< 7'
|
22
|
+
spec.add_dependency 'rails', '>= 6.1', '< 7.1'
|
23
23
|
spec.add_dependency 'blacklight', '~> 7.12'
|
24
24
|
spec.add_dependency 'config'
|
25
25
|
spec.add_dependency 'faraday', '>= 1.0'
|
@@ -17,7 +17,7 @@ module Geoblacklight
|
|
17
17
|
def add_javascript
|
18
18
|
copy_file 'assets/geoblacklight.js', 'app/assets/javascripts/geoblacklight.js'
|
19
19
|
|
20
|
-
if Rails.version.to_i
|
20
|
+
if Rails.version.to_i >= 6
|
21
21
|
append_to_file 'app/assets/javascripts/application.js',
|
22
22
|
"\n// Required by GeoBlacklight\n//= require geoblacklight"
|
23
23
|
end
|
@@ -7,6 +7,23 @@ module Geoblacklight
|
|
7
7
|
|
8
8
|
desc 'Install Geoblacklight'
|
9
9
|
|
10
|
+
def allow_geoblacklight_params
|
11
|
+
gbl_params = <<-"PARAMS"
|
12
|
+
before_action :allow_geoblacklight_params
|
13
|
+
|
14
|
+
def allow_geoblacklight_params
|
15
|
+
# Blacklight::Parameters will pass these to params.permit
|
16
|
+
blacklight_config.search_state_fields.append(Settings.GBL_PARAMS)
|
17
|
+
end
|
18
|
+
PARAMS
|
19
|
+
|
20
|
+
inject_into_file 'app/controllers/application_controller.rb', gbl_params, before: /^end/
|
21
|
+
end
|
22
|
+
|
23
|
+
def raise_unpermitted_params
|
24
|
+
inject_into_file 'config/environments/test.rb', "config.action_controller.action_on_unpermitted_parameters = :raise\n", before: /^end/
|
25
|
+
end
|
26
|
+
|
10
27
|
def mount_geoblacklight_engine
|
11
28
|
inject_into_file 'config/routes.rb', "mount Geoblacklight::Engine => 'geoblacklight'\n", before: /^end/
|
12
29
|
end
|
@@ -22,6 +22,25 @@ OVERLAP_RATIO_BOOST: '2'
|
|
22
22
|
HOMEPAGE_MAP_GEOM: null
|
23
23
|
# HOMEPAGE_MAP_GEOM: '{"type":"Polygon","coordinates":[[[-73.58,42.93],[-73.58,41.20],[-69.90,41.20],[-69.90,42.93]]]}'
|
24
24
|
|
25
|
+
# Non-search-field GeoBlacklight application permitted params
|
26
|
+
GBL_PARAMS:
|
27
|
+
- :bbox
|
28
|
+
- :email
|
29
|
+
- :file
|
30
|
+
- :format
|
31
|
+
- :id
|
32
|
+
- :logo
|
33
|
+
- :provider
|
34
|
+
- :type
|
35
|
+
- :BBOX
|
36
|
+
- :HEIGHT
|
37
|
+
- :LAYERS
|
38
|
+
- :QUERY_LAYERS
|
39
|
+
- :URL
|
40
|
+
- :WIDTH
|
41
|
+
- :X
|
42
|
+
- :Y
|
43
|
+
|
25
44
|
# Solr field mappings
|
26
45
|
FIELDS:
|
27
46
|
:ACCESS_RIGHTS: 'dct_accessRights_s'
|
@@ -48,7 +48,7 @@ module Geoblacklight
|
|
48
48
|
File.rename("#{file_path_and_name}.tmp", file_path_and_name)
|
49
49
|
file_name
|
50
50
|
rescue Geoblacklight::Exceptions::WrongDownloadFormat => error
|
51
|
-
Geoblacklight.logger.error "#{error} expected #{@options[:content_type]} "\
|
51
|
+
Geoblacklight.logger.error "#{error} expected #{@options[:content_type]} " \
|
52
52
|
"received #{download.headers['content-type']}"
|
53
53
|
File.delete("#{file_path_and_name}.tmp")
|
54
54
|
raise Geoblacklight::Exceptions::ExternalDownloadFailed, message: 'Wrong download type'
|
data/lib/geoblacklight/engine.rb
CHANGED
@@ -13,8 +13,10 @@ module Geoblacklight
|
|
13
13
|
# GeoblacklightHelper is needed by all helpers, so we inject it
|
14
14
|
# into action view base here.
|
15
15
|
initializer 'geoblacklight.helpers' do
|
16
|
-
|
17
|
-
|
16
|
+
config.after_initialize do
|
17
|
+
ActionView::Base.send :include, GeoblacklightHelper
|
18
|
+
ActionView::Base.send :include, CartoHelper
|
19
|
+
end
|
18
20
|
end
|
19
21
|
|
20
22
|
config.to_prepare do
|
@@ -31,7 +31,7 @@ module Geoblacklight
|
|
31
31
|
def cleaned_metadata
|
32
32
|
transformed_doc = Nokogiri::XML(@metadata.to_html)
|
33
33
|
if transformed_doc.xpath('//body').children.empty?
|
34
|
-
fail TransformError
|
34
|
+
fail TransformError, \
|
35
35
|
'Failed to extract the <body> child elements from the transformed metadata'
|
36
36
|
end
|
37
37
|
transformed_doc.xpath('//body').children
|
@@ -39,10 +39,27 @@ namespace :geoblacklight do
|
|
39
39
|
end
|
40
40
|
end
|
41
41
|
|
42
|
+
# Local fixtures: bundle exec rake "geoblacklight:index:seed"
|
43
|
+
# Remote fixtures: bundle exec rake "geoblacklight:index:seed[:remote]"
|
42
44
|
namespace :index do
|
43
|
-
desc '
|
44
|
-
task :seed => :environment do
|
45
|
-
docs =
|
45
|
+
desc 'Index GBL test fixture metadata into Solr'
|
46
|
+
task :seed, [:remote] => :environment do |t, args|
|
47
|
+
docs = []
|
48
|
+
|
49
|
+
if args.remote
|
50
|
+
puts 'Indexing - Remote test fixtures'
|
51
|
+
JSON.load(
|
52
|
+
URI.open("https://api.github.com/repos/geoblacklight/geoblacklight/contents/spec/fixtures/solr_documents")
|
53
|
+
).each do |fixture|
|
54
|
+
if fixture['name'].include?('.json')
|
55
|
+
docs << JSON.load(URI.open(fixture['download_url']))
|
56
|
+
end
|
57
|
+
end
|
58
|
+
else
|
59
|
+
puts 'Indexing - Local test fixtures'
|
60
|
+
docs = Dir['spec/fixtures/solr_documents/*.json'].map { |f| JSON.parse File.read(f) }.flatten
|
61
|
+
end
|
62
|
+
|
46
63
|
Blacklight.default_index.connection.add docs
|
47
64
|
Blacklight.default_index.connection.commit
|
48
65
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"$schema": "http://json-schema.org/draft-04/schema#",
|
3
|
-
"description": "Schema for GeoBlacklight. See https://
|
3
|
+
"description": "Schema for GeoBlacklight. See https://opengeometadata.org/docs/gbl-1.0 for more details.",
|
4
4
|
"id": "http://geoblacklight.org/v1.0/schema",
|
5
5
|
"title": "GeoBlacklight Schema - v1.0",
|
6
6
|
"definitions": {
|
@@ -24,7 +24,7 @@
|
|
24
24
|
},
|
25
25
|
"dc_identifier_s": {
|
26
26
|
"type": "string",
|
27
|
-
"description": "Unique identifier for layer as a URI. It should be globally unique across all institutions, assumed not to be end-user visible, and is usually of the form `http://institution/id`. See https://
|
27
|
+
"description": "Unique identifier for layer as a URI. It should be globally unique across all institutions, assumed not to be end-user visible, and is usually of the form `http://institution/id`. See https://opengeometadata.org/docs/gbl-1.0#identifier for more detailed documentation.",
|
28
28
|
"example": "http://purl.stanford.edu/vr593vj7147"
|
29
29
|
},
|
30
30
|
"dc_title_s": {
|
@@ -86,7 +86,7 @@
|
|
86
86
|
},
|
87
87
|
"layer_slug_s": {
|
88
88
|
"type": "string",
|
89
|
-
"description": "Identifies a layer in human-readable keywords. Note this value is visible to the user, and used for Permalinks. The value should be alpha-numeric characters separated by dashes, and is typically of the form `institution-keyword1-keyword2`. It should also be globally unique across all institutions in *your* GeoBlacklight index. See https://
|
89
|
+
"description": "Identifies a layer in human-readable keywords. Note this value is visible to the user, and used for Permalinks. The value should be alpha-numeric characters separated by dashes, and is typically of the form `institution-keyword1-keyword2`. It should also be globally unique across all institutions in *your* GeoBlacklight index. See https://opengeometadata.org/docs/gbl-1.0#slug for more detailed documentation.",
|
90
90
|
"pattern": "^[-a-zA-Z0-9]+$",
|
91
91
|
"example": "stanford-andhra-pradesh-village-boundaries"
|
92
92
|
},
|
data/schema/readme.md
ADDED
@@ -0,0 +1,8 @@
|
|
1
|
+
#about the schema directory
|
2
|
+
|
3
|
+
This directory contains two [JSON schema vocabulary](http://json-schema.org) files. These are provided for documentation and testing purposes.
|
4
|
+
|
5
|
+
* geoblacklight-schema-1.0.json : This document is formatted in the [GeoBlacklight 1.0 Metadata version schema](https://opengeometadata.org/docs/gbl-1.0), compatible with Geoblacklight versions 2.0 to 3.7.
|
6
|
+
* geoblacklight-schema-aardvark.json : This document is formatted in the [OpenGeoMetadata, version Aardvark schema](https://opengeometadata.org/docs/ogm-aardvark), compatible with Geoblacklight version 4.0.
|
7
|
+
|
8
|
+
For more information on the metadata schemas for GeoBlacklight, see [opengeometadata.org](https://opengeometadata.org)
|