Skip to content

Commit 7343bc9

Browse files
committed
fixed unexpected default map settings overwritten issue #124
1 parent 3aca24d commit 7343bc9

File tree

3 files changed

+47
-7
lines changed

3 files changed

+47
-7
lines changed

app/views/settings/gtt/_settings.html.erb

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,38 @@
1919
<% end %>
2020
</div>
2121

22+
<div class="box tabular settings">
23+
<h3><%= l(:select_default_map_settings) %></h3>
24+
25+
<p>
26+
<%= content_tag(:label, l(:gtt_settings_general_center_lon)) %>
27+
<%= text_field_tag('settings[default_map_center_longitude]',
28+
@settings['default_map_center_longitude'],
29+
:size => 10) %>
30+
</p>
31+
32+
<p>
33+
<%= content_tag(:label, l(:gtt_settings_general_center_lat)) %>
34+
<%= text_field_tag('settings[default_map_center_latitude]',
35+
@settings['default_map_center_latitude'],
36+
:size => 10) %>
37+
</p>
38+
39+
<p>
40+
<%= content_tag(:label, l(:gtt_settings_general_zoom_level)) %>
41+
<%= text_field_tag('settings[default_map_zoom_level]',
42+
@settings['default_map_zoom_level'],
43+
:size => 10) %>
44+
</p>
45+
46+
<p>
47+
<%= content_tag(:label, l(:gtt_settings_general_maxzoom_level)) %>
48+
<%= text_field_tag('settings[default_map_maxzoom_level]',
49+
@settings['default_map_maxzoom_level'],
50+
:size => 10) %>
51+
</p>
52+
</div>
53+
2254
<%= javascript_tag do %>
2355
var glyph = ol.style.FontSymbol.prototype.defs.glyphs;
2456
for (var font in ol.style.FontSymbol.prototype.defs.fonts){

config/locales/en.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ en:
4242
gtt_settings_general_center_lon: "Default map center longitude"
4343
gtt_settings_general_center_lat: "Default map center latitude"
4444
gtt_settings_general_zoom_level: "Default map zoom level"
45+
gtt_settings_general_maxzoom_level: "Default map maximum zoom level"
4546

4647
gtt_settings_map_url: "API Service URL"
4748
gtt_settings_map_apikey: "API Key"
@@ -51,6 +52,7 @@ en:
5152
gtt_settings_geocoder_apikey: "API Key"
5253

5354
select_default_tracker_icon: "Select default tracker icon:"
54-
select_default_status_color: "Select default status color:"
55+
select_default_status_color: "Select default status color:"
56+
select_default_map_settings: "Select default map settings:"
5557

5658
text_osm_url_sample: For example https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png

config/locales/ja.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
# Japanese strings go here for Rails i18n
22
ja:
3-
error_invalid_json: must be valid JSON
3+
error_invalid_json: "正しいJSONにしてください"
44

5-
field_default: 新規プロジェクトのデフォルト
5+
field_default: "新規プロジェクトのデフォルト"
66
field_geometry: "所在地"
77
field_location: "場所"
88
field_geom: "所在地"
99
field_global: 世界的に利用可能
1010
field_options_string: オプション
1111
field_gtt_tile_source_ids: タイルソース
1212

13-
label_geotask_map: "知らせて 地図"
13+
label_geotask_map: "ジオタスク 地図"
1414
label_global: グローバル
1515
label_project_map: "プロジェクト 地図"
1616
label_user_map: "ユーザ 地図"
1717
label_name: タイトル
18-
label_nearby: "近く(lat,lng)"
18+
label_nearby: "近く(緯度,軽度)"
1919
label_type: タイプ
2020
label_config: 構成
2121
label_gtt_settings: GTT
2222
label_gtt_settings_headline: GTTの設定
2323

2424
gtt_label_geometry: "APIキー"
25-
gtt_text_settings_help: "Enter the API key. Leave empty if no key is required."
25+
gtt_text_settings_help: "APIキーを入力してください。キーが不要の場合は空白にしてください。"
2626
gtt_text_settings_geometry_example: "2747491302261fbc47967ba62621af22"
2727

2828
label_gtt: "GTT"
2929
label_gtt_bbox_filter: 場所
3030
label_gtt_distance: 距離
31+
label_gtt_select_icon: アイコン選択
3132
label_gtt_tile_source: タイルソース
3233
label_gtt_tile_source_new: 新しいタイルソース
3334
label_gtt_tile_source_plural: タイルソース
@@ -41,6 +42,7 @@ ja:
4142
gtt_settings_general_center_lon: "既定の地図中心経度"
4243
gtt_settings_general_center_lat: "既定の地図中心緯度"
4344
gtt_settings_general_zoom_level: "既定の地図ズームレベル"
45+
gtt_settings_general_maxzoom_level: "既定の最大地図ズームレベル"
4446

4547
gtt_settings_map_url: "APIサービスのURL"
4648
gtt_settings_map_apikey: "APIキー"
@@ -49,4 +51,8 @@ ja:
4951
gtt_settings_geocoder_url: "APIサービスのURL"
5052
gtt_settings_geocoder_apikey: "APIキー"
5153

52-
text_osm_url_sample: 例: https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png
54+
select_default_tracker_icon: "レポートの分野アイコンを選択:"
55+
select_default_status_color: "ステータス色を選択:"
56+
select_default_map_settings: "地図の初期値を選択:"
57+
58+
text_osm_url_sample: "例: https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png"

0 commit comments

Comments
 (0)