Merge branch 'feature/126_geocode_district' into 'develop'

Supported geocoder district (#126)

See merge request gtt/redmine_gtt!36

Author: Thibault Mutabazi

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

@@ -51,6 +51,24 @@
 </p>
 </div>
 
+<div class="box tabular settings">
+<h3><%= l(:select_default_geocoder_settings) %></h3>
+
+<p>
+  <%= content_tag(:label, l(:gtt_settings_geocoder_address_field_name)) %>
+  <%= text_field_tag('settings[default_geocoder_address_field_name]',
+      @settings['default_geocoder_address_field_name'],
+      :size => 10) %>
+</p>
+
+<p>
+  <%= content_tag(:label, l(:gtt_settings_geocoder_district_field_name)) %>
+  <%= text_field_tag('settings[default_geocoder_district_field_name]',
+      @settings['default_geocoder_district_field_name'],
+      :size => 10) %>
+</p>
+</div>
+
 <%= javascript_tag do %>
   var glyph = ol.style.FontSymbol.prototype.defs.glyphs;
   for (var font in ol.style.FontSymbol.prototype.defs.fonts){

assets/javascripts/app.js

@@ -38,7 +38,9 @@ var App = (function ($, publ) {
     lon: 139.691706,
     lat: 35.689524,
     zoom: 13,
-    maxzoom: 19
+    maxzoom: 19,
+    geocoderAddress: "現地住所",
+    geocoderDistrict: "区名"
   };
 
   /**
@@ -72,6 +74,12 @@ var App = (function ($, publ) {
     if (defaults.maxzoom == null) {
       defaults.maxzoom = quick_hack.maxzoom;
     }
+    if (defaults.geocoderAddress == null) {
+      defaults.geocoderAddress = quick_hack.geocoderAddress;
+    }
+    if (defaults.geocoderDistrict == null) {
+      defaults.geocoderDistrict = quick_hack.geocoderDistrict;
+    }
 
     if (contents.geom && contents.geom !== null) {
       features = new ol.format.GeoJSON().readFeatures(
@@ -592,7 +600,7 @@ var App = (function ($, publ) {
     // Hack to add Geocoding buttons to text fields
     // There should be a better way to do this
     if ( $("#issue-form #attributes button.btn-geocode").length == 0 ) {
-      $("#issue-form #attributes label:contains('現地住所')").parent("p").append(
+      $("#issue-form #attributes label:contains('" + defaults.geocoderAddress + "')").parent("p").append(
         '<button name="button" type="button" class="btn-geocode">住所検索</button>'
       );
 
@@ -605,11 +613,25 @@ var App = (function ($, publ) {
           });
           coords = ol.proj.transform(coords,'EPSG:3857','EPSG:4326')
           $.getJSON("https://***REMOVED***/reversegeocode/json/" + coords.join(",") + ",1000", function(data) {
+            var addressInput = $("#issue-form #attributes label:contains('" + defaults.geocoderAddress + "')").parent("p").children("input");
+            var districtInput = $("#issue-form #attributes label:contains('" + defaults.geocoderDistrict + "')").parent("p").children("input");
+            var foundDistrict = false;
             if (data.result.address) {
-              $("#issue-form #attributes label:contains('現地住所')").parent("p").children("input").val(data.result.address);
+              addressInput.val(data.result.address);
+              if (districtInput && data.result.shikuchoson) {
+                var regexp = /^(?:\S+市)?(\S+区)$/g;
+                var match = regexp.exec(data.result.shikuchoson);
+                if (match && match.length === 2) {
+                  districtInput.val(match[1]);
+                  foundDistrict = true;
+                }
+              }
             }
             else {
-              $("#issue-form #attributes label:contains('現地住所')").parent("p").children("input").val("---");
+              addressInput.val("---");
+            }
+            if (!foundDistrict) {
+              districtInput.val("");
             }
           });
         }

config/locales/en.yml

@@ -50,9 +50,12 @@ en:
 
   gtt_settings_geocoder_url: "API Service URL"
   gtt_settings_geocoder_apikey: "API Key"
+  gtt_settings_geocoder_address_field_name: "Address field name"
+  gtt_settings_geocoder_district_field_name: "District field name"
 
   select_default_tracker_icon: "Select default tracker icon:"
   select_default_status_color: "Select default status color:"
   select_default_map_settings: "Select default map settings:"
+  select_default_geocoder_settings: "Select default geocoder settings:"
 
   text_osm_url_sample: For example https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png

config/locales/ja.yml

@@ -44,15 +44,18 @@ ja:
   gtt_settings_general_zoom_level: "既定の地図ズームレベル"
   gtt_settings_general_maxzoom_level: "既定の最大地図ズームレベル"
 
-  gtt_settings_map_url: "APIサービスのURL"
-  gtt_settings_map_apikey: "APIキー"
+  gtt_settings_map_url: "地図APIサービスのURL"
+  gtt_settings_map_apikey: "地図APIキー"
   gtt_settings_map_maxzoom_level: "最大地図ズームレベル"
 
-  gtt_settings_geocoder_url: "APIサービスのURL"
-  gtt_settings_geocoder_apikey: "APIキー"
+  gtt_settings_geocoder_url: "ジオコーダAPIサービスのURL"
+  gtt_settings_geocoder_apikey: "ジオコーダAPIキー"
+  gtt_settings_geocoder_address_field_name: "住所フィールド名"
+  gtt_settings_geocoder_district_field_name: "区フィールド名"
 
   select_default_tracker_icon: "レポートの分野アイコンを選択:"
   select_default_status_color: "ステータス色を選択:"
   select_default_map_settings: "地図の初期値を選択:"
+  select_default_geocoder_settings: "ジオコーダの初期値を選択:"
 
   text_osm_url_sample: "例： https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png"

init.rb

@@ -20,7 +20,9 @@
       'default_map_center_longitude' => 139.691706,
       'default_map_center_latitude' => 35.689524,
       'default_map_zoom_level' => 13,
-      'default_map_maxzoom_level' => 19
+      'default_map_maxzoom_level' => 19,
+      'default_geocoder_address_field_name' => '現地住所',
+      'default_geocoder_district_field_name' => '区名'
     },
     partial: 'settings/gtt/settings'
   )

lib/redmine_gtt/hooks/view_layouts_base_html_head_hook.rb

@@ -47,6 +47,8 @@ def view_layouts_base_body_bottom(context={})
           :maxzoom => Setting.plugin_redmine_gtt['default_map_maxzoom_level'],
           :geocoder_url => Setting.plugin_redmine_gtt['default_geocoder_url'],
           :geocoder_apikey => Setting.plugin_redmine_gtt['default_geocoder_apikey'],
+          :geocoder_address => Setting.plugin_redmine_gtt['default_geocoder_address_field_name'],
+          :geocoder_district => Setting.plugin_redmine_gtt['default_geocoder_district_field_name'],
           :plugin_settings => Setting.plugin_redmine_gtt.select{ |key, value| key.to_s.match(/^(?!default).+/) }
         }, :id => 'ol-defaults', :style => 'display:none')
         return tags.join("\n")