charta 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9634870840f818207264c46799dc53cf3e37bf3f3d119e85dc470405ebcb8d1
-  data.tar.gz: 6453c04a73201f197c869b37d18a6ff0c262c8545ced384a13ecee48568279e1
+  metadata.gz: 96bee13636a087302272ef4bc271ca0200e46aece932f932a2c9ff6b989254a8
+  data.tar.gz: 4d139f4c3d628b178862b6879edc2ba92e11f82e96f43d748def1ac063c89562
 SHA512:
-  metadata.gz: 658472714de5dbe3a618839ddf36858884b6d28ab520bab2c5140514d0a287931b52aa1278110dc3979a3ed40b2bc0c7cb7e11a9450bff9767ae32180ebe24f8
-  data.tar.gz: 675ea3982c1d1bb3465f68e272fb995dde17cc61f5af81837346a7431fc79d1fc82dc0661eb2528aab2903808d6e0941d20923fa62142db25eafa95eb32a00f6
+  metadata.gz: 04b4a7e56bc7a412114f4f2713725d1304bc4c859911a2079a847b88511d80c5f20057df7a19f79c6b022b107ff9b1328b064084f0ebdf1e5335622afbff7f27
+  data.tar.gz: 3f8cec56a64a686abcfd14264df20b593c396fb0296b779b48c2697a630ad9bed6d16de61a86c12995fec6f74e5a1cf4ac1f65655e244a840393ea5448fd00ed

data/charta.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rgeo', '~> 2.0'
   spec.add_dependency 'rgeo-geojson', '~> 2.0'
   spec.add_dependency 'rgeo-proj4', '~> 2.0'
+  spec.add_dependency 'victor', '~> 0.3.3'
   spec.add_dependency 'zeitwerk', '~> 2.4.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'

data/lib/charta/bounding_box.rb

@@ -18,7 +18,7 @@ module Charta
     end
 
     def svg_view_box
-      [x_min, -y_max, width, height]
+      [x_min, y_min, width, height]
     end
 
     def to_a

data/lib/charta/factory/simple_feature_factory.rb

@@ -30,7 +30,7 @@ module Charta
         if coordinates.is_a?(Charta::Geometry)
           coordinates
         elsif coordinates.is_a?(RGeo::Feature::Instance)
-          new_feature(Charta.generate_ewkt(coordinates))
+          Geometry.feature(coordinates)
         elsif coordinates.to_s =~ /\A[[:space:]]*\z/
           empty_feature(srs)
         else

data/lib/charta/geometry.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'rgeo/geo_json'
 require 'rgeo/svg' # integrated lib for now
 require 'active_support/core_ext/module/delegation'
+require 'victor' # for SVG
 
 module Charta
   # Represents a Geometry with SRID
@@ -63,16 +64,36 @@ module Charta
 
     alias to_ewkb to_binary
 
-    # Pas bien compris le fonctionnement
+    # Generate SVG from geometry
+    # @param [Hash] options , the options for SVG object.
+    # @option options [Hash] :mode could be :stroke or :fill
+    # @option options [Hash] :color could be "orange", "red", "blue" or HTML color "#14TF15"
+    # @option options [Hash] :fill_opacity could be '0' to '100'
+    # @option options [Hash] :stroke_linecap could be 'round', 'square', 'butt'
+    # @option options [Hash] :stroke_linejoin default 'round'
+    # @option options [Hash] :stroke_width default '5%'
+    # @note more informations on https://developer.mozilla.org/fr/docs/Web/SVG/Tutorial/Fills_and_Strokes
+    # @return [String] the SVG image
     def to_svg(options = {})
-      svg = '<svg xmlns="http://www.w3.org/2000/svg" version="1.1"'
-      { preserve_aspect_ratio: 'xMidYMid meet',
-        width: 180, height: 180,
-        view_box: bounding_box.svg_view_box.join(' ') }.merge(options).each do |attr, value|
-        svg << " #{Charta.camelcase(attr.to_s, :lower)}=\"#{value}\""
+      # set default options if not present
+      options[:mode] ||= :stroke
+      options[:color] ||= 'black'
+      options[:fill_opacity] ||= '100' # 0 to 100
+      options[:stroke_linecap] ||= 'butt' # round, square, butt
+      options[:stroke_linejoin] ||= 'round' #
+      options[:stroke_width] ||= '5%'
+
+      svg = Victor::SVG.new template: :html
+      svg.setup width: 180, height: 180, viewBox: bounding_box.svg_view_box.join(' ')
+      # return a stroke SVG with options
+      if options[:mode] == :stroke
+        svg.path d: to_svg_path, fill: 'none', stroke: options[:color], stroke_linecap: options[:stroke_linecap],
+stroke_linejoin: options[:stroke_linejoin], stroke_width: options[:stroke_width]
+      # return a fill SVG with options
+      elsif options[:mode] == :fill
+        svg.path d: to_svg_path, fill: options[:color], fill_opacity: options[:fill_opacity]
       end
-      svg << "><path d=\"#{to_svg_path}\"/></svg>"
-      svg
+      svg.render
     end
 
     # Return the geometry as Scalar Vector Graphics (SVG) path data.

data/lib/charta/version.rb

@@ -1,3 +1,3 @@
 module Charta
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charta
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Ekylibre developers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: victor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +178,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.1
-description:
+description: 
 email:
 - dev@ekylibre.com
 executables: []
@@ -206,7 +220,7 @@ homepage: https://gitlab.com/ekylibre
 licenses:
 - AGPL-3.0-only
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -221,8 +235,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.2.26
+signing_key: 
 specification_version: 4
 summary: Simple tool over geos and co
 test_files: []