gpx_doctor 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1cba3a635e28b6b5731f9a178342323f6068e3954e03439c4c908045346d936
-  data.tar.gz: 0a9dd34154ee4c75abd3c9556bf69fb80e238ca0a4d940d9371607f299871b73
+  metadata.gz: 367e09fc58af88bd756703fd5e2647632fd9991f753f3581e3bcb439f7733ce3
+  data.tar.gz: 3a7922964bb774be1eb1a1d2af78aee4a7d56b868b7652c481fb186cc6438bce
 SHA512:
-  metadata.gz: e9981e204bdf04c176e500920be0ff75b14a011e50d3a149590545adf4351d6e5f00e37ab51bb998f43b97d2619afa0927accb606ab584eab84f0d4e29d2229e
-  data.tar.gz: 4b226863088aac9b8af344985426bc4beeee6693f1772b710537edb7e6c7059623f0824621f20f40cee55fe13114af7acdd306c524f51cd1fcdec38e50b44fb9
+  metadata.gz: 9bad3d27880e55e001fea734b7d481f19569f0e0d202958d4ae893a1722eef5b0fb7a5431030f970872358c812e5a83a492f99c945096652e9547f0945238624
+  data.tar.gz: 0a4a032459ed9916bc8cd99c64d38676822efbed6e1a470d86a9806878f3ee65f5239827f1830eeb6dbdac573f845a64bcea70b7f24f5b686bc8ef440fb29325

data/lib/gpx_doctor/errors.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module GpxDoctor
+  class Error < StandardError; end
+  class InvalidGpxError < Error; end
+end

data/lib/gpx_doctor/geojson_builder.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module GpxDoctor
+  # Builds GeoJSON output from parsed GPX data according to RFC 7946.
+  #
+  # RFC 7946 compliance:
+  # - Coordinate order: [longitude, latitude, elevation]
+  # - LineString geometries require minimum 2 positions
+  # - MultiLineString segments require minimum 2 positions each
+  # - Empty or invalid geometries are filtered out
+  # - Properties member is null when no properties exist
+  class GeoJsonBuilder
+    class << self
+      def build(result)
+        new(result).build
+      end
+
+      def build_file(result, file_path)
+        json = build(result)
+        File.write(file_path, json)
+        json
+      end
+    end
+
+    def initialize(result)
+      @result = result
+    end
+
+    def build
+      features = []
+      features.concat(waypoint_features)
+      features.concat(route_features)
+      features.concat(track_features)
+
+      JSON.generate(
+        type: 'FeatureCollection',
+        features: features
+      )
+    end
+
+    private
+
+    def waypoint_features
+      @result.waypoints.map { |wpt| point_feature(wpt) }
+    end
+
+    def route_features
+      @result.routes.map do |route|
+        coords = route.points.map { |pt| coordinate(pt) }
+        # RFC 7946: LineString must have 2 or more positions
+        next if coords.length < 2
+
+        props = route_properties(route)
+        {
+          type: 'Feature',
+          properties: props.empty? ? nil : props,
+          geometry: {
+            type: 'LineString',
+            coordinates: coords
+          }
+        }
+      end.compact
+    end
+
+    def track_features
+      @result.tracks.map do |track|
+        # RFC 7946: Each LineString in MultiLineString must have 2+ positions
+        coords = track.segments.map do |seg|
+          seg_coords = seg.points.map { |pt| coordinate(pt) }
+          seg_coords if seg_coords.length >= 2
+        end.compact
+
+        # Skip tracks with no valid segments
+        next if coords.empty?
+
+        props = track_properties(track)
+        {
+          type: 'Feature',
+          properties: props.empty? ? nil : props,
+          geometry: {
+            type: 'MultiLineString',
+            coordinates: coords
+          }
+        }
+      end.compact
+    end
+
+    def point_feature(wpt)
+      props = waypoint_properties(wpt)
+      {
+        type: 'Feature',
+        properties: props.empty? ? nil : props,
+        geometry: {
+          type: 'Point',
+          coordinates: coordinate(wpt)
+        }
+      }
+    end
+
+    def coordinate(point)
+      coord = [point.lon, point.lat]
+      coord << point.ele if point.ele
+      coord
+    end
+
+    def waypoint_properties(wpt)
+      props = {}
+      props[:name]  = wpt.name  if wpt.name
+      props[:desc]  = wpt.desc  if wpt.desc
+      props[:sym]   = wpt.sym   if wpt.sym
+      props[:type]  = wpt.type  if wpt.type
+      props[:time]  = wpt.time.iso8601 if wpt.time
+      props
+    end
+
+    def route_properties(route)
+      props = {}
+      props[:name]   = route.name   if route.name
+      props[:desc]   = route.desc   if route.desc
+      props[:type]   = route.type   if route.type
+      props[:number] = route.number if route.number
+      props
+    end
+
+    def track_properties(track)
+      props = {}
+      props[:name]   = track.name   if track.name
+      props[:desc]   = track.desc   if track.desc
+      props[:type]   = track.type   if track.type
+      props[:number] = track.number if track.number
+      props
+    end
+  end
+end

data/lib/gpx_doctor/parser.rb

@@ -20,7 +20,8 @@ module GpxDoctor
       end
 
       def parse_string(xml_string, params: {})
-        doc = Nokogiri::XML(xml_string)
+        Validator.validate!(xml_string)
+        doc = Nokogiri::XML(xml_string) { |config| config.nonet }
         ns  = detect_namespace(doc)
 
         new(doc, ns, params: params).parse

data/lib/gpx_doctor/validator.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'nokogiri'
+
+module GpxDoctor
+  class Validator
+    ALLOWED_VERSIONS = %w[1.0 1.1].freeze
+
+    # Matches a DOCTYPE declaration anywhere in the string (case-insensitive).
+    # DOCTYPE is rejected entirely because it can carry external-entity
+    # references (XXE) or internal entity bombs (billion-laughs).
+    DOCTYPE_PATTERN = /<!DOCTYPE/i.freeze
+
+    class << self
+      def validate!(xml_string)
+        new(xml_string).validate!
+      end
+    end
+
+    def initialize(xml_string)
+      @xml_string = xml_string
+    end
+
+    # Raises GpxDoctor::InvalidGpxError if the input is not a valid, safe GPX document.
+    def validate!
+      reject_doctype!
+      doc = parse_xml!
+      validate_root!(doc)
+      validate_version!(doc)
+      true
+    end
+
+    private
+
+    def reject_doctype!
+      return unless @xml_string.match?(DOCTYPE_PATTERN)
+
+      raise InvalidGpxError, 'DOCTYPE declarations are not allowed'
+    end
+
+    def parse_xml!
+      doc = Nokogiri::XML(@xml_string) { |config| config.nonet }
+      return doc if doc.errors.empty?
+
+      raise InvalidGpxError, "Invalid XML: #{doc.errors.map(&:message).join('; ')}"
+    end
+
+    def validate_root!(doc)
+      root = doc.root
+      return if root&.name == 'gpx'
+
+      raise InvalidGpxError, 'Root element must be <gpx>'
+    end
+
+    def validate_version!(doc)
+      version = doc.root['version']
+      return if ALLOWED_VERSIONS.include?(version)
+
+      raise InvalidGpxError,
+            "Unsupported GPX version: #{version.inspect}. Supported versions: #{ALLOWED_VERSIONS.join(', ')}"
+    end
+  end
+end

data/lib/gpx_doctor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GpxDoctor
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/gpx_doctor.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require 'gpx_doctor/version'
+require 'gpx_doctor/errors'
 require 'gpx_doctor/configuration'
+require 'gpx_doctor/validator'
 require 'gpx_doctor/models/email'
 require 'gpx_doctor/models/link'
 require 'gpx_doctor/models/copyright'
@@ -19,6 +21,7 @@ require 'gpx_doctor/segment_splitter'
 require 'gpx_doctor/point_selector'
 require 'gpx_doctor/parser'
 require 'gpx_doctor/builder'
+require 'gpx_doctor/geojson_builder'
 
 module GpxDoctor
   class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpx_doctor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Poltrax
@@ -49,6 +49,8 @@ files:
 - lib/gpx_doctor/configuration.rb
 - lib/gpx_doctor/distance_calculator.rb
 - lib/gpx_doctor/elevation_client.rb
+- lib/gpx_doctor/errors.rb
+- lib/gpx_doctor/geojson_builder.rb
 - lib/gpx_doctor/models/bounds.rb
 - lib/gpx_doctor/models/copyright.rb
 - lib/gpx_doctor/models/email.rb
@@ -63,6 +65,7 @@ files:
 - lib/gpx_doctor/point_selector.rb
 - lib/gpx_doctor/segment_splitter.rb
 - lib/gpx_doctor/statistics_enhancer.rb
+- lib/gpx_doctor/validator.rb
 - lib/gpx_doctor/version.rb
 homepage: https://github.com/Poltrax-live/gpx-doctor
 licenses: