Merge branch 'develop' of hub.georepublic.net:gtt/redmine_gtt

Author: dkastl

app/overrides/issues.rb

@@ -1,28 +1,31 @@
 Deface::Override.new(
   :virtual_path => "issues/index",
   :name => "deface_view_issues_index_map",
-  :insert_after => "erb[loud]:contains('render_query_totals')",
+  :original => 'b807967c7184cb012c4bd5ccce90893349bc66e3',
+  :insert_after => "h2",
   :partial => "issues/index/map"
 )
 
 Deface::Override.new(
   :virtual_path => "issues/index",
   :name => "deface_view_issues_index_format_geojson",
+  :original => '2b4102bf118f0a9866cf50477dce9cc7a78da6d5',
   :insert_after => "erb[loud]:contains('PDF')",
   :partial => "issues/index/geojson"
 )
 
-
 Deface::Override.new(
   :virtual_path => "issues/show",
   :name => "deface_view_issues_show_map",
+  :original => 'f8b29d3fa9c4998090a16b8392242cafbc8cbbcf',
   :insert_before => "div.attributes",
   :partial => "issues/show/map"
 )
 
 Deface::Override.new(
   :virtual_path => "issues/show",
   :name => "deface_view_issues_show_format_geojson",
+  :original => '1419e0dcba37f62ff95372d41d9b73845889d826',
   :insert_after => "erb[loud]:contains('PDF')",
   :partial => "issues/show/geojson"
 )

assets/javascripts/app.map.js

@@ -144,6 +144,7 @@ App.map = (function ($, publ) {
     this.setGeolocation();
     this.setGeocoding();
     this.zoomToExtent();
+    this.parseHistory();
 
     // Control button
     var maximizeCtrl = new ol.control.Button({
@@ -300,10 +301,36 @@ App.map = (function ($, publ) {
     }
   };
 
+  /**
+   * Parse page for WKT strings in history
+   */
+  publ.parseHistory = function () {
+    $('div#history ul.details i').each( function (idx,item) {
+      var regex = new RegExp(/\w+\s(\((-?\d+.\d+\s?-?\d+.\d+,?)+\))+/g);
+      var match = $(item).text().match(regex);
+      if (match !== null) {
+        var feature = new ol.format.WKT().readFeature(
+          match[0], {
+            dataProjection: 'EPSG:4326',
+            featureProjection: 'EPSG:3857'
+          }
+        );
+        var wkt = new ol.format.WKT().writeFeature(
+          feature, {
+            dataProjection: 'EPSG:4326',
+            featureProjection: 'EPSG:3857',
+            decimals: 6
+          }
+        );
+        $(item).html('<a href="#" onclick="event.preventDefault();" class="wkt">' + wkt + '</a>');
+      }
+    });
+  };
+
   /**
    * Add Geolocation functionality
    */
-  publ.setGeolocation = function (){
+  publ.setGeolocation = function () {
 
     geolocation = new ol.Geolocation({
       tracking: false,