Merge branch 'feature/129_fit_maxzoom' into 'develop'

Supported map fit maxzoom

See merge request gtt/redmine_gtt!40

Author: Thibault Mutabazi

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

@@ -49,6 +49,13 @@
       @settings['default_map_maxzoom_level'],
       :size => 10) %>
 </p>
+
+<p>
+  <%= content_tag(:label, l(:gtt_settings_general_fit_maxzoom_level)) %>
+  <%= text_field_tag('settings[default_map_fit_maxzoom_level]',
+      @settings['default_map_fit_maxzoom_level'],
+      :size => 10) %>
+</p>
 </div>
 
 <div class="box tabular settings">

assets/javascripts/app.js

@@ -39,6 +39,7 @@ var App = (function ($, publ) {
     lat: 35.689524,
     zoom: 13,
     maxzoom: 19,
+    fitMaxzoom: 17,
     geocoderAddress: "現地住所",
     geocoderDistrict: "区名"
   };
@@ -74,6 +75,9 @@ var App = (function ($, publ) {
     if (defaults.maxzoom == null) {
       defaults.maxzoom = quick_hack.maxzoom;
     }
+    if (defaults.fitMaxzoom == null) {
+      defaults.fitMaxzoom = quick_hack.fitMaxzoom;
+    }
     if (defaults.geocoderAddress == null) {
       defaults.geocoderAddress = quick_hack.geocoderAddress;
     }
@@ -451,12 +455,18 @@ var App = (function ($, publ) {
         ol.extent.extend(extent, feature.getGeometry().getExtent());
       });
       maps.forEach(function (m) {
-        m.getView().fit(extent, m.getSize());
+        m.getView().fit(extent, {
+          size: getMapSize(m),
+          maxZoom: defaults.fitMaxzoom
+        });
       });
     }
     else if (bounds.getSource().getFeatures().length > 0) {
       maps.forEach(function (m) {
-        m.getView().fit(bounds.getSource().getExtent(), m.getSize());
+        m.getView().fit(bounds.getSource().getExtent(), {
+          size: getMapSize(m),
+          maxZoom: defaults.fitMaxzoom
+        });
       });
     }
     else if (geolocation) {
@@ -966,6 +976,17 @@ var App = (function ($, publ) {
     });
   }
 
+  function getMapSize(map) {
+    var size = map.getSize();
+    if (size.length === 2 && size[0] <= 0 && size[1] <= 0) {
+      size = [
+        $("div#" + map.getTarget().id).width(),
+        $("div#" + map.getTarget().id).height(),
+      ]
+    }
+    return size;
+  }
+
   /**
    * Return public objects
    */

config/locales/en.yml

@@ -43,6 +43,7 @@ en:
   gtt_settings_general_center_lat: "Default map center latitude"
   gtt_settings_general_zoom_level: "Default map zoom level"
   gtt_settings_general_maxzoom_level: "Default map maximum zoom level"
+  gtt_settings_general_fit_maxzoom_level: "Default map fit maximum zoom level"
 
   gtt_settings_map_url: "API Service URL"
   gtt_settings_map_apikey: "API Key"

config/locales/ja.yml

@@ -43,6 +43,7 @@ ja:
   gtt_settings_general_center_lat: "既定の地図中心緯度"
   gtt_settings_general_zoom_level: "既定の地図ズームレベル"
   gtt_settings_general_maxzoom_level: "既定の最大地図ズームレベル"
+  gtt_settings_general_fit_maxzoom_level: "フィット時最大地図ズームレベル"
 
   gtt_settings_map_url: "地図APIサービスのURL"
   gtt_settings_map_apikey: "地図APIキー"

init.rb

@@ -21,6 +21,7 @@
       'default_map_center_latitude' => 35.689524,
       'default_map_zoom_level' => 13,
       'default_map_maxzoom_level' => 19,
+      'default_map_fit_maxzoom_level' => 17,
       'default_geocoder_address_field_name' => '現地住所',
       'default_geocoder_district_field_name' => '区名'
     },

lib/redmine_gtt/hooks/view_layouts_base_html_head_hook.rb

@@ -45,6 +45,7 @@ def view_layouts_base_body_bottom(context={})
           :lat => Setting.plugin_redmine_gtt['default_map_center_latitude'],
           :zoom => Setting.plugin_redmine_gtt['default_map_zoom_level'],
           :maxzoom => Setting.plugin_redmine_gtt['default_map_maxzoom_level'],
+          :fit_maxzoom => Setting.plugin_redmine_gtt['default_map_fit_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'],