aipp 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d5b1987ad76642974e3525037cd251b9d191e6ddf3bb355452c06fc31c47734
-  data.tar.gz: b282045f0717e48248e8c876bc0b117fee79c394f751bf3c20cf4c1e96597a3a
+  metadata.gz: d141c73e057eda545578568c2817d648c998e56154f1d68ecd40c59589a04738
+  data.tar.gz: 70986dde2f1a7120f49061a65ee1b07c980469ff5f9ea6da4527f0160f613ed8
 SHA512:
-  metadata.gz: 80481622154b8a77f614758d41bddc1190d38bed8530f55dc08a6736e9852dac5cbf0bd6d767025dfdf1d73b8e727bb567c193a390546b4f8080d5686ce5163a
-  data.tar.gz: dc7991927db97747f7e643ec7484420c741e8d64e33e57187e8c63a361ab45b0ea21666b7ff6e72c464283eee6670bea7f49e9e9ccbe1aeece75aedfdcad4396
+  metadata.gz: 1e97fc5731a4356836ce60703cddd076d33d99d94cfaa667a8f1cf203f28003710d3c27263efd8e638e902f6ee9a076c46fb36881575425bf994202842b2a3d3
+  data.tar.gz: '08648422f96c2dd925873ec4153b3420754323704df5ec037042bed1f5a4611929d01ae2ee6ab02b718e6e28f9ea57ef76481eaf7ab4abe0a6dd0d89a547fa90'

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-"N�F��������"LT����6��bЪ_��9�d�����8q����.�@�K���w���4Q�Y���x����-je$O}r��h_՞ˁ�  �Mֈ�pU����.
-�b/!�H�CBJ�Y�Ȩ�~�Lt�*�	�Lx��qA�V��t�
+1�ǵm��Gy
+Z��ѳ�y@�'�i��:��x���琇�������%�\

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 Nothing so far
 
+## 2.1.0
+
+#### Breaking Changes
+* Unify all executables into `aip2aixm` and `aip2aixm` respectively
+
+#### Additions
+* Support for shooting grounds in LS
+
 ## 2.0.3
 
 #### Breaking Changes

data/README.md

@@ -55,22 +55,29 @@ bundle install --trust-policy MediumSecurity
 
 ## Usage
 
-AIPP parses different kind of information sources. The parsers are organized in three levels:
+AIPP parses different kind of information sources and converts them to different output formats depending on which executable you use:
+
+Executable | Output Format
+-----------|--------------
+`aip2aixm` | AIXM
+`aip2ofmx` | OFMX
+
+The parsers are organized in three levels:
 
 ```
 region            ⬅︎ aeronautical region such as "LF" (France)
-└── module        ⬅︎ subject area such as "AIP" or "NOTAM"
-    └── section   ⬅︎ part of the subject area such as "ENR-2.1" or "aerodromes"
+└── scope         ⬅︎ scope such as "AIP" or "NOTAM"
+    └── section   ⬅︎ section of the scope such as "ENR-2.1" or "aerodromes"
 ```
 
-The following modules are currently available:
+The following scopes are currently available:
 
-Module | Content | Executables | Cache
--------|---------|-------------|------
-[AIP](lib/aipp/aip/README.md) | aeronautical information publication | `aip2aixm` and `aip2ofmx` | by AIRAC cycle
-[NOTAM](lib/aipp/notam/README.md) | notice to airmen | `notam2aixm` and `notam2ofmx` | by effective date and hour
+Scope | Content | Cache
+------|---------|------
+[AIP](lib/aipp/aip/README.md) (default) | aeronautical information publication | by AIRAC cycle
+[NOTAM](lib/aipp/notam/README.md) | notice to airmen | by effective date and hour
 
-To list all available regions and sections for a given module:
+To list all available scopes, regions and sections:
 
 ```
 aip2aixm --list
@@ -92,15 +99,15 @@ You'll find the OFMX file in the current directory if the binary exits successfu
 
 ## Regions
 
-To implement a region, you have to create a directory <samp>lib/aipp/regions/{REGION}/</samp> off the gem root and then subdirectories for each module as well as for support files. Here's a simplified overview for the region "LF" (France):
+To implement a region, you have to create a directory <samp>lib/aipp/regions/{REGION}/</samp> off the gem root and then subdirectories for each scope as well as for support files. Here's a simplified overview for the region "LF" (France):
 
 ```
 LF/                         ⬅︎ region "LF"
 ├── README.md
-├── aip                     ⬅︎ module "AIP"
+├── aip                     ⬅︎ scope "AIP"
 │   ├── AD-2.rb             ⬅︎ section "AD-2"
 │   └── ENR-4.3.rb          ⬅︎ section "ENR-4.3"
-├── notam                   ⬅︎ module "NOTAM"
+├── notam                   ⬅︎ scope "NOTAM"
 │   ├── AD.rb               ⬅︎ section "AD"
 │   └── ENR.rb              ⬅︎ section "ENR"
 ├── borders
@@ -315,7 +322,7 @@ module MyAPI
 end
 ```
 
-For performance, all downloads are cached and subsequent runs will use the cached data rather than fetching the sources anew. Each module defines a cache time window, see the [table of modules above](#label-Usage). You can discard existing and rebuild caches by use of the `--clean` command line argument.
+For performance, all downloads are cached and subsequent runs will use the cached data rather than fetching the sources anew. Each scope defines a cache time window, see the [table of scopes above](#label-Usage). You can discard existing and rebuild caches by use of the `--clean` command line argument.
 
 #### Optional `setup` Method
 
@@ -499,7 +506,7 @@ debugger
 
 AIPP uses a storage directory for configuration, caching and in order to keep the results of previous runs. The default location is `~/.aipp`, however, you can pass a different directory with the `--storage` argument.
 
-You'll find a directory for each region and module which contains the following items:
+You'll find a directory for each region and scope which contains the following items:
 
 * `sources/`<br>ZIP archives which cache all source files used to build.
 * `builds/`<br>ZIP archives of successful builds containing:

data/exe/aip2aixm

@@ -2,4 +2,4 @@
 
 require 'aipp'
 
-AIPP::AIP::Executable.new(File.basename($0)).run
+AIPP::Executable.new(File.basename($0)).run

data/exe/aip2ofmx

@@ -2,4 +2,4 @@
 
 require 'aipp'
 
-AIPP::AIP::Executable.new(File.basename($0)).run
+AIPP::Executable.new(File.basename($0)).run

data/lib/aipp/debugger.rb

@@ -78,7 +78,11 @@ module AIPP
     rescue => error
       message = error.respond_to?(:original_message) ? error.original_message : error.message
       puts "ERROR: #{message}".magenta
-      raise if AIPP.options.verbose
+      if AIPP.options.verbose
+        raise
+      else
+        exit 1
+      end
     end
 
     def call_without_rescue(&block)

data/lib/aipp/downloader/file.rb

@@ -3,6 +3,8 @@ module AIPP
 
     # Local file
     class File
+      attr_reader :file
+
       def initialize(archive: nil, file:, type: nil)
         @archive = Pathname(archive) if archive
         @file, @type = Pathname(file), type&.to_s
@@ -12,10 +14,10 @@ module AIPP
         path.join(fetched_file).tap do |target|
           if @archive
             fail NotFoundError unless @archive.exist?
-            extract(@file, from: @archive, as: target)
+            extract(file, from: @archive, as: target)
           else
-            fail NotFoundError unless @file.exist?
-            FileUtils.cp(@file, target)
+            fail NotFoundError unless file.exist?
+            FileUtils.cp(file, target)
           end
         end
         self
@@ -28,11 +30,11 @@ module AIPP
       private
 
       def name
-        @file.basename(@file.extname).to_s
+        file.basename(file.extname).to_s
       end
 
       def type
-        @type || @file.extname[1..] || fail("type must be declared")
+        @type || file.extname[1..] || fail("type must be declared")
       end
 
       def extract(file, from:, as:)

data/lib/aipp/downloader/http.rb

@@ -16,14 +16,14 @@ module AIPP
       # @param path [Pathname] directory where to write the fetched file
       # @return [File] fetched file
       def fetch_to(path)
-        response = Excon.get((@archive || @file).to_s, headers: @headers)
+        response = Excon.get((@archive || file).to_s, headers: @headers)
         fail NotFoundError if response.status == 404
         mime_type = ARCHIVE_MIME_TYPES.fetch(response.headers['Content-Type'], :dat)
         downloaded_file = path.join([@digest, mime_type].join('.'))
         ::File.write(downloaded_file, response.body)
         path.join(fetched_file).tap do |target|
           if @archive
-            extract(@file, from: downloaded_file, as: target)
+            extract(file, from: downloaded_file, as: target)
             ::File.delete(downloaded_file)
           else
             ::File.rename(downloaded_file, target)
@@ -35,12 +35,12 @@ module AIPP
       private
 
       def name
-        path = Pathname(@file.path)
+        path = Pathname(file.path)
         path.basename(path.extname).to_s.blank_to_nil || @digest
       end
 
       def type
-        @type || Pathname(@file.path).extname[1..].blank_to_nil || fail("type must be declared")
+        @type || Pathname(file.path).extname[1..].blank_to_nil || fail("type must be declared")
       end
     end
 

data/lib/aipp/downloader.rb

@@ -165,13 +165,20 @@ module AIPP
       case file.extname
         when '.xml', '.ofmx' then Nokogiri.XML(::File.open(file), &:noblanks)
         when '.html' then Nokogiri.HTML5(::File.open(file))
-        when '.json' then JSON.load_file(file)
+        when '.json' then JSON.load_file(file, symbolize_names: true)
         when '.pdf' then AIPP::PDF.new(file)
-        when '.xlsx', '.ods', '.csv' then Roo::Spreadsheet.open(file.to_s)
+        when '.xlsx', '.ods' then Roo::Spreadsheet.open(file.to_s)
+        when '.csv' then Roo::Spreadsheet.open(file.to_s, csv_options: { col_sep: separator(file) })
         when '.txt' then ::File.read(file)
         else fail(ArgumentError, "unrecognized file type")
       end
     end
 
+    # @return [String] most likely separator character of CSV and similar files
+    def separator(file)
+      content = file.read
+      %W(, ; \t).map { [content.scan(_1).count, _1] }.sort.last.last
+    end
+
   end
 end

data/lib/aipp/executable.rb

@@ -5,7 +5,9 @@ module AIPP
     include AIPP::Debugger
 
     def initialize(exe_file)
+      require_scope
       AIPP.options.replace(
+        scope: scope,
         schema: exe_file.split('2').last.to_sym,
         storage: Pathname(Dir.home).join('.aipp'),
         clean: false,
@@ -16,13 +18,36 @@ module AIPP
         debug_on_warning: false,
         debug_on_error: false
       )
+      options
+      OptionParser.new do |o|
+        o.on('-r', '--region STRING', String, 'region (e.g. "LF")') { AIPP.options.region = _1.upcase }
+        o.on('-s', '--section STRING', String, 'process this section only') { AIPP.options.section = _1.classify }
+        o.on('-d', '--storage DIR', String, 'storage directory (default: "~/.aipp")') { AIPP.options.storage = Pathname(_1) }
+        o.on('-o', '--output FILE', String, 'output file') { AIPP.options.output_file = _1 }
+        option_parser(o)
+        if AIPP.options.schema == :ofmx
+          o.on('-m', '--[no-]mid', 'insert mid attributes into all Uid elements (default: false)') { AIPP.options.mid = _1 }
+        end
+        o.on('-h', '--[no-]check-links', 'check all links with HEAD requests') { AIPP.options.check_links = _1 }
+        o.on('-c', '--[no-]clean', 'clean cache and download from sources anew (default: false)') { AIPP.options.clean = _1 }
+        o.on('-f', '--[no-]force', 'continue on non-fatal errors (default: false)') { AIPP.options.force = _1 }
+        o.on('-q', '--[no-]quiet', 'suppress all informational output (default: false)') { AIPP.options.quiet = _1 }
+        o.on('-v', '--[no-]verbose', 'verbose output including unsevere warnings (default: false)') { AIPP.options.verbose = _1 }
+        o.on('-w', '--debug-on-warning [ID]', Integer, 'open debug session on warning with ID (default: false)') { AIPP.options.debug_on_warning = _1 || true }
+        o.on('-e', '--[no-]debug-on-error', 'open debug session on error (default: false)') { AIPP.options.debug_on_error = _1 }
+        o.on('-A', '--about', 'show author/license information and exit') { about }
+        o.on('-R', '--readme', 'show README and exit') { readme }
+        o.on('-L', '--list', 'list implemented regions') { list }
+        o.on('-V', '--version', 'show version and exit') { version }
+      end.parse!
+      guard if respond_to? :guard
     end
 
     def run
       with_debugger do
         String.disable_colorization = !STDOUT.tty?
         starting = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        [:AIPP, AIPP.options.module, :Runner].constantize.new.run
+        [:AIPP, AIPP.options.scope, :Runner].constantize.new.run
         ending = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         info("finished after %s" % Time.at(ending - starting).utc.strftime("%H:%M:%S"))
       end
@@ -30,30 +55,6 @@ module AIPP
 
     private
 
-    def common_options(o)
-      o.on('-r', '--region STRING', String, 'region (e.g. "LF")') { AIPP.options.region = _1.upcase }
-      o.on('-s', '--section STRING', String, 'process this section only') { AIPP.options.section = _1.classify }
-      o.on('-d', '--storage DIR', String, 'storage directory (default: "~/.aipp")') { AIPP.options.storage = Pathname(_1) }
-      o.on('-o', '--output FILE', String, 'output file') { AIPP.options.output_file = _1 }
-    end
-
-    def developer_options(o)
-      if AIPP.options.schema == :ofmx
-        o.on('-m', '--[no-]mid', 'insert mid attributes into all Uid elements (default: false)') { AIPP.options.mid = _1 }
-      end
-      o.on('-h', '--[no-]check-links', 'check all links with HEAD requests') { AIPP.options.check_links = _1 }
-      o.on('-c', '--[no-]clean', 'clean cache and download from sources anew (default: false)') { AIPP.options.clean = _1 }
-      o.on('-f', '--[no-]force', 'continue on non-fatal errors (default: false)') { AIPP.options.force = _1 }
-      o.on('-q', '--[no-]quiet', 'suppress all informational output (default: false)') { AIPP.options.quiet = _1 }
-      o.on('-v', '--[no-]verbose', 'verbose output including unsevere warnings (default: false)') { AIPP.options.verbose = _1 }
-      o.on('-w', '--debug-on-warning [ID]', Integer, 'open debug session on warning with ID (default: false)') { AIPP.options.debug_on_warning = _1 || true }
-      o.on('-e', '--[no-]debug-on-error', 'open debug session on error (default: false)') { AIPP.options.debug_on_error = _1 }
-      o.on('-A', '--about', 'show author/license information and exit') { about }
-      o.on('-R', '--readme', 'show README and exit') { readme }
-      o.on('-L', '--list', 'list implemented regions') { list }
-      o.on('-V', '--version', 'show version and exit') { version }
-    end
-
     def about
       puts 'Written by Sven Schwyn (bitcetera.com) and distributed under MIT license.'
       exit
@@ -65,13 +66,18 @@ module AIPP
     end
 
     def list
-      hash = Pathname(__dir__).join('regions').glob('*').each.with_object({}) do |dir, hash|
-        region = "Sections for region #{dir.basename}"
-        hash[region] = dir.join(AIPP.options.module.downcase).glob('*.rb').map do |file|
-          File.basename(file, '.rb')
-        end.compact
+      puts "Available scopes -> regions -> sections:"
+      lib_dir.join('scopes').each_child do |scope_dir|
+        next unless scope_dir.directory?
+        puts "\n#{scope_dir.basename} ->".upcase
+        lib_dir.join('regions').each_child do |region_dir|
+          next unless region_dir.directory? && region_dir.join(scope_dir.basename).exist?
+          puts "  #{region_dir.basename} ->"
+          region_dir.join(scope_dir.basename).glob('*.rb') do |section_file|
+            puts "    #{section_file.basename('.rb')}"
+          end
+        end
       end
-      puts hash.to_yaml.lines[1..]
       exit
     end
 
@@ -80,5 +86,20 @@ module AIPP
       exit
     end
 
+    def lib_dir
+      Pathname(__FILE__).dirname
+    end
+
+    def scope
+      @scope ||= ARGV.first.match?(/^-/) ? 'AIP' : ARGV.shift.upcase
+    end
+
+    def require_scope
+      lib_dir.join('scopes', scope.downcase).glob('*.rb').each { require _1 }
+      extend [:AIPP, scope, :Executable].constantize
+    rescue NameError
+      puts "ERROR: unknown scope `#{scope}'".magenta
+      exit 1
+    end
   end
 end

data/lib/aipp/regions/LF/aip/services.rb

@@ -68,10 +68,12 @@ module AIPP::LF::AIP
           end
         end
       end
-      # Assign fallback address (default A/A frequency) to all yet radioless airports
+      # Assign A/A address to all yet radioless airports
       find_by(:airport).each do |airport|
         unless airport.services.find_by(:service, type: :aerodrome_control_tower_service).any? || airport.addresses.any?
-          airport.add_address(fallback_address_for(airport.name))
+          airport.add_address(
+            address_from_vac_for(airport) || fallback_address_for(airport)
+          )
         end
       end
     end
@@ -98,14 +100,32 @@ module AIPP::LF::AIP
       end.compact
     end
 
-    def fallback_address_for(callsign)
+    # TODO: A/A adresses are read unreliably from VAC due to data inconsistencies
+    #   in XML. Once fixed, integrate this into `addresses_from` as per:
+    #   https://gitlab.com/openflightmaps/region-issues/-/issues/68
+    def address_from_vac_for(airport)
+      if aa = read("VAC-#{airport.id}").text.first_match(%r(A/A\s+\(?(\d{3}\.\d{1,3})))
+        AIXM.address(
+          type: :radio_frequency,
+          address: AIXM.f(aa.to_f, :mhz)
+        ).tap do |address|
+          address.remarks = {
+            'type' => 'A/A',
+            'indicatif/callsign' => airport.name
+          }.to_remarks
+        end
+      end
+    rescue AIPP::Downloader::NotFoundError
+    end
+
+    def fallback_address_for(airport)
       AIXM.address(
         type: :radio_frequency,
         address: AIXM.f(123.5, :mhz)
       ).tap do |address|
         address.remarks = {
           'type' => 'A/A',
-          'indicatif/callsign' => callsign
+          'indicatif/callsign' => airport.name
         }.to_remarks
       end
     end

data/lib/aipp/regions/LF/helpers/base.rb

@@ -28,12 +28,10 @@ module AIPP
           case document
           when /^Obstacles$/   # obstacles spreadsheet
             AIPP::Downloader::HTTP.new(file: "#{sia_url}/FRANCE/ObstaclesDataZone1MFRANCE_#{xml_date.remove('-')}.xlsx")
-#         when /^VAC\-(\w+)/   # aerodrome VAC PDF
-#           AIPP::Downloader::HTTP.new(file: "#{sia_url}/Atlas-VAC/PDF_AIPparSSection/VAC/AD/AD-2.#{$1}.pdf")
-#         when /^VACH\-(\w+)/   # helipad VAC PDF
-#           AIPP::Downloader::HTTP.new(file: "#{sia_url}/Atlas-VAC/PDF_AIPparSSection/VACH/AD/AD-3.#{$1}.pdf")
-#         when /^[A-Z]+-/   # eAIP HTML page (e.g. ENR-5.5)
-#           AIPP::Downloader::HTTP.new(file: "#{sia_url}/FRANCE/AIRAC-#{xml_date}/html/eAIP/FR-#{document}-fr-FR.html")
+          when /^VAC\-(\w+)/   # aerodrome VAC PDF
+            AIPP::Downloader::HTTP.new(file: "#{sia_url}/Atlas-VAC/PDF_AIPparSSection/VAC/AD/AD-2.#{$1}.pdf")
+          when /^VACH\-(\w+)/   # helipad VAC PDF
+            AIPP::Downloader::HTTP.new(file: "#{sia_url}/Atlas-VAC/PDF_AIPparSSection/VACH/AD/AD-3.#{$1}.pdf")
           else   # SIA XML database dump
             AIPP::Downloader::File.new(file: "XML_SIA_#{xml_date}.xml")
           end

data/lib/aipp/regions/LS/README.md

@@ -1,8 +1,8 @@
 # LS – Switzerland
 
-## Neway API
+## NOTAM API
 
-The NOTAM messages are fetched from the Neway API which is a non-public
+The NOTAM messages are fetched from the Neway API which is a **non-public**
 GraphQL API.
 
 You have to set the following environment variables:
@@ -36,6 +36,62 @@ The following query object shows all parameters and columns:
 }
 ```
 
+## SHOOT API
+
+Geometries and most shooting details are available on the [geoinformation portal](https://geo.admin.ch) managed by GKG/swisstopo. However, all details as well as a list of active shooting ranges is only available in the original `schiessanzeigen.csv` file compiled by the Swiss army and distributed on the portal as well:
+
+* [geo.admin.ch JSON API](https://api.geo.admin.ch/services/sdiservices.html) [(example)](https://api3.geo.admin.ch/rest/services/api/MapServer/ch.vbs.schiessanzeigen/1201.050?sr=4326&geometryFormat=geojson)
+* [schiessanzeigen.csv](https://data.geo.admin.ch/ch.vbs.schiessanzeigen/schiessanzeigen/schiessanzeigen.csv)
+
+As of Feburary 2023, the structure of the CSV is as follows:
+
+### Shooting Ground Description Records
+
+Row | Col | Attribute  | Content   | Mand | Remarks
+----|-----|------------|-----------|------|--------
+SPL | 0   | Row        | text(3)   | yes  | **"SPL" (aka: Schiessplatz Stammdaten)**
+SPL | 1   | Belplan ID | text(8)   | yes  | **ID of the shooting ground from Belplan as "nnnn.nnn" (equal to module# and object#) e.g. "3104.010"**
+SPL | 2   | arimmo ID  | text(10)  | yes  | ID of the shooting ground from arimmo e.g. "04.203"
+SPL | 3   | Name       | text(50)  | yes  | **Name of the shooting ground, e.g. "DAMMASTOCK / SUSTENHORN"**
+SPL | 4   | URL DE     | text(100) | yes  | Info URL in DE from CMS-VBS
+SPL | 5   | URL FR     | text(100) | yes  | Info URL in FR from CMS-VBS
+SPL | 6   | URL IT     | text(100) | yes  | Info URL in IT from CMS-VBS
+SPL | 7   | URL EN     | text(100) | yes  | **Info URL in EN from CMS-VBS**
+SPL | 8   | Info name  | text(100) | yes  | Name of the info point e.g. "Koordinationsstelle Terreg 3, Altdorf"
+SPL | 9   | Info phone | text(20)  | yes  | **Phone of the info point**
+SPL | 10  | Info email | text(100) | no   | **Email of the info point**
+
+### Shooting Ground Activity Records
+
+Row | Col | Attribute      | Content        | Mand | Remarks
+----|-----|----------------|----------------|------|--------
+BSZ | 0   | Row            | text(3)        | yes  | **"BSZ" (aka: Belegungszeiten eines SPL)**
+BSZ | 1   | Belplan ID     | text(8)        | yes  | **ID of the shooting ground from Belplan as "nnnn.nnn" (equal to module# and object#) e.g. "3104.010"**
+BSZ | 2   | Act date       | date(yyyymmdd) | yes  | **Datum of activity**
+BSZ | 3   | Act time from  | time(hhmm)     | no   | **Time when activity begins**
+BSZ | 4   | Act time until | time(hhmm)     | no   | **Time when activity ends**
+BSZ | 5   | Locations      | text(50)       | no   | Locations of shooting activity [R2,  (max 50 char)]
+BSZ | 6   | Remarks        | text(100)      | no   | Remarks [R2]
+BSZ | 7   | URL DE         | text(200)      | no   | Announcement URL DE [R2]
+BSZ | 8   | URL FR         | text(200)      | no   | Announcement URL FR [R2]
+BSZ | 9   | URL IT         | text(200)      | no   | Announcement URL IT [R2]
+BSZ | 10  | URL EN         | text(200)      | no   | **Announcement URL EN [R2]**
+BSZ | 11  | Unit           | text(120)      | no   | Military unit involved [R2]
+BSZ | 12  | Weapons        | text(50)       | no   | Weapons and ammunition involved [R2]
+BSZ | 13  | Positions      | text(50)       | no   | Shooting positions [R2]
+BSZ | 14  | Coordinates    | text(25)       | no   | Shooting coordinates [R2]
+BSZ | 15  | Vertex height  | number         | no   | **Max height of activity [R2]**
+BSZ | 16  | DABS           | boolean        | no   | **Relevant for DABS (formerly KOSIF): 0=no, 1=yes [R2]**
+BSZ | 17  | No shooting    | boolean        | no   | **0=no, 1=yes [R2]**
+
+### Total Records
+
+Row | Col | Attribute  | Content                   | Mand | Remarks
+----|-----|------------|---------------------------|------|--------
+TOT | 0   | Row        | text(3)                   | yes  | "TOT" (aka: Total)
+TOT | 1   | Created at | datetime(yyyymmddhhmmss)  | yes  | Date and time of CSV creation
+TOT | 2   | SPL count  | number                    | yes  | Number of SPL records
+
 ## Asynchronous Use
 
 ### Command Line Arguments

data/lib/aipp/regions/LS/helpers/base.rb

@@ -29,11 +29,6 @@ module AIPP
 
         # Mandatory Interface
 
-        def setup
-          AIPP.cache.aip = read('AIP').css('Ase')
-          AIPP.cache.dabs = read('DABS')
-        end
-
         def origin_for(document)
           case document
           when 'ENR'
@@ -63,6 +58,16 @@ module AIPP
                 type: :pdf
               )
             end
+          when 'shooting_grounds'
+            AIPP::Downloader::HTTP.new(
+              file: "https://data.geo.admin.ch/ch.vbs.schiessanzeigen/schiessanzeigen/schiessanzeigen.csv",
+              type: :csv
+            )
+          when /^shooting_grounds-(\d+\.\d+)/
+            AIPP::Downloader::HTTP.new(
+              file: "https://api3.geo.admin.ch/rest/services/api/MapServer/ch.vbs.schiessanzeigen/#{$1}?sr=4326&geometryFormat=geojson",
+              type: :json
+            )
           else
             fail "document not recognized"
           end

data/lib/aipp/regions/LS/notam/ENR.rb

@@ -6,30 +6,32 @@ module AIPP::LS::NOTAM
     include AIPP::LS::Helpers::Base
 
     def parse
+      AIPP.cache.aip ||= read('AIP').css('Ase')
+      AIPP.cache.dabs ||= read('DABS')
       json = read
-      fail "malformed JSON received from API" unless json.has_key?('queryNOTAMs')
+      fail "malformed JSON received from API" unless json.has_key?(:queryNOTAMs)
       added_notam_ids = []
-      json['queryNOTAMs'].each do |row|
-        next unless row['notamRaw'].match? /^Q\) LS/   # only parse national NOTAM
+      json[:queryNOTAMs].each do |row|
+        next unless row[:notamRaw].match? /^Q\) LS/   # only parse national NOTAM
 
 # HACK: try to add missing commas to D-item of A- and B-series NOTAM
-if row['notamRaw'].match? /\A[AB]/
-  if row['notamRaw'].gsub!(/(#{NOTAM::Schedule::HOUR_RE.decapture}-#{NOTAM::Schedule::HOUR_RE.decapture})/, '\1,')
-    row['notamRaw'].gsub!(/,+/, ',')
-    row['notamRaw'].sub!(/,\n/, "\n")
+if row[:notamRaw].match? /\A[AB]/
+  if row[:notamRaw].gsub!(/(#{NOTAM::Schedule::HOUR_RE.decapture}-#{NOTAM::Schedule::HOUR_RE.decapture})/, '\1,')
+    row[:notamRaw].gsub!(/,+/, ',')
+    row[:notamRaw].sub!(/,\n/, "\n")
     warn("HACK: added missing commas to D item")
   end
 end
 
 # HACK: remove braindead years from D-item of W-series NOTAM
-if row['notamRaw'].match? /\AW/
+if row[:notamRaw].match? /\AW/
   year = Time.now.year
-  if row['notamRaw'].gsub!(/\s*(?:#{year}|#{year+1})\s*(#{NOTAM::Schedule::MONTH_RE})/, ' \1')
+  if row[:notamRaw].gsub!(/\s*(?:#{year}|#{year+1})\s*(#{NOTAM::Schedule::MONTH_RE})/, ' \1')
     warn("HACK: removed braindead years from D item")
   end
 end
 
-        (notam = notam_for(row['notamRaw'])) or next
+        (notam = notam_for(row[:notamRaw])) or next
         if respect? notam
           next if notam.data[:five_day_schedules] == []
           added_notam_ids << notam.data[:id]

data/lib/aipp/regions/LS/shoot/shooting_grounds.rb

@@ -0,0 +1,116 @@
+using AIXM::Refinements
+
+module AIPP::LS::SHOOT
+  class ShootingGrounds < AIPP::SHOOT::Parser
+
+    include AIPP::LS::Helpers::Base
+
+    DEFAULT_Z = AIXM.z(1000, :qfe)   # height 300m unless present in publication
+
+    def parse
+      effective_date = aixm.effective_at.strftime('%Y%m%d')
+      airac_date = AIRAC::Cycle.new(aixm.effective_at).to_s('%Y-%m-%d')
+      shooting_grounds = {}
+      read.each_with_index do |row, line|
+        type, id, date, no_shooting = row[0], row[1], row[2], (row[17] == "1")
+        if type == 'BSZ' && !no_shooting && date == effective_date
+          shooting_grounds[id] ||= read("shooting_grounds-#{id}")
+            .fetch(:feature)
+            .merge(
+              csv_line: line,
+              location_codes: row[5].split(/ *, */),   # TODO: currently ignored - not available as separate geometries
+              details: row[6].blank_to_nil,
+              url: row[10].blank_to_nil,
+              upper_z: (AIXM.z(AIXM.d(row[15].to_i, :m).to_ft.dim.round, :qfe) if row[15]),
+              dabs: (row[16] == '1'),
+              schedules: []
+            )
+          shooting_grounds[id][:schedules] << schedule_for(row)
+        end
+      end
+      shooting_grounds.each do |id, data|
+        data in csv_line:, location_codes:, details:, url:, upper_z:, schedules:, properties: { bezeichnung: name, infotelefonnr: phone, infoemail: email }
+        if schedules.compact.any?
+          geometries = geometries_for data[:geometry]
+          indexed = geometries.count > 1
+          geometries.each_with_index do |geometry, index|
+            remarks = {
+              details: details,
+              phone: phone,
+              email: email,
+              bulletin: url
+            }.to_remarks
+            add(
+              AIXM.airspace(
+                source: "LS|OTHER|schiessgebiete.csv|#{airac_date}|#{csv_line}",
+                region: 'LS',
+                type: :dangerous_activities_area,
+                name: "LS-S#{id} #{name} #{index if indexed}".strip
+              ).tap do |airspace|
+                airspace.add_layer layer_for(upper_z, schedules, remarks)
+                airspace.geometry = geometry
+                airspace.comment = "DABS: marked for publication"
+              end
+            )
+          end
+        end
+      end
+    end
+
+    private
+
+    # Returns +nil+ if neither beginning nor ending time is declared which
+    # has to be treated as "no shooting".
+    def schedule_for(row)
+      from = AIXM.time("#{row[3]} #{AIPP.options.time_zone}") if row[3]
+      to = AIXM.time("#{row[4]} #{AIPP.options.time_zone}") if row[4]
+      case
+        when from && to then (from..to)
+        when from then (from..AIXM::END_OF_DAY)
+        when to then (AIXM::BEGINNING_OF_DAY..to)
+      end
+    end
+
+    def geometries_for(polygons)
+      fail "only type MultiPolygon supported" unless polygons[:type] == 'MultiPolygon'
+      fail "polygon coordinates missing" unless polygons[:coordinates]
+      polygons[:coordinates].map do |(outer_polygon, inner_polygon)|
+        warn "hole in polygon is ignored" if inner_polygon
+        AIXM.geometry(
+          *outer_polygon.map { AIXM.point(xy: AIXM.xy(long: _1.first , lat: _1.last)) }
+        )
+      end
+    end
+
+    def layer_for(upper_z, schedules, remarks)
+      AIXM.layer(
+        vertical_limit: AIXM.vertical_limit(
+          upper_z: (upper_z || DEFAULT_Z),
+          lower_z: AIXM::GROUND
+        )
+      ).tap do |layer|
+        layer.activity = :shooting_from_ground
+        layer.timetable = timetable_for(schedules)
+        layer.remarks = remarks
+      end
+    end
+
+    def timetable_for(schedules)
+      AIXM.timetable.tap do |timetable|
+        schedules.each do |schedule|
+          timetable.add_timesheet(
+            AIXM.timesheet(
+              adjust_to_dst: true,
+              dates: (AIXM.date(aixm.effective_at)..AIXM.date(aixm.effective_at))
+              # TODO: transform to...
+              # dates: AIXM.date(aixm.effective_at)
+            ).tap do |timesheet|
+              timesheet.times = schedule
+            end
+          )
+        end
+      end
+    end
+
+  end
+end

data/lib/aipp/runner.rb

@@ -9,7 +9,7 @@ module AIPP
     attr_reader :aixm
 
     def initialize
-      AIPP.options.storage = AIPP.options.storage.join(AIPP.options.region, AIPP.options.module.downcase)
+      AIPP.options.storage = AIPP.options.storage.join(AIPP.options.region, AIPP.options.scope.downcase)
       AIPP.options.storage.mkpath
       @dependencies = THash.new
       @aixm = AIXM.document(effective_at: effective_at, expiration_at: expiration_at)
@@ -49,7 +49,7 @@ module AIPP
     end
 
     def output_file
-      "#{AIPP.options.region}_#{AIPP.options.module}_#{effective_at.strftime('%F_%HZ')}.#{AIPP.options.schema}"
+      "#{AIPP.options.region}_#{AIPP.options.scope}_#{effective_at.strftime('%F_%HZ')}.#{AIPP.options.schema}"
     end
 
     # @return [Pathname] directory containing the builds
@@ -86,7 +86,7 @@ module AIPP
     # Read parser files.
     def read_parsers
       verbose_info("reading parsers")
-      region_dir.join(AIPP.options.module.downcase).glob('*.rb').each do |file|
+      region_dir.join(AIPP.options.scope.downcase).glob('*.rb').each do |file|
         verbose_info "requiring #{file.basename}"
         require file
         section = file.basename('.*').to_s.classify
@@ -123,7 +123,7 @@ module AIPP
         details = aixm.errors.map(&:message).join("\n")
         AIPP.options.force ? warn(message) : fail([message, details].join(":\n"))
       end
-      info("counting #{aixm.features.count} features")
+      info("counting #{aixm.features.count} feature(s)")
     end
 
     # Write the AIXM document.
@@ -135,7 +135,7 @@ module AIPP
 
     # Write build information.
     def write_build
-      info ("skipping build")
+      info("skipping build")
     end
 
     # Write the configuration to config.yml.
@@ -145,7 +145,7 @@ module AIPP
     end
 
     def class_for(section)
-      [:AIPP, AIPP.options.region, AIPP.options.module.upcase, section.classify].constantize
+      [:AIPP, AIPP.options.region, AIPP.options.scope, section.classify].constantize
     end
   end
 

data/lib/aipp/scopes/aip/executable.rb

@@ -0,0 +1,38 @@
+module AIPP
+  module AIP
+
+    module Executable
+
+      def options
+        AIPP.options.merge(
+          scope: 'AIP',
+          airac: AIRAC::Cycle.new,
+          region_options: []
+        )
+      end
+
+      def option_parser(o)
+        o.banner = <<~END
+          Download online AIP and convert it to #{AIPP.options.schema.upcase}.
+          Usage: #{File.basename($0)} [options]
+        END
+        o.on('-a', '--airac (DATE|INTEGER)', String, %Q[AIRAC date or delta e.g. "+1" (default: "#{AIPP.options.airac.date.xmlschema}")]) { AIPP.options.airac = airac_for(_1) }
+        if AIPP.options.schema == :ofmx
+          o.on('-g', '--[no-]grouped-obstacles', 'group obstacles (default: false)') { AIPP.options.grouped_obstacles = _1 }
+        end
+        o.on('-O', '--region-options STRING', String, %Q[comma separated region specific options]) { AIPP.options.region_options = _1.split(',') }
+      end
+
+      private
+
+      def airac_for(argument)
+        if argument.match?(/^[+-]\d+$/)   # delta
+          AIRAC::Cycle.new + argument.to_i
+        else   # date
+          AIRAC::Cycle.new(argument)
+        end
+      end
+
+    end
+  end
+end

data/lib/aipp/{aip → scopes/aip}/runner.rb

@@ -17,9 +17,13 @@ module AIPP
         read_region
         read_parsers
         parse_sections
-        validate_aixm
-        write_build
-        write_aixm(AIPP.options.output_file || output_file)
+        if aixm.features.any?
+          validate_aixm
+          write_build
+          write_aixm(AIPP.options.output_file || output_file)
+        else
+          warn("no features to write")
+        end
         write_config
       end
 

data/lib/aipp/scopes/notam/executable.rb

@@ -0,0 +1,28 @@
+module AIPP
+  module NOTAM
+
+    module Executable
+
+      def options
+        AIPP.options.merge(
+          module: 'NOTAM',
+          effective_at: Time.now.change(min: 0, sec: 0)
+        )
+      end
+
+      def option_parser(o)
+        o.banner = <<~END
+          Download online NOTAM and convert it to #{AIPP.options.schema.upcase}.
+          Usage: #{File.basename($0)} notam [options]
+        END
+        o.on('-t', '--effective (TIME)', String, %Q[effective at this time (default: "#{AIPP.options.effective_at}")]) { AIPP.options.effective_at = Time.parse(_1) }
+        o.on('-x', '--crossload DIR', String, 'crossload directory') { AIPP.options.crossload = Pathname(_1) }
+      end
+
+      def guard
+        AIPP.options.effective_at = AIPP.options.effective_at.change(min: 0, sec: 0).utc
+      end
+
+    end
+  end
+end

data/lib/aipp/{notam → scopes/notam}/runner.rb

@@ -17,8 +17,12 @@ module AIPP
         read_region
         read_parsers
         parse_sections
-        validate_aixm
-        write_aixm(AIPP.options.output_file || output_file)
+        if aixm.features.any?
+          validate_aixm
+          write_aixm(AIPP.options.output_file || output_file)
+        else
+          warn("no features to write")
+        end
         write_config
       end
 

data/lib/aipp/scopes/shoot/README.md

@@ -0,0 +1,10 @@
+# AIPP Shoot Module
+
+## Cache Time Window
+
+The default time window for SHOOT is the day. This means:
+
+* Source data is downloaded and cached based on the day.
+* The effective date and time is rounded down to the previous midnight.
+
+To force a rebuild within this time window, you have to clean the cache using the `-c` command line argument.

data/lib/aipp/scopes/shoot/executable.rb

@@ -0,0 +1,28 @@
+module AIPP
+  module SHOOT
+
+    module Executable
+
+      def options
+        AIPP.options.merge(
+          module: 'Shoot',
+          effective_at: Time.now.at_midnight
+        )
+      end
+
+      def option_parser(o)
+        o.banner = <<~END
+          Download online shooting activities and convert them to #{AIPP.options.schema.upcase}.
+          Usage: #{File.basename($0)} shoot [options]
+        END
+        o.on('-t', '--effective (DATE)', String, %Q[effective on this date (default: "#{AIPP.options.effective_at.to_date}")]) { AIPP.options.effective_at = Time.parse("#{_1} CET") }
+      end
+
+      def guard
+        AIPP.options.time_zone = AIPP.options.effective_at.at_noon.strftime('%z')
+        AIPP.options.effective_at = AIPP.options.effective_at.at_midnight.utc
+      end
+
+    end
+  end
+end

data/lib/aipp/scopes/shoot/parser.rb

@@ -0,0 +1,9 @@
+module AIPP
+  module SHOOT
+
+    # @abstract
+    class Parser < AIPP::Parser
+    end
+
+  end
+end

data/lib/aipp/scopes/shoot/runner.rb

@@ -0,0 +1,32 @@
+module AIPP
+  module SHOOT
+
+    class Runner < AIPP::Runner
+
+      def effective_at
+        AIPP.options.effective_at
+      end
+
+      def expiration_at
+        effective_at.end_of_day.round - 1
+      end
+
+      def run
+        info("SHOOT effective #{effective_at}", color: :green)
+        read_config
+        read_region
+        read_parsers
+        parse_sections
+        if aixm.features.any?
+          validate_aixm
+          write_aixm(AIPP.options.output_file || output_file)
+        else
+          warn("no features to write")
+        end
+        write_config
+      end
+
+    end
+
+  end
+end

data/lib/aipp/version.rb

@@ -1,3 +1,3 @@
 module AIPP
-  VERSION = "2.0.3".freeze
+  VERSION = "2.1.0".freeze
 end

data/lib/aipp.rb

@@ -1,8 +1,8 @@
 require 'debug/session'
 require 'singleton'
-require 'colorize'
 require 'optparse'
 require 'yaml'
+require 'json'
 require 'pathname'
 require 'fileutils'
 require 'tmpdir'
@@ -10,6 +10,8 @@ require 'securerandom'
 require 'tsort'
 require 'ostruct'
 require 'date'
+
+require 'colorize'
 require 'excon'
 require 'graphql/client'
 require 'graphql/client/http'
@@ -17,7 +19,6 @@ require 'nokogiri'
 require 'csv'
 require 'roo'
 require 'pdf-reader'
-require 'json'
 require 'zip'
 require 'airac'
 require 'aixm'
@@ -53,10 +54,11 @@ require_relative 'aipp/t_hash'
 require_relative 'aipp/executable'
 require_relative 'aipp/runner'
 
-require_relative 'aipp/aip/executable'
-require_relative 'aipp/aip/runner'
-require_relative 'aipp/aip/parser'
+require_relative 'aipp/scopes/aip/executable'
+require_relative 'aipp/scopes/aip/runner'
+require_relative 'aipp/scopes/aip/parser'
+
+require_relative 'aipp/scopes/notam/executable'
+require_relative 'aipp/scopes/notam/runner'
+require_relative 'aipp/scopes/notam/parser'
 
-require_relative 'aipp/notam/executable'
-require_relative 'aipp/notam/runner'
-require_relative 'aipp/notam/parser'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aipp
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2023-01-22 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airac
@@ -344,8 +344,6 @@ email:
 executables:
 - aip2aixm
 - aip2ofmx
-- notam2aixm
-- notam2ofmx
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -357,13 +355,7 @@ files:
 - README.md
 - exe/aip2aixm
 - exe/aip2ofmx
-- exe/notam2aixm
-- exe/notam2ofmx
 - lib/aipp.rb
-- lib/aipp/aip/README.md
-- lib/aipp/aip/executable.rb
-- lib/aipp/aip/parser.rb
-- lib/aipp/aip/runner.rb
 - lib/aipp/border.rb
 - lib/aipp/debugger.rb
 - lib/aipp/downloader.rb
@@ -372,10 +364,6 @@ files:
 - lib/aipp/downloader/http.rb
 - lib/aipp/environment.rb
 - lib/aipp/executable.rb
-- lib/aipp/notam/README.md
-- lib/aipp/notam/executable.rb
-- lib/aipp/notam/parser.rb
-- lib/aipp/notam/runner.rb
 - lib/aipp/parser.rb
 - lib/aipp/patcher.rb
 - lib/aipp/pdf.rb
@@ -400,7 +388,20 @@ files:
 - lib/aipp/regions/LS/README.md
 - lib/aipp/regions/LS/helpers/base.rb
 - lib/aipp/regions/LS/notam/ENR.rb
+- lib/aipp/regions/LS/shoot/shooting_grounds.rb
 - lib/aipp/runner.rb
+- lib/aipp/scopes/aip/README.md
+- lib/aipp/scopes/aip/executable.rb
+- lib/aipp/scopes/aip/parser.rb
+- lib/aipp/scopes/aip/runner.rb
+- lib/aipp/scopes/notam/README.md
+- lib/aipp/scopes/notam/executable.rb
+- lib/aipp/scopes/notam/parser.rb
+- lib/aipp/scopes/notam/runner.rb
+- lib/aipp/scopes/shoot/README.md
+- lib/aipp/scopes/shoot/executable.rb
+- lib/aipp/scopes/shoot/parser.rb
+- lib/aipp/scopes/shoot/runner.rb
 - lib/aipp/t_hash.rb
 - lib/aipp/version.rb
 - lib/core_ext/array.rb
@@ -441,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Parser for aeronautical information publications

data/exe/notam2aixm

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'aipp'
-
-AIPP::NOTAM::Executable.new(File.basename($0)).run

data/exe/notam2ofmx

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'aipp'
-
-AIPP::NOTAM::Executable.new(File.basename($0)).run

data/lib/aipp/aip/executable.rb

@@ -1,40 +0,0 @@
-module AIPP
-  module AIP
-
-    class Executable < AIPP::Executable
-
-      def initialize(exe_file)
-        super
-        AIPP.options.merge(
-          module: 'AIP',
-          airac: AIRAC::Cycle.new,
-          region_options: []
-        )
-        OptionParser.new do |o|
-          o.banner = <<~END
-            Download online AIP and convert it to #{AIPP.options.schema.upcase}.
-            Usage: #{File.basename($0)} [options]
-          END
-          common_options(o)
-          o.on('-a', '--airac (DATE|INTEGER)', String, %Q[AIRAC date or delta e.g. "+1" (default: "#{AIPP.options.airac.date.xmlschema}")]) { AIPP.options.airac = airac_for(_1) }
-          if AIPP.options.schema == :ofmx
-            o.on('-g', '--[no-]grouped-obstacles', 'group obstacles (default: false)') { AIPP.options.grouped_obstacles = _1 }
-          end
-          o.on('-O', '--region-options STRING', String, %Q[comma separated region specific options]) { AIPP.options.region_options = _1.split(',') }
-          developer_options(o)
-        end.parse!
-      end
-
-      private
-
-      def airac_for(argument)
-        if argument.match?(/^[+-]\d+$/)   # delta
-          AIRAC::Cycle.new + argument.to_i
-        else   # date
-          AIRAC::Cycle.new(argument)
-        end
-      end
-
-    end
-  end
-end

data/lib/aipp/notam/executable.rb

@@ -1,27 +0,0 @@
-module AIPP
-  module NOTAM
-
-    class Executable < AIPP::Executable
-
-      def initialize(exe_file)
-        super
-        now = Time.now.utc.round
-        AIPP.options.merge(
-          module: 'NOTAM',
-          effective_at: now - now.sec - (now.min * 60)   # previous full hour
-        )
-        OptionParser.new do |o|
-          o.banner = <<~END
-            Download online NOTAM and convert it to #{AIPP.options.schema.upcase}.
-            Usage: #{File.basename($0)} [options]
-          END
-          common_options(o)
-          o.on('-t', '--effective (TIME)', String, %Q[effective after this point in time (default: #{AIPP.options.effective_at})]) { AIPP.options.effective_at = Time.parse(_1) }
-          o.on('-x', '--crossload DIR', String, 'crossload directory') { AIPP.options.crossload = Pathname(_1) }
-          developer_options(o)
-        end.parse!
-      end
-
-    end
-  end
-end