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

Author: dkastl

Gemfile

@@ -5,30 +5,6 @@ gem 'immutable-struct'
 gem "rgeo"
 gem "rgeo-geojson"
 gem "rgeo-activerecord"
+gem 'pg', '~> 0.18.1'
+gem 'activerecord-postgis-adapter'
 
-# TODO: the following path variable requires to run bundler from application
-# Eventually there is a way to do this directory independent, so bundler can
-# be also run from the plugin directory.
-# Otherwise variable `database_file` is already determined on the Gemfile of
-# Redmine.`
-database_file = File.join(File.dirname(__FILE__), "../../config/database.yml")
-
-if File.exist?(database_file)
-  database_config = YAML::load(ERB.new(IO.read(database_file)).result)
-  adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
-  if adapters.any?
-    adapters.each do |adapter|
-      case adapter
-      when /postgresql/
-        gem 'activerecord-postgis-adapter'
-      else
-        warn("GTT doesn't support `#{adapter}` found in config/database.yml,
-              use Gemfile.local to load your own database gems")
-      end
-    end
-  else
-    warn("No adapter found in config/database.yml, please configure it first")
-  end
-else
-  warn("Please configure your config/database.yml first")
-end

README.rdoc

@@ -9,8 +9,6 @@ Creating a PostGIS-enabled database
 
 createdb -U postgres -O redmine redmine
 psql -U postgres -d redmine -c "CREATE EXTENSION postgis;"
-psql -U redmine -d redmine -c "CREATE SCHEMA app;"
-psql -U redmine -d redmine -c "CREATE SCHEMA dev;"
 
 = Installation
 

app/helpers/gtt_map_helper.rb

@@ -28,7 +28,20 @@ def map_tag(map: nil, layers: map&.layers,
     data[:edit]   = edit   if edit
     data[:popup]  = popup  if popup
 
-    content_tag(:div, "", data: data, id: "ol-#{rand(36**8).to_s(36)}", class: 'ol-map')
+    uid = "ol-" + rand(36**8).to_s(36)
+
+    safe_join [
+      content_tag(:div, "", data: data, id: uid, class: 'ol-map'),
+      javascript_tag("
+        $(document).ready(function(){
+          $('div.ol-map').each(function(idx) {
+            App.init({
+              target: this
+            });
+          });
+        });
+      ")
+    ]
   end
 
 end

app/models/gtt_map.rb

@@ -2,9 +2,9 @@ class GttMap
 
   attr_reader :layers, :json, :bounds
 
-  def initialize(wkb: nil, json: nil, layers:, bounds: nil)
+  def initialize(geom: nil, json: nil, layers:, bounds: nil)
     unless @json = json
-      @json = RedmineGtt::Conversions.wkb_to_json wkb if wkb
+      @json = RedmineGtt::Conversions.geom_to_json geom if geom
     end
 
     @bounds = bounds || @json

assets/javascripts/app.js

@@ -14,9 +14,9 @@ var App = (function ($, publ) {
     });
 
     // Hack to disable geometry changes in history
-    $("#history ul.details li:contains('ジオメトリ')").hide();
-    $("#history ul.details li:contains('Geometry')").hide();
-    $("#history ul.details li:contains('Geometrie')").hide();
+    // $("#history ul.details li:contains('ジオメトリ')").hide();
+    // $("#history ul.details li:contains('Geometry')").hide();
+    // $("#history ul.details li:contains('Geometrie')").hide();
 
     return;
   };
@@ -27,15 +27,3 @@ var App = (function ($, publ) {
   return publ;
 
 })(jQuery, App || {});
-
-/**
- * When DOM is ready, initialize map plugin
- */
-$(document).ready(function(){
-  // A page may contain more than one map
-  $("div.ol-map").each(function(idx) {
-    App.init({
-      target: this
-    });
-  });
-});

assets/javascripts/app.map.js

@@ -8,7 +8,7 @@ App.map = (function ($, publ) {
 
   var map, vector, bounds, contents, toolbar, geolocation = null;
   var features = [];
-  var layerArr = []
+  var layerArr = [];
 
   // Quick hack
   var quick_hack = {
@@ -23,6 +23,15 @@ App.map = (function ($, publ) {
    */
   publ.init = function (options) {
 
+    map = null;
+    vector = null;
+    bounds = null;
+    toolbar = null;
+    geolocation = null;
+
+    features = [];
+    layerArr = [];
+
     contents = $(options.target).data();
     defaults = $("#ol-defaults").data();
     defaults.geocoderUrl = "https://***REMOVED***/geojson";

db/migrate/20171004054800_ensure_proper_srid.rb

@@ -0,0 +1,7 @@
+class EnsureProperSrid < ActiveRecord::Migration
+  def up
+    execute "SELECT UpdateGeometrySRID('issues','geom',4326)"
+    execute "SELECT UpdateGeometrySRID('projects','geom',4326)"
+    execute "SELECT UpdateGeometrySRID('users','geom',4326)"
+  end
+end

init.rb

@@ -5,7 +5,7 @@
   author 'Georepublic'
   author_url 'https://hub.georepublic.net/gtt/redmine_gtt'
   description 'Adds location-based task management and maps'
-  version '0.6.0'
+  version '0.7.0'
 
   requires_redmine :version_or_higher => '3.4.0'
 

lib/redmine_gtt.rb

@@ -18,6 +18,15 @@
 # Register MIME Types
 Mime::Type.register_alias "application/json", :geojson
 
+RGeo::ActiveRecord::SpatialFactoryStore.instance.tap do |config|
+  # By default, use the GEOS implementation for spatial columns.
+  # config.default = RGeo::Geos.factory_generator
+
+  config.register RGeo::Cartesian.preferred_factory(srid: 4326), geo_type: 'geometry', sql_type: "geometry", srid: 4326
+
+  # But use a geographic implementation for point columns.
+  # config.register(RGeo::Geographic.spherical_factory(srid: 4326), geo_type: "point")
+end
 
 module RedmineGtt
 

lib/redmine_gtt/conversions.rb

@@ -9,38 +9,67 @@ module RedmineGtt
   # between.
   module Conversions
 
-    class WkbToJson
+    class GeomToJson
       def initialize()
         @factory = RGeo::GeoJSON::EntityFactory.instance
-        @parser = RGeo::WKRep::WKBParser.new(
-          support_ewkb: true,
-          default_srid: 4326
-        )
       end
 
-      def to_json(wkb, id: nil, properties: nil)
-        RGeo::GeoJSON.encode feature(wkb, id, properties)
+      def to_json(object, id: nil, properties: nil)
+        RGeo::GeoJSON.encode feature(object, id, properties)
       end
 
       def collection_to_json(data)
         RGeo::GeoJSON.encode @factory.feature_collection(
-          data.map{|wkb, id, props| feature wkb, id, props}
+          data.map{|object, id, props| feature object, id, props}
         )
       end
 
       private
 
-      def feature(wkb, id, properties = nil)
-        @factory.feature @parser.parse(wkb), id, (properties || {})
+      def feature(object, id, properties = nil)
+        @factory.feature object, id, (properties || {})
       end
+    end
 
+    class WkbToGeom
+      def initialize()
+        @parser = RGeo::WKRep::WKBParser.new(
+          support_ewkb: true,
+          default_srid: 4326
+        )
+      end
+
+      def self.call(wkb)
+        new.call wkb
+      end
+
+      def call(wkb)
+        @parser.parse(wkb)
+      end
     end
 
+
     # Turns database WKB into geometry attribute string
     def self.wkb_to_json(wkb, id: nil, properties: nil)
-      WkbToJson.new.to_json(wkb, id: id, properties: properties)
+      geom_to_json WkbToGeom.(wkb), id: id, properties: properties
     end
 
+    # turns Rgeo object into GeoJSON
+    def self.geom_to_json(object, id: nil, properties: nil)
+      GeomToJson.new.to_json(object, id: id, properties: properties)
+    end
+
+    # Turn geometry attribute string (GeoJSON) into Rgeo object for database
+    # use
+    def self.to_geom(geometry)
+      geojson = JSON.parse(geometry)
+      RGeo::GeoJSON.decode(
+        geojson,
+        json_parser: :json,
+        geo_factory: RGeo::Cartesian.preferred_factory(srid: 4326)
+      ).geometry
+  end
+
     # Turn geometry attribute string into WKB for database use
     def self.to_wkb(geometry)
       geojson = JSON.parse(geometry)