natour 0.7.0 → 0.9.0

data/lib/natour/fit_file.rb

@@ -1,7 +1,7 @@
+require 'date'
+require 'duration'
 require 'fit4ruby'
 require 'nokogiri'
-require 'duration'
-require 'date'
 require 'time'
 
 module Natour

data/lib/natour/gps_track.rb

@@ -1,6 +1,6 @@
+require 'duration'
 require 'fileutils'
 require 'pathname'
-require 'duration'
 require 'time'
 
 module Natour

data/lib/natour/gpx_file.rb

@@ -1,5 +1,5 @@
-require 'nokogiri'
 require 'duration'
+require 'nokogiri'
 require 'timeliness'
 
 module Natour

data/lib/natour/image.rb

@@ -1,7 +1,7 @@
-require 'vips'
-require 'timeliness'
 require 'fileutils'
 require 'pathname'
+require 'timeliness'
+require 'vips'
 
 module Natour
   class Image

data/lib/natour/map_geo_admin.rb

@@ -1,31 +1,40 @@
-require 'fileutils'
-require 'pathname'
-require 'webrick'
 require 'concurrent'
 require 'ferrum'
+require 'fileutils'
+require 'pathname'
 require 'uri'
+require 'webrick'
+require 'webrick/https'
 
 module Natour
   class MapGeoAdmin
     def initialize(port: 0)
-      @doc_root = Dir.mktmpdir
+      @doc_root = Pathname(Dir.mktmpdir)
       FileUtils.cp_r("#{__dir__}/data/js", @doc_root)
       event = Concurrent::Event.new
-      @server = WEBrick::HTTPServer.new(
-        StartCallback: -> { event.set },
-        Logger: WEBrick::Log.new(File.open(File::NULL, 'w')),
-        AccessLog: [],
-        DocumentRoot: @doc_root,
-        BindAddress: 'localhost',
-        Port: port
-      )
+      @server = StdoutUtils.suppress_output do
+        WEBrick::HTTPServer.new(
+          StartCallback: -> { event.set },
+          Logger: WEBrick::Log.new(File.open(File::NULL, 'w')),
+          AccessLog: [],
+          DocumentRoot: @doc_root,
+          BindAddress: 'localhost',
+          Port: port,
+          SSLEnable: true,
+          SSLCertName: [%w[CN localhost]]
+        )
+      end
       @server.mount('/map', MapServlet)
       @thread = Thread.new { @server.start }
       event.wait
       @browser = Ferrum::Browser.new(
         slowmo: 2.0,
+        timout: 30,
         window_size: [5000, 5000],
-        browser_options: { 'no-sandbox': nil }
+        browser_options: {
+          'no-sandbox': nil,
+          'ignore-certificate-errors': nil
+        }
       )
     end
 
@@ -36,21 +45,28 @@ module Natour
       FileUtils.remove_entry(@doc_root)
     end
 
-    def save_image(filename, tracks: [], layers: [], size: [1200, 900])
-      FileUtils.cp(tracks, @doc_root)
-      FileUtils.mkdir_p(Pathname(filename).dirname)
-      uri = URI("http://#{@server[:BindAddress]}:#{@server[:Port]}/map")
+    def save_image(filename, overwrite: false, gps_files: [], gps_colors: [], map_layers: [], image_size: [1200, 900])
+      FileUtils.cp(gps_files, @doc_root)
+      uri = URI("https://#{@server[:BindAddress]}:#{@server[:Port]}/map")
       uri.query = URI.encode_www_form(
-        tracks: tracks.map { |track| Pathname(track).basename }.join(','),
-        layers: layers.join(','),
-        size: size.map { |dim| dim.is_a?(String) ? dim : "#{dim}px" }.join(',')
+        'gps-files': gps_files.map { |gps_file| Pathname(gps_file).basename }.join(','),
+        'gps-colors': gps_colors.join(','),
+        'map-layers': map_layers.join(','),
+        'map-size': image_size.map { |dim| dim.is_a?(String) ? dim : "#{dim}px" }.join(',')
       )
       @browser.goto(uri)
+      tmp_filename = @doc_root.join(Pathname(filename).basename)
       @browser.screenshot(
-        path: filename,
+        path: tmp_filename,
         quality: 100,
         selector: '.map'
       )
+      FileUtils.mkdir_p(Pathname(filename).dirname)
+      mode = File::WRONLY | File::CREAT | File::TRUNC | File::BINARY
+      mode |= File::EXCL unless overwrite
+      File.open(filename, mode) do |file|
+        file.write(File.read(tmp_filename, mode: 'rb'))
+      end
     end
 
     def self.open(*args)
@@ -66,11 +82,13 @@ module Natour
       def do_GET(request, response) # rubocop:disable Naming/MethodName
         raise WEBrick::HTTPStatus::NotFound unless request.path == '/map'
 
-        tracks = request.query.fetch('tracks', '').split(',')
-        layers = request.query.fetch('layers', '').split(',')
-        layers.unshift('ch.swisstopo.pixelkarte-farbe')
+        files = request.query.fetch('gps-files', '').split(',')
+        colors = request.query.fetch('gps-colors', '').split(',')
+        (files.size - colors.size).times { colors << (colors.last || 'blueviolet') }
+        layers = ['ch.swisstopo.pixelkarte-farbe']
+        layers |= request.query.fetch('map-layers', '').split(',')
 
-        width, height = request.query.fetch('size', '').split(',')
+        width, height = request.query.fetch('map-size', '').split(',')
         raise WEBrick::HTTPStatus::BadRequest unless width && height
 
         doc = []
@@ -81,36 +99,77 @@ module Natour
         doc << '<script src="js/loader.js"></script>'
         doc << '<script type="text/javascript">'
         doc << '  $(function() {'
-        doc << '    var map = new ga.Map({'
+        doc << '    let map = new ga.Map({'
         doc << '      controls: [],'
         doc << '      target: "map",'
         doc << '      view: new ol.View()'
         doc << '    })'
-        doc << "    var layers = [#{layers.map { |layer| "\"#{layer}\"" }.join(', ')}]"
+        doc << "    let layers = [#{layers.map { |layer| "\"#{layer}\"" }.join(', ')}]"
         doc << '    layers.forEach(function(layer) {'
         doc << '      map.addLayer(ga.layer.create(layer))'
         doc << '    })'
-        doc << "    var tracks = [#{tracks.map { |track| "\"#{track}\"" }.join(', ')}]"
-        doc << '    tracks = tracks.map(function(track) {'
-        doc << '      return new ol.layer.Vector({'
-        doc << '        source: new ol.source.Vector({'
-        doc << '          format: new ol.format.GPX(),'
-        doc << '          url: track'
+        doc << '    let getStyles = function(color) {'
+        doc << '      return {'
+        doc << '        "Point": new ol.style.Style({'
+        doc << '          image: new ol.style.Circle({'
+        doc << '            fill: new ol.style.Fill({'
+        doc << '              color: function() {'
+        doc << '                let [r, g, b, a] = ol.color.asArray(color)'
+        doc << '                a = 0.3'
+        doc << '                return ol.color.asString([r, g, b, a])'
+        doc << '              }()'
+        doc << '            }),'
+        doc << '            radius: 6,'
+        doc << '            stroke: new ol.style.Stroke({'
+        doc << '              color: color,'
+        doc << '              width: 1.5'
+        doc << '            })'
+        doc << '          })'
+        doc << '        }),'
+        doc << '        "LineString": new ol.style.Style({'
+        doc << '          stroke: new ol.style.Stroke({'
+        doc << '            color: color,'
+        doc << '            width: 3'
+        doc << '          })'
         doc << '        }),'
-        doc << '        style: new ol.style.Style({'
+        doc << '        "MultiLineString": new ol.style.Style({'
         doc << '          stroke: new ol.style.Stroke({'
-        doc << '            color: "blueviolet",'
+        doc << '            color: color,'
         doc << '            width: 3'
         doc << '          })'
         doc << '        })'
+        doc << '      }'
+        doc << '    }'
+        doc << "    let sources = [#{files.zip(colors)
+                                          .map { |file, color| "{ file: \"#{file}\", color: \"#{color}\" }" }
+                                          .join(', ')}]"
+        doc << '    let vectors = sources.map(function(source) {'
+        doc << '      return new ol.layer.Vector({'
+        doc << '        source: new ol.source.Vector({'
+        doc << '          format: function() {'
+        doc << '            if (source.file.endsWith(".gpx")) {'
+        doc << '              return new ol.format.GPX()'
+        doc << '            } else if (source.file.endsWith(".kml")) {'
+        doc << '              return new ol.format.KML({'
+        doc << '                extractStyles: false'
+        doc << '              })'
+        doc << '            } else {'
+        doc << '              return null'
+        doc << '            }'
+        doc << '          }(),'
+        doc << '          url: source.file'
+        doc << '        }),'
+        doc << '        style: function(feature) {'
+        doc << '          return getStyles(source.color)[feature.getGeometry().getType()]'
+        doc << '        }'
         doc << '      })'
         doc << '    })'
-        doc << '    tracks.forEach(function(track) {'
-        doc << '      map.addLayer(track)'
-        doc << '      track.getSource().on("change", function(evt) {'
-        doc << '        var extent = ol.extent.createEmpty()'
-        doc << '        tracks.forEach(function(track) {'
-        doc << '          ol.extent.extend(extent, track.getSource().getExtent())'
+        doc << '    vectors.forEach(function(vector) {'
+        doc << '      map.addLayer(vector)'
+        doc << '      vector.getSource().on("change", function(evt) {'
+        doc << '        let extent = ol.extent.createEmpty()'
+        doc << '        vectors.forEach(function(vector) {'
+        doc << '          ol.extent.extend(extent, vector.getSource().getExtent())'
         doc << '        })'
         doc << '        map.getView().fit(extent, map.getSize())'
         doc << '      })'

data/lib/natour/public_transport.rb

@@ -1,7 +1,7 @@
-require 'uri'
+require 'json'
 require 'net/http'
 require 'openssl'
-require 'json'
+require 'uri'
 
 module Natour
   class PublicTransport

data/lib/natour/report.rb

@@ -29,7 +29,7 @@ module Natour
       @arrival_point = arrival_point
     end
 
-    def self.load_directory(dir, track_formats: %i[gpx fit], create_map: true, map_layers: [])
+    def self.load_directory(dir, track_formats: %i[gpx fit], create_map: true, overwrite_map: false, map_layers: [])
       Dir.chdir(dir) do
         path = Pathname(dir)
         title = Pathname.pwd.basename.to_s.encode('utf-8')
@@ -61,7 +61,7 @@ module Natour
                 track = Pathname(tmp_dir).join(gps_track.path).sub_ext('.gpx')
                 gps_track.save_gpx(track, overwrite: true)
                 filename = Pathname(gps_track.path).sub_ext('.jpg')
-                map.save_image(filename, tracks: [track], layers: map_layers)
+                map.save_image(filename, overwrite: overwrite_map, gps_files: [track], map_layers: map_layers)
                 Image.load_file(filename.to_s)
               end
             end

data/lib/natour/utils/boolean_utils.rb

@@ -0,0 +1,11 @@
+module Natour
+  module BooleanUtils
+    module_function
+
+    def to_boolean(value, default_value: false)
+      return !!value unless value.nil?
+
+      !!default_value
+    end
+  end
+end

data/lib/natour/utils/errno_utils.rb

@@ -0,0 +1,9 @@
+module Natour
+  module ErrnoUtils
+    module_function
+
+    def split_message(error)
+      error.message.split(/ @ | - /, 3)
+    end
+  end
+end

data/lib/natour/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Natour
+  VERSION = '0.9.0'
+end

data/lib/natour.rb

@@ -1,18 +1,21 @@
-require 'natour/utils/botanical_name_utils'
-require 'natour/utils/date_utils'
-require 'natour/utils/stdout_utils'
-require 'natour/convert'
-require 'natour/create'
-require 'natour/asciinurse'
-require 'natour/config'
-require 'natour/gps_track'
-require 'natour/gps_track_point'
-require 'natour/gpx_file'
-require 'natour/fit_file'
-require 'natour/image'
-require 'natour/map_geo_admin'
-require 'natour/public_transport'
-require 'natour/report'
-require 'natour/species'
-require 'natour/species_list'
-require 'natour/station'
+require_relative 'natour/utils/boolean_utils'
+require_relative 'natour/utils/botanical_name_utils'
+require_relative 'natour/utils/date_utils'
+require_relative 'natour/utils/errno_utils'
+require_relative 'natour/utils/stdout_utils'
+require_relative 'natour/asciinurse'
+require_relative 'natour/config'
+require_relative 'natour/convert_report'
+require_relative 'natour/create_reports'
+require_relative 'natour/gps_track'
+require_relative 'natour/gps_track_point'
+require_relative 'natour/gpx_file'
+require_relative 'natour/fit_file'
+require_relative 'natour/image'
+require_relative 'natour/map_geo_admin'
+require_relative 'natour/public_transport'
+require_relative 'natour/report'
+require_relative 'natour/species'
+require_relative 'natour/species_list'
+require_relative 'natour/station'
+require_relative 'natour/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natour
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Simon Gysi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: ferrum
   requirement: !ruby/object:Gem::Requirement
@@ -192,8 +220,8 @@ files:
 - lib/natour.rb
 - lib/natour/asciinurse.rb
 - lib/natour/config.rb
-- lib/natour/convert.rb
-- lib/natour/create.rb
+- lib/natour/convert_report.rb
+- lib/natour/create_reports.rb
 - lib/natour/data/fonts/dejavuserifcondensed-bold.ttf
 - lib/natour/data/fonts/dejavuserifcondensed-bold_italic.ttf
 - lib/natour/data/fonts/dejavuserifcondensed-italic.ttf
@@ -213,9 +241,12 @@ files:
 - lib/natour/species.rb
 - lib/natour/species_list.rb
 - lib/natour/station.rb
+- lib/natour/utils/boolean_utils.rb
 - lib/natour/utils/botanical_name_utils.rb
 - lib/natour/utils/date_utils.rb
+- lib/natour/utils/errno_utils.rb
 - lib/natour/utils/stdout_utils.rb
+- lib/natour/version.rb
 homepage: https://github.com/simongysi/natour
 licenses:
 - MIT
@@ -238,8 +269,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: natour provides an application and a library for reports on nature activities
+summary: natour provides an application and a library to document nature activities.
 test_files: []