Merge pull request #48 from gtt-project/main

Merge main to develop

Author: smellman

app/views/issues/index/_map.html.erb

@@ -1,7 +1,7 @@
 <% if @project and @project.module_enabled?(:gtt) %>
 
 <fieldset id="location" class="collapsible collapsed">
-  <legend><%= l(:field_location) %></legend>
+<legend class="icon icon-collapsed"><%= l(:field_location) %></legend>
 
   <%= map_tag map: @project.map, geom: (Issue.array_to_geojson(@issues, include_properties: { only: %i(id subject tracker_id status_id) }) if @issues), popup: { href: '/issues/[id]' } %>
 </fieldset>

assets/javascripts/app.js

@@ -88,6 +88,9 @@ var App = (function ($, publ) {
       );
     }
 
+    // Fix FireFox unloaded font issue
+    publ.reloadFontSymbol();
+
     // TODO: this is only necessary because setting the initial form value
     //  through the template causes encoding problems
     publ.updateForm(features);
@@ -183,6 +186,10 @@ var App = (function ($, publ) {
         })
       })
     });
+    // Fix empty map issue
+    map.once('postrender', function(event) {
+      publ.zoomToExtent(true);
+    });
 
     // Add Toolbar
     toolbar = new ol.control.Bar();
@@ -196,7 +203,7 @@ var App = (function ($, publ) {
 
     // Control button
     var maximizeCtrl = new ol.control.Button({
-      html: '<i class="icon-maximize" ></i>',
+      html: '<i class="gtt-icon-maximize" ></i>',
       title: "Maximize",
       handleClick: function () {
         publ.zoomToExtent(true);
@@ -338,7 +345,7 @@ var App = (function ($, publ) {
     }
     return color;
   };
-  
+
   publ.getFontColor = function (feature) {
     color = "#FFFFFF"
     return color;
@@ -602,7 +609,7 @@ var App = (function ($, publ) {
 
     // Control button
     var geolocationCtrl = new ol.control.Toggle({
-      html: '<i class="icon-compass" ></i>',
+      html: '<i class="gtt-icon-compass" ></i>',
       title: "Geolocation",
       active: false,
       onToggle: function (active) {
@@ -717,7 +724,7 @@ var App = (function ($, publ) {
                 var value = getObjectPathValue(item, defaults.geocoder.place_search_result_value_path);
                 if (display && value != null) {
                   $("div#places").append('<input type="radio" name="places" value="' + value + '">'
-                  + display 
+                  + display
                   +'<br>')
                 }
               })
@@ -739,7 +746,7 @@ var App = (function ($, publ) {
 
     // Control button
     var geocodingCtrl = new ol.control.Toggle({
-      html: '<i class="icon-info" ></i>',
+      html: '<i class="gtt-icon-info" ></i>',
       title: "Geocoding",
       className: "ctl-geocoding",
       onToggle: function (active) {
@@ -821,7 +828,7 @@ var App = (function ($, publ) {
       });
 
       var control = new ol.control.Toggle({
-        html: '<i class="icon-' + type.toLowerCase() + '" ></i>',
+        html: '<i class="gtt-icon-' + type.toLowerCase() + '" ></i>',
         title: type,
         interaction: draw
       });
@@ -830,7 +837,7 @@ var App = (function ($, publ) {
 
     // Upload button
     editbar.addControl(new ol.control.Button({
-      html: '<i class="icon-book" ></i>',
+      html: '<i class="gtt-icon-book" ></i>',
       title: 'Upload GeoJSON',
       handleClick: function () {
         var data = prompt("Please paste a GeoJSON geometry here");
@@ -939,7 +946,7 @@ var App = (function ($, publ) {
                 if (match && match.length === 2) {
                   districtInput.val(match[1]);
                   foundDistrict = true;
-                }  
+                }
               }
             }
           }
@@ -1005,6 +1012,38 @@ var App = (function ($, publ) {
     return url;
   };
 
+  publ.reloadFontSymbol = function () {
+    if ('fonts' in document) {
+      document.fonts.addEventListener('loadingdone', function(e) {
+        var loaded = false;
+        e.fontfaces.forEach(function(f) {
+          if (f.family === '"mcr-icons"' || f.family === '"fontmaki"') {
+            loaded = true;
+          }
+        });
+        if (loaded) {
+          maps.forEach(function(m) {
+            var layers = m.getLayers();
+            layers.forEach(function(layer) {
+              if (layer.type === "VECTOR" &&
+                  layer.getKeys().indexOf("title") >= 0 &&
+                  layer.get("title") === "Features") {
+                var features = layer.getSource().getFeatures();
+                if (features.length >= 0) {
+                  var geom = features[0].getGeometry();
+                  if (geom.getType() == "Point") {
+                    console.log("Reloading Features layer");
+                    layer.changed();  
+                  }
+                }
+              }
+            });
+          });
+        }
+      });
+    }
+  };
+
   function getCookie(cname) {
     var name = cname + "=";
     var ca = document.cookie.split(';');
@@ -1023,6 +1062,7 @@ var App = (function ($, publ) {
   function toggleAndLoadMap(el) {
     var fieldset = $(el).parents('fieldset').first();
     fieldset.toggleClass('collapsed');
+    fieldset.children('legend').toggleClass('icon-expended icon-collapsed');
     fieldset.children('div').toggle();
     maps.forEach(function (m) {
       m.updateSize();
@@ -1057,8 +1097,8 @@ var App = (function ($, publ) {
     };
 
     path = stringToPath(path);
-    var current = obj;  
-    for (var i = 0; i < path.length; i++) {  
+    var current = obj;
+    for (var i = 0; i < path.length; i++) {
       if (!current[path[i]]) {
         return def;
       }

assets/stylesheets/fonts.css

@@ -1,48 +1,46 @@
 /* Generated by Glyphter (http://www.glyphter.com) on  Thu Jan 19 2017*/
 @font-face {
     font-family: 'Redmine';
-    src: url('../fonts/Redmine.eot');
-    src: url('../fonts/Redmine.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/Redmine.woff') format('woff'),
-         url('../fonts/Redmine.ttf') format('truetype'),
-         url('../fonts/Redmine.svg#Redmine') format('svg');
+    src: url('../fonts/Redmine.woff') format('woff'),
+         url('../fonts/Redmine.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 }
-[class*='icon-']:before{
+[class^='gtt-icon-']:before{
 	display: inline-block;
-   font-family: 'Redmine';
-   font-style: normal;
-   font-weight: normal;
-   line-height: 1;
-   -webkit-font-smoothing: antialiased;
-   -moz-osx-font-smoothing: grayscale
+  font-family: 'Redmine';
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1em;
+  font-variant: normal;
+  text-transform: none;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
-.icon-point:before{content:'\0041';}
-.icon-linestring:before{content:'\0042';}
-.icon-polygon:before{content:'\0043';}
-.icon-shutter:before{content:'\0044';}
-.icon-camera:before{content:'\0045';}
-.icon-book:before{content:'\0046';}
-.icon-download:before{content:'\0047';}
-.icon-upload:before{content:'\0048';}
-.icon-home:before{content:'\0049';}
-.icon-layer:before{content:'\004a';}
-.icon-info:before{content:'\004b';}
-.icon-compass:before{content:'\004c';}
-.icon-move:before{content:'\004d';}
-.icon-maximize:before{content:'\004e';}
-.icon-trash:before{content:'\004f';}
-.icon-target:before{content:'\0050';}
-.icon-modify:before{content:'\0051';}
+
+.gtt-icon-point:before{content:'\0041';}
+.gtt-icon-linestring:before{content:'\0042';}
+.gtt-icon-polygon:before{content:'\0043';}
+.gtt-icon-shutter:before{content:'\0044';}
+.gtt-icon-camera:before{content:'\0045';}
+.gtt-icon-book:before{content:'\0046';}
+.gtt-icon-download:before{content:'\0047';}
+.gtt-icon-upload:before{content:'\0048';}
+.gtt-icon-home:before{content:'\0049';}
+.gtt-icon-layer:before{content:'\004a';}
+.gtt-icon-info:before{content:'\004b';}
+.gtt-icon-compass:before{content:'\004c';}
+.gtt-icon-move:before{content:'\004d';}
+.gtt-icon-maximize:before{content:'\004e';}
+.gtt-icon-trash:before{content:'\004f';}
+.gtt-icon-target:before{content:'\0050';}
+.gtt-icon-modify:before{content:'\0051';}
 
 @font-face {
   font-family: "mcr-icons";
-  src: url("../fonts/mcr-icons.eot?b88144ffa3049f78bfa19b5159b89f09?#iefix") format("embedded-opentype"),
-url("../fonts/mcr-icons.woff2?b88144ffa3049f78bfa19b5159b89f09") format("woff2"),
-url("../fonts/mcr-icons.woff?b88144ffa3049f78bfa19b5159b89f09") format("woff"),
-url("../fonts/mcr-icons.ttf?b88144ffa3049f78bfa19b5159b89f09") format("truetype"),
-url("../fonts/mcr-icons.svg?b88144ffa3049f78bfa19b5159b89f09#mcr-icons") format("svg");
+  src: url("../fonts/mcr-icons.woff2") format("woff2"),
+       url("../fonts/mcr-icons.woff") format("woff"),
+       url("../fonts/mcr-icons.ttf") format("truetype");
 }
 
 [class^="mcr-icon-"]:before, i[class*=" mcr-icon-"]:before {
@@ -51,7 +49,7 @@ url("../fonts/mcr-icons.svg?b88144ffa3049f78bfa19b5159b89f09#mcr-icons") format(
   font-weight: normal !important;
   font-variant: normal;
   text-transform: none;
-  line-height: 1;
+  line-height: 1em;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
@@ -103,11 +101,8 @@ url("../fonts/mcr-icons.svg?b88144ffa3049f78bfa19b5159b89f09#mcr-icons") format(
 */
 @font-face {
   font-family: 'fontmaki';
-  src: url('../fonts/fontmaki.eot?66752613');
-  src: url('../fonts/fontmaki.eot?66752613#iefix') format('embedded-opentype'),
-       url('../fonts/fontmaki.woff?66752613') format('woff'),
-       url('../fonts/fontmaki.ttf?66752613') format('truetype'),
-       url('../fonts/fontmaki.svg?66752613#fontmaki') format('svg');
+  src: url('../fonts/fontmaki.woff') format('woff'),
+       url('../fonts/fontmaki.ttf') format('truetype');
   font-weight: normal;
   font-style: normal;
 }
@@ -121,42 +116,42 @@ url("../fonts/mcr-icons.svg?b88144ffa3049f78bfa19b5159b89f09#mcr-icons") format(
   }
 }
 */
- 
+
  [class^="maki-"]:before, [class*=" maki-"]:before {
   font-family: "fontmaki";
   font-style: normal;
   font-weight: normal;
-  speak: none;
- 
+  /* speak: none; */
+
   display: inline-block;
   text-decoration: inherit;
   width: 1em;
   margin-right: .2em;
   text-align: center;
   /* opacity: .8; */
- 
+
   /* For safety - reset parent styles, that can break glyph codes*/
   font-variant: normal;
   text-transform: none;
- 
+
   /* fix buttons height, for twitter bootstrap */
   line-height: 1em;
- 
+
   /* Animation center compensation - margins should be symmetric */
   /* remove if not needed */
   margin-left: .2em;
- 
+
   /* you can be more comfortable with increased icons size */
   /* font-size: 120%; */
- 
+
   /* Font smoothing. That was taken from TWBS */
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
- 
+
   /* Uncomment for 3D effect */
   /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
- 
+
 .maki-bicycle:before { content: '\e800'; } /* '' */
 .maki-building:before { content: '\e801'; } /* '' */
 .maki-bus:before { content: '\e802'; } /* '' */

init.rb

@@ -6,9 +6,9 @@
   author_url 'https://github.com/georepublic'
   url 'https://github.com/gtt-project/redmine_gtt'
   description 'Adds location-based task management and maps'
-  version '2.0.2'
+  version '2.1.0'
 
-  requires_redmine :version_or_higher => '3.4.0'
+  requires_redmine :version_or_higher => '4.0.0'
 
   project_module :gtt do
     permission :manage_gtt_settings, {

lib/redmine_gtt/hooks/view_layouts_base_html_head_hook.rb

@@ -6,24 +6,16 @@ class ViewLayoutsBaseHtmlHeadHook < Redmine::Hook::ViewListener
 
       def view_layouts_base_html_head(context={})
         tags = [];
-        tags << tag(:link, :rel => "preload", :as => "font", :type => "application/vnd.ms-fontobject",
-          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.eot?75e7536f7f839b0f143e30ad8d0da92d?#iefi", :crossorigin => "anonymous" )
         tags << tag(:link, :rel => "preload", :as => "font", :type => "font/woff2",
-          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.woff2?75e7536f7f839b0f143e30ad8d0da92d", :crossorigin => "anonymous" )
+          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.woff2", :crossorigin => "anonymous" )
         tags << tag(:link, :rel => "preload", :as => "font", :type => "font/woff",
-          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.woff?75e7536f7f839b0f143e30ad8d0da92d", :crossorigin => "anonymous" )
+          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.woff", :crossorigin => "anonymous" )
         tags << tag(:link, :rel => "preload", :as => "font", :type => "font/ttf",
-          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.ttf?75e7536f7f839b0f143e30ad8d0da92d", :crossorigin => "anonymous" )
-        tags << tag(:link, :rel => "preload", :as => "font", :type => "image/svg+xml",
-          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.svg?75e7536f7f839b0f143e30ad8d0da92d#mcr-icons", :crossorigin => "anonymous" )
-        tags << tag(:link, :rel => "preload", :as => "font", :type => "application/vnd.ms-fontobject",
-          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.eot?66752613#iefix'", :crossorigin => "anonymous" )
+          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.ttf", :crossorigin => "anonymous" )
         tags << tag(:link, :rel => "preload", :as => "font", :type => "font/woff",
-          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.woff?66752613", :crossorigin => "anonymous" )
+          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.woff", :crossorigin => "anonymous" )
         tags << tag(:link, :rel => "preload", :as => "font", :type => "font/ttf",
-          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.ttf?66752613", :crossorigin => "anonymous" )
-        tags << tag(:link, :rel => "preload", :as => "font", :type => "image/svg+xml",
-          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.svg?66752613#fontmaki", :crossorigin => "anonymous" )
+          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.ttf", :crossorigin => "anonymous" )
 
         tags << stylesheet_link_tag("https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css")
         tags << stylesheet_link_tag("fonts.css", :plugin => "redmine_gtt", :media => "all")

lib/redmine_gtt/patches/geojson_attribute.rb

@@ -72,7 +72,7 @@ def geojson
       # doing a single select for each issue
       def geodata_for_print
         if row = self.class.where(id: id).where.not(geom: nil).
-                   pluck(Arel.sql("ST_AsGeoJson(ST_Transform(geom, 3857)) as geojson, ST_Transform(ST_Centroid(geom), 3857) as center")).
+                   pluck(Arel.sql("ST_AsGeoJson(ST_Transform(geom, 3857), 9, 0) as geojson, ST_Transform(ST_Centroid(geom), 3857) as center")).
                    first
           json, center = *row
           {