Merge branch 'show_search_results_in_a_popup' into 'develop'

Show parks search results in a popup

See merge request gtt/redmine_gtt!41

Author: sanak

app/overrides/issues.rb

@@ -29,3 +29,11 @@
   :insert_after => "erb[loud]:contains('PDF')",
   :partial => "issues/show/geojson"
 )
+
+Deface::Override.new(
+  :virtual_path => "issues/show",
+  :name => "deface_view_handle_geocoder_options",
+  :original => "f8b29d3fa9c4998090a16b8392242cafbc8cbbcf",
+  :insert_after => "div.attributes",
+  :partial => "issues/geocoder/geocoder_options"
+)

app/views/issues/geocoder/_geocoder_options.html.erb

@@ -0,0 +1,3 @@
+<%= hidden_field_tag "default_geocoder_address_field_name", "#{Setting.plugin_redmine_gtt['default_geocoder_address_field_name']}" %>
+<%= hidden_field_tag "default_park_search_field_name", "#{Setting.plugin_redmine_gtt['default_park_search_field_name']}" %>
+<%= hidden_field_tag "default_geocoder_url", "#{Setting.plugin_redmine_gtt['default_geocoder_url']}" %>

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

@@ -61,6 +61,13 @@
 <div class="box tabular settings">
 <h3><%= l(:select_default_geocoder_settings) %></h3>
 
+<p>
+  <%= content_tag(:label, l(:geocoder_url)) %>
+  <%= text_field_tag('settings[default_geocoder_url]',
+      @settings['default_geocoder_url'],
+      :size => 50) %>
+</p>
+
 <p>
   <%= content_tag(:label, l(:gtt_settings_geocoder_address_field_name)) %>
   <%= text_field_tag('settings[default_geocoder_address_field_name]',
@@ -74,6 +81,13 @@
       @settings['default_geocoder_district_field_name'],
       :size => 10) %>
 </p>
+
+<p>
+  <%= content_tag(:label, l(:gtt_park_search_field_name)) %>
+  <%= text_field_tag('settings[default_park_search_field_name]',
+      @settings['default_park_search_field_name'],
+      :size => 10) %>
+</p>
 </div>
 
 <%= javascript_tag do %>

assets/javascripts/app.js

@@ -626,18 +626,21 @@ var App = (function ($, publ) {
    */
   publ.setGeocoding = function (){
 
+    var default_park_search_field_name = $("input#default_park_search_field_name").val()
+    var default_geocoder_url = $("input#default_geocoder_url").val()
+    var default_geocoder_address_field_name = $("input#default_geocoder_address_field_name").val()
     // 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('" + defaults.geocoderAddress + "')").parent("p").append(
-        '<button name="button" type="button" class="btn-geocode">住所検索</button>'
+      $("#issue-form #attributes label:contains('" + default_geocoder_address_field_name + "')").parent("p").append(
+        '<button name="button" type="button" class="btn-geocode">' + default_geocoder_address_field_name + '</button>'
       );
 
       $("button.btn-geocode").on("click", function(evt) {
         // Geocode address and add/update icon on map
         if ($("button.btn-geocode").prev("input").val() != "") {
           var address = $("button.btn-geocode").prev("input").val()
-          $.getJSON("https://***REMOVED***/geocode/json/" + encodeURIComponent(address), function(data) {
+          $.getJSON(default_geocoder_url+"/geocode/json/" + encodeURIComponent(address), function(data) {
             if (data.result.code >= 0 && data.result.coordinates) {
               var coords = [data.result.coordinates.x, data.result.coordinates.y];
               var geom = new ol.geom.Point(
@@ -673,10 +676,10 @@ var App = (function ($, publ) {
         }
       });
     }
-
+    
     if ( $("#issue-form #attributes button.btn-parksearch").length == 0 ) {
-      $("#issue-form #attributes label:contains('公園検索')").parent("p").append(
-        '<button name="button" type="button" class="btn-parksearch">公園検索</button>'
+      $("#issue-form #attributes label:contains(" + default_park_search_field_name + ")").parent("p").append(
+        '<button name="button" type="button" class="btn-parksearch">' + default_park_search_field_name + '</button>'
       );
 
       $("button.btn-parksearch").on("click", function(evt) {
@@ -687,14 +690,30 @@ var App = (function ($, publ) {
             coords = feature.getGeometry().getCoordinates();
           });
           coords = ol.proj.transform(coords,'EPSG:3857','EPSG:4326')
-          $.getJSON("https://***REMOVED***/geocoder/service/reversegeocode/json/" + coords.join(",") + ",500?useaddr=true&owner=***REMOVED***&details=true", function(data) {
-            if (data.result.address && data.result.details.id ) {
-              $("#issue-form #attributes label:contains('公園検索')").parent("p").children("input").val(
-                "[" + data.result.details.id + "] " + data.result.address
+          
+          $.getJSON(default_geocoder_url + "/reversegeocode/json_arr/" + coords.join(",") + ",500?useaddr=true&owner=***REMOVED***&details=true&category=park", function(data) {
+            if (data.length){
+              $('#ajax-modal').html(
+                "<h3 class='title'>Park results </h3>" +
+                "<div id='parks'></div>" + 
+                "<p class='buttons'><input type='submit' value='select' onclick='hideModal(this)'/></p>"
               );
-            }
-            else {
-              $("#issue-form #attributes label:contains('公園検索')").parent("p").children("input").val("---");
+              $('#ajax-modal').addClass('park_search_results');
+              data.forEach(function(parkData){
+                if (parkData.result.address && parkData.result.details.id ) {
+                  $("div#parks").append('<input type="radio" name="parks" value="[' + parkData.result.details.id + ']' + parkData.result.address + '">'
+                  + parkData.result.address 
+                  +'<br>')
+                }
+              })
+              showModal('ajax-modal', '400px');
+              $("p.buttons input[type='submit']").click(function(){
+                $("#issue-form #attributes label:contains('" + default_park_search_field_name + "')").parent("p").children("input").val(
+                  $("div#parks input[type='radio']:checked").val()
+                );
+              })
+            }else{
+              $("#issue-form #attributes label:contains('" + default_park_search_field_name + "')").parent("p").children("input").val("---");
             }
           });
         }
@@ -885,7 +904,8 @@ var App = (function ($, publ) {
         // Todo: only works with point geometries for now for the last geometry
         var coords = features[features.length - 1].getGeometry().getCoordinates();
         coords = ol.proj.transform(coords,'EPSG:3857','EPSG:4326')
-        $.getJSON("https://***REMOVED***/reversegeocode/json/" + coords.join(",") + ",1000", function(data) {
+        var default_geocoder_url = $("input#default_geocoder_url").val()
+        $.getJSON(default_geocoder_url + "/reversegeocode/json/" + coords.join(",") + ",1000", function(data) {
           var districtInput = $("#issue-form #attributes label:contains('" + defaults.geocoderDistrict + "')").parent("p").children("input");
           var foundDistrict = false;
           if (data.result.code >= 0 && data.result.address) {

config/locales/en.yml

@@ -37,6 +37,8 @@ en:
   label_tab_geocoder: "Geocoder"
   label_tab_map: "Tile Sources"
 
+  geocoder_url: "Geocoder URL"
+
   gtt_tile_sources_info: Select the tile sources that should be available in this project.
 
   gtt_settings_general_center_lon: "Default map center longitude"
@@ -53,6 +55,7 @@ en:
   gtt_settings_geocoder_apikey: "API Key"
   gtt_settings_geocoder_address_field_name: "Address field name"
   gtt_settings_geocoder_district_field_name: "District field name"
+  gtt_park_search_field_name: "Park search field name"
 
   select_default_tracker_icon: "Select default tracker icon:"
   select_default_status_color: "Select default status color:"

config/locales/ja.yml

@@ -37,6 +37,8 @@ ja:
   label_tab_geocoder: "ジオコーダー"
   label_tab_map: "タイルソース"
 
+  geocoder_url: "ジオコーダのURL"
+
   gtt_tile_sources_info: このプロジェクトで使用できるタイルソースを選択します。
 
   gtt_settings_general_center_lon: "既定の地図中心経度"
@@ -53,6 +55,7 @@ ja:
   gtt_settings_geocoder_apikey: "ジオコーダAPIキー"
   gtt_settings_geocoder_address_field_name: "住所フィールド名"
   gtt_settings_geocoder_district_field_name: "区フィールド名"
+  gtt_park_search_field_name: "公園検索フィールド名"
 
   select_default_tracker_icon: "レポートの分野アイコンを選択:"
   select_default_status_color: "ステータス色を選択:"

init.rb

@@ -23,7 +23,9 @@
       'default_map_maxzoom_level' => 19,
       'default_map_fit_maxzoom_level' => 17,
       'default_geocoder_address_field_name' => '現地住所',
-      'default_geocoder_district_field_name' => '区名'
+      'default_geocoder_district_field_name' => '区名',
+      'default_park_search_field_name' => '公園検索',
+      'default_geocoder_url' => "https://***REMOVED***/"
     },
     partial: 'settings/gtt/settings'
   )